]> git.karo-electronics.de Git - linux-beck.git/commit
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)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 30 Sep 2015 15:15:42 +0000 (17:15 +0200)
commit7809e5ae35b9d8d0710f0874b2e3f10be144e38b
treee0521ecc52bc0fc4ccf401f417963d6b2adc4676
parent3a05f5e2e78eab7ffe816abb59b6769e331a1957
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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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