summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorMatt Roper2015-01-22 01:35:43 +0100
committerDaniel Vetter2015-01-27 09:56:15 +0100
commita98b3431afcbc66986fcf375fa168df1d9d28bc0 (patch)
tree5469ea7a01263fb592a2cd8917b705bef912ac4d /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Consolidate plane handler vtables (diff)
downloadkernel-qcow2-linux-a98b3431afcbc66986fcf375fa168df1d9d28bc0.tar.gz
kernel-qcow2-linux-a98b3431afcbc66986fcf375fa168df1d9d28bc0.tar.xz
kernel-qcow2-linux-a98b3431afcbc66986fcf375fa168df1d9d28bc0.zip
drm/i915: Add .atomic_{get, set}_property() entrypoints to planes
When we flip on the DRIVER_ATOMIC bit, the DRM core will start calling this entrypoint to set and lookup driver-specific plane property values, rather than maintaining a shadow copy in object->properties. Note that although we add these functions to the plane vtable, they will not yet be called. Future patches that switch our .set_property() handler and/or enable full atomic functionality are required before these code paths will be executed. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ce71fc588dd6..0cdcf9bf54c2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12054,6 +12054,8 @@ const struct drm_plane_funcs intel_plane_funcs = {
.disable_plane = drm_plane_helper_disable,
.destroy = intel_plane_destroy,
.set_property = intel_plane_set_property,
+ .atomic_get_property = intel_plane_atomic_get_property,
+ .atomic_set_property = intel_plane_atomic_set_property,
.atomic_duplicate_state = intel_plane_duplicate_state,
.atomic_destroy_state = intel_plane_destroy_state,