diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 19:12:01 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-08-10 19:12:01 +0300 |
| commit | 148b1e115eae37c9f3705691b4c45aa4cc0fa71d (patch) | |
| tree | 3f42609b3e7f53eb81830c976fadde1d7bc36a2c /drivers/gpu/drm/tilcdc/tilcdc_plane.c | |
| parent | 3ec0af7f223bab9503c4ed57d00ed34b137df476 (diff) | |
| parent | 09ef2378dc42339f3871584dc26d27da220277cb (diff) | |
| download | linux-148b1e115eae37c9f3705691b4c45aa4cc0fa71d.tar.xz | |
Merge airlied/drm-next into drm-intel-next-queued
Ben Widawsky/Daniel Stone need the extended modifier support from
drm-misc to be able to merge CCS support for i915.ko
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_plane.c')
| -rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c index ba0d66c0d8ac..7667b038ae7f 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c @@ -28,7 +28,6 @@ static struct drm_plane_funcs tilcdc_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = drm_plane_cleanup, - .set_property = drm_atomic_helper_plane_set_property, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, |