diff options
| author | Ville Syrjälä | 2014-04-09 12:28:48 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-05-20 15:23:33 +0200 |
| commit | 724a6905eabf513aa2544c32625d0a5cbea38845 (patch) | |
| tree | 42cecb3a638eefec6c4c239c683abb35cfc1ab5b /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915/chv: Add CHV display support (diff) | |
| download | kernel-qcow2-linux-724a6905eabf513aa2544c32625d0a5cbea38845.tar.gz kernel-qcow2-linux-724a6905eabf513aa2544c32625d0a5cbea38845.tar.xz kernel-qcow2-linux-724a6905eabf513aa2544c32625d0a5cbea38845.zip | |
drm/i915/chv: Clarify VLV/CHV PIPESTAT bits a bit more
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Antti Koskipää <antti.koskipaa@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 3c720d083ab0..443062faff5e 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -618,11 +618,17 @@ static u32 vlv_get_pipestat_enable_mask(struct drm_device *dev, u32 status_mask) u32 enable_mask = status_mask << 16; /* - * On pipe A we don't support the PSR interrupt yet, on pipe B the - * same bit MBZ. + * On pipe A we don't support the PSR interrupt yet, + * on pipe B and C the same bit MBZ. */ if (WARN_ON_ONCE(status_mask & PIPE_A_PSR_STATUS_VLV)) return 0; + /* + * On pipe B and C we don't support the PSR interrupt yet, on pipe + * A the same bit is for perf counters which we don't use either. + */ + if (WARN_ON_ONCE(status_mask & PIPE_B_PSR_STATUS_VLV)) + return 0; enable_mask &= ~(PIPE_FIFO_UNDERRUN_STATUS | SPRITE0_FLIP_DONE_INT_EN_VLV | |