diff options
| author | Ville Syrjälä | 2016-12-05 15:13:28 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2016-12-07 16:50:21 +0100 |
| commit | 467a14d935c6d95b94e4197bf63e264eab4c5d06 (patch) | |
| tree | 28937b8039de5c31fc77f0cdd4b339f31d17fed1 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: use platform enum instead of duplicating PCI ID if possible (diff) | |
| download | kernel-qcow2-linux-467a14d935c6d95b94e4197bf63e264eab4c5d06.tar.gz kernel-qcow2-linux-467a14d935c6d95b94e4197bf63e264eab4c5d06.tar.xz kernel-qcow2-linux-467a14d935c6d95b94e4197bf63e264eab4c5d06.zip | |
drm/i915: Protect DSPARB registers with a spinlock
Each DSPARB register can house bits for two separate pipes, hence
we must protect the registers during reprogramming so that parallel
FIFO reconfigurations happening simultaneosly on multiple pipes won't
corrupt each others values.
We'll use a new spinlock for this instead of the wm_mutex since we'll
have to move the DSPARB programming to happen from the vblank evade
critical section, and we can't use mutexes in there.
v2: Document why we use a spinlock instead of a mutex (Maarten)
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480947208-18468-1-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index c6fe59944a0b..3ea7cf275be0 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1223,6 +1223,8 @@ static void vlv_pipe_set_fifo_size(struct intel_crtc *crtc) pipe_name(crtc->pipe), sprite0_start, sprite1_start, fifo_size); + spin_lock(&dev_priv->wm.dsparb_lock); + switch (crtc->pipe) { uint32_t dsparb, dsparb2, dsparb3; case PIPE_A: @@ -1279,6 +1281,10 @@ static void vlv_pipe_set_fifo_size(struct intel_crtc *crtc) default: break; } + + POSTING_READ(DSPARB); + + spin_unlock(&dev_priv->wm.dsparb_lock); } #undef VLV_FIFO |