]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: add "enable" argument to intel_update_sprite_watermarks
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 24 May 2013 14:59:17 +0000 (11:59 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 31 May 2013 18:53:52 +0000 (20:53 +0200)
commitf92334faf7c5204a741f08c21e643635f2e842c6
tree6aaa585f7cec34c9181ed431dde9b406ab1828f7
parent77f2223a1d7ff013e667e7966b06f1f4fcd1356e
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>
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/i915/intel_sprite.c