diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 12:19:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-16 12:19:11 -0700 |
| commit | 8b7b56f37b13323d459aeec5c5290c2141366c84 (patch) | |
| tree | 227b1e76b5cd5b7c95f62fffab6bd4ae2ad59ac1 /drivers/gpu/drm/radeon/radeon_dp_mst.c | |
| parent | ebb65c81e1042c0d73cb73738c607da54add739a (diff) | |
| parent | d549f545e690c3cbdeb33df3579eae3230eb8904 (diff) | |
| download | kernel_replicant_linux-8b7b56f37b13323d459aeec5c5290c2141366c84.tar.gz kernel_replicant_linux-8b7b56f37b13323d459aeec5c5290c2141366c84.tar.bz2 kernel_replicant_linux-8b7b56f37b13323d459aeec5c5290c2141366c84.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Nothing too crazy or exciting:
- two MAINTAINERS entries that I didn't see the point in delaying.
- one drm mst fix to stop sending uninitialised data to monitors
- two amdgpu fixes
- one radeon mst tiling fix
- one vmwgfx regression fix
- one virtio warning fix.
I have found one locking problem that needs a bit of reorg to fix, but
I'm not sure it's worth putting in -fixes as I don't think we've seen
it hit in the real world ever, I just found it using the virtio-gpu
driver when working on it. I'll possibly send it next week once I've
time to discuss with Daniel"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/virtio: use %llu format string form atomic64_t
MAINTAINERS: Add myself as maintainer for the gma500 driver
MAINTAINERS: add a maintainer for the atmel-hlcdc DRM driver
drm/amdgpu: Keep the pflip interrupts always enabled v7
drm/amdgpu: adjust default dispclk (v2)
drm/dp/mst: make mst i2c transfer code more robust.
drm/radeon: attach tile property to mst connector
drm/vmwgfx: Fix kernel NULL pointer dereference on older hardware
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_dp_mst.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_dp_mst.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 6cddae44fa6e..744f5c49c664 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -283,6 +283,7 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol radeon_connector->mst_encoder = radeon_dp_create_fake_mst_encoder(master); drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0); + drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0); drm_mode_connector_set_path_property(connector, pathprop); return connector; |