aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-05-24 10:59:17 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2013-05-31 14:53:52 -0400
commit4c4ff43a692b44c6e326f9f28208f3d78ea51f7e (patch)
tree6aaa585f7cec34c9181ed431dde9b406ab1828f7 /drivers/gpu/drm/i915/i915_drv.h
parent64936258d7e426bee5f2392269b1b20172db9ffb (diff)
drm/i915: add "enable" argument to intel_update_sprite_watermarks
Because we want to call it from the "sprite disable" paths, since on Haswell we need to update the sprite watermarks when we disable sprites. For now, all this patch does is to add the "enable" argument and call intel_update_sprite_watermarks from inside ivb_disable_plane. This shouldn't change how the code behaves because on sandybridge_update_sprite_wm we just ignore the "!enable" case. The patches that implement Haswell watermarks will make use of the changes introduced by this patch. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index f6419f40df38..e09c54c73a22 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -315,7 +315,8 @@ struct drm_i915_display_funcs {
315 int (*get_fifo_size)(struct drm_device *dev, int plane); 315 int (*get_fifo_size)(struct drm_device *dev, int plane);
316 void (*update_wm)(struct drm_device *dev); 316 void (*update_wm)(struct drm_device *dev);
317 void (*update_sprite_wm)(struct drm_device *dev, int pipe, 317 void (*update_sprite_wm)(struct drm_device *dev, int pipe,
318 uint32_t sprite_width, int pixel_size); 318 uint32_t sprite_width, int pixel_size,
319 bool enable);
319 void (*modeset_global_resources)(struct drm_device *dev); 320 void (*modeset_global_resources)(struct drm_device *dev);
320 /* Returns the active state of the crtc, and if the crtc is active, 321 /* Returns the active state of the crtc, and if the crtc is active,
321 * fills out the pipe-config with the hw state. */ 322 * fills out the pipe-config with the hw state. */