diff options
| author |   Matt Roper <matthew.d.roper@intel.com> | 2015-09-24 15:53:12 -0700 |
|---|---|---|
| committer | Matt Roper <matthew.d.roper@intel.com> | 2015-10-21 14:53:23 -0700 |
| commit | d21fbe87ce18297af0a9b7cc0cd545fd9ac28d33 (patch) | |
| tree | 3be475787447afcb95a4323618a2ba89ca01b88a /drivers/gpu/drm/i915/intel_atomic.c | |
| parent | drm/i915: Fix formatting for gen8_cs_irq_handler (diff) | |
| download | linux-dev-d21fbe87ce18297af0a9b7cc0cd545fd9ac28d33.tar.xz linux-dev-d21fbe87ce18297af0a9b7cc0cd545fd9ac28d33.zip | |
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/
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index f1975f267710..05b12032d262 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -94,6 +94,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) __drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->base); crtc_state->update_pipe = false; + crtc_state->disable_lp_wm = false; return &crtc_state->base; } |