summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorMatt Roper2015-01-22 01:35:44 +0100
committerDaniel Vetter2015-01-27 09:56:46 +0100
commit5ee67f1cf9d009ff6522d264a05d78f082952a4f (patch)
treee432860fa7c3f47aaa979957c9dfd6133f2ce79a /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: Add .atomic_{get, set}_property() entrypoints to planes (diff)
downloadkernel-qcow2-linux-5ee67f1cf9d009ff6522d264a05d78f082952a4f.tar.gz
kernel-qcow2-linux-5ee67f1cf9d009ff6522d264a05d78f082952a4f.tar.xz
kernel-qcow2-linux-5ee67f1cf9d009ff6522d264a05d78f082952a4f.zip
drm/i915: Add main atomic entrypoints (v2)
Add the top-level atomic entrypoints for check/commit. These won't get called yet; we still need to either enable the atomic ioctl or switch to using the non-transitional atomic helpers for legacy operations. v2: - Use plane->pipe rather than plane->possible_crtcs while ensuring that only a single CRTC is in use. Either way will work fine since i915 drm_plane's are always tied to a single CRTC, but plane->pipe is slightly more intuitive. (Ander) - Simplify crtc/connector checking logic. (Ander) 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 0cdcf9bf54c2..75b7ca1488e9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12752,6 +12752,8 @@ static inline void intel_fbdev_output_poll_changed(struct drm_device *dev)
static const struct drm_mode_config_funcs intel_mode_funcs = {
.fb_create = intel_user_framebuffer_create,
.output_poll_changed = intel_fbdev_output_poll_changed,
+ .atomic_check = intel_atomic_check,
+ .atomic_commit = intel_atomic_commit,
};
/* Set up chip specific display functions */