diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-08-06 15:24:09 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-08 08:11:13 -0400 |
commit | b39d53f624d50d1588933e0ab17f19a5f2da5d94 (patch) | |
tree | 8ff2d3cfce8fa89fa28aa8f0a9d37f4e2fa45e21 /drivers/gpu/drm/i915/intel_drv.h | |
parent | c35426d2bc25b242ee2a9a7a1d62634be1e86bb0 (diff) |
drm/i915: Pass crtc to our update/disable_plane hooks
We're going to want to know which CRTC we're dealing with, so pass it
down to the update/disable_plane hooks.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 3ea8e5fe4407..da394f354453 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -359,13 +359,15 @@ struct intel_plane { | |||
359 | struct intel_plane_wm_parameters wm; | 359 | struct intel_plane_wm_parameters wm; |
360 | 360 | ||
361 | void (*update_plane)(struct drm_plane *plane, | 361 | void (*update_plane)(struct drm_plane *plane, |
362 | struct drm_crtc *crtc, | ||
362 | struct drm_framebuffer *fb, | 363 | struct drm_framebuffer *fb, |
363 | struct drm_i915_gem_object *obj, | 364 | struct drm_i915_gem_object *obj, |
364 | int crtc_x, int crtc_y, | 365 | int crtc_x, int crtc_y, |
365 | unsigned int crtc_w, unsigned int crtc_h, | 366 | unsigned int crtc_w, unsigned int crtc_h, |
366 | uint32_t x, uint32_t y, | 367 | uint32_t x, uint32_t y, |
367 | uint32_t src_w, uint32_t src_h); | 368 | uint32_t src_w, uint32_t src_h); |
368 | void (*disable_plane)(struct drm_plane *plane); | 369 | void (*disable_plane)(struct drm_plane *plane, |
370 | struct drm_crtc *crtc); | ||
369 | int (*update_colorkey)(struct drm_plane *plane, | 371 | int (*update_colorkey)(struct drm_plane *plane, |
370 | struct drm_intel_sprite_colorkey *key); | 372 | struct drm_intel_sprite_colorkey *key); |
371 | void (*get_colorkey)(struct drm_plane *plane, | 373 | void (*get_colorkey)(struct drm_plane *plane, |