diff options
author | Matt Roper <matthew.d.roper@intel.com> | 2015-01-21 19:35:44 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-27 03:56:46 -0500 |
commit | 5ee67f1cf9d009ff6522d264a05d78f082952a4f (patch) | |
tree | e432860fa7c3f47aaa979957c9dfd6133f2ce79a /drivers/gpu/drm/i915/intel_display.c | |
parent | a98b3431afcbc66986fcf375fa168df1d9d28bc0 (diff) |
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.c | 2 |
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) | |||
12752 | static const struct drm_mode_config_funcs intel_mode_funcs = { | 12752 | static const struct drm_mode_config_funcs intel_mode_funcs = { |
12753 | .fb_create = intel_user_framebuffer_create, | 12753 | .fb_create = intel_user_framebuffer_create, |
12754 | .output_poll_changed = intel_fbdev_output_poll_changed, | 12754 | .output_poll_changed = intel_fbdev_output_poll_changed, |
12755 | .atomic_check = intel_atomic_check, | ||
12756 | .atomic_commit = intel_atomic_commit, | ||
12755 | }; | 12757 | }; |
12756 | 12758 | ||
12757 | /* Set up chip specific display functions */ | 12759 | /* Set up chip specific display functions */ |