drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check
authorMatt Roper <matthew.d.roper@intel.com>
Thu, 24 Sep 2015 22:53:12 +0000 (15:53 -0700)
committerMatt Roper <matthew.d.roper@intel.com>
Wed, 21 Oct 2015 21:53:23 +0000 (14:53 -0700)
commitd21fbe87ce18297af0a9b7cc0cd545fd9ac28d33
tree3be475787447afcb95a4323618a2ba89ca01b88a
parente4ba99b97e7f59889eeb8dd02867f4ed00c59eb0
drm/i915/ivb: Move WaCxSRDisabledForSpriteScaling w/a to atomic check

Determine whether we need to apply this workaround at atomic check time
and just set a flag that will be used by the main watermark update
routine.

Moving this workaround into the atomic framework reduces
ilk_update_sprite_wm() to just a standard watermark update, so drop it
completely and just ensure that ilk_update_wm() is called whenever a
sprite plane is updated in a way that would affect watermarks.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Smoke-tested-by: Paulo Zanoni <przanoni@gmail.com>
Link: http://patchwork.freedesktop.org/patch/60367/
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c