summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorMatt Roper2015-01-22 01:35:48 +0100
committerDaniel Vetter2015-01-27 09:57:25 +0100
commitc196e1d66c36b0731cffc39fe28922b17c2901d9 (patch)
treed8b995b22e2c307b1228f0b9837885a2e5c5af56 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Add crtc state duplication/destruction functions (diff)
downloadkernel-qcow2-linux-c196e1d66c36b0731cffc39fe28922b17c2901d9.tar.gz
kernel-qcow2-linux-c196e1d66c36b0731cffc39fe28922b17c2901d9.tar.xz
kernel-qcow2-linux-c196e1d66c36b0731cffc39fe28922b17c2901d9.zip
drm/i915: Switch plane properties to full atomic helper.
This will exercise our atomic pipeline for legacy property updates. 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.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2dc6d64d9234..423ef959264d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -37,6 +37,7 @@
#include <drm/i915_drm.h>
#include "i915_drv.h"
#include "i915_trace.h"
+#include <drm/drm_atomic_helper.h>
#include <drm/drm_dp_helper.h>
#include <drm/drm_crtc_helper.h>
#include <drm/drm_plane_helper.h>
@@ -12055,7 +12056,7 @@ const struct drm_plane_funcs intel_plane_funcs = {
.update_plane = drm_plane_helper_update,
.disable_plane = drm_plane_helper_disable,
.destroy = intel_plane_destroy,
- .set_property = intel_plane_set_property,
+ .set_property = drm_atomic_helper_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,