diff options
| author | Imre Deak <imre.deak@intel.com> | 2014-01-16 12:56:53 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-01-22 04:34:37 -0500 |
| commit | bfbdb420f51457935784759ae5ef36b2257666a1 (patch) | |
| tree | 041d86b1d9e04c4f3d1cbb0dc48805e8acfc56cf /drivers | |
| parent | 1d62beeaebf109e1b2b18f1b24ab3279f31aa649 (diff) | |
drm/i915: g4x/vlv: fix dp aux interrupt mask
Fix typo possibly leading to timed out DP aux transactions on ports C,D.
Introduced in:
Commmit 4aeebd7443e36b0a40032e518a9338f48bd27efc
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu Oct 31 09:53:36 2013 +0100
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72210
Signed off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 76126e0ae609..84365cd22092 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
| @@ -2138,7 +2138,8 @@ | |||
| 2138 | #define DP_AUX_CHANNEL_D_INT_STATUS_G4X (1 << 6) | 2138 | #define DP_AUX_CHANNEL_D_INT_STATUS_G4X (1 << 6) |
| 2139 | #define DP_AUX_CHANNEL_C_INT_STATUS_G4X (1 << 5) | 2139 | #define DP_AUX_CHANNEL_C_INT_STATUS_G4X (1 << 5) |
| 2140 | #define DP_AUX_CHANNEL_B_INT_STATUS_G4X (1 << 4) | 2140 | #define DP_AUX_CHANNEL_B_INT_STATUS_G4X (1 << 4) |
| 2141 | #define DP_AUX_CHANNEL_MASK_INT_STATUS_G4X (1 << 4) | 2141 | #define DP_AUX_CHANNEL_MASK_INT_STATUS_G4X (7 << 4) |
| 2142 | |||
| 2142 | /* SDVO is different across gen3/4 */ | 2143 | /* SDVO is different across gen3/4 */ |
| 2143 | #define SDVOC_HOTPLUG_INT_STATUS_G4X (1 << 3) | 2144 | #define SDVOC_HOTPLUG_INT_STATUS_G4X (1 << 3) |
| 2144 | #define SDVOB_HOTPLUG_INT_STATUS_G4X (1 << 2) | 2145 | #define SDVOB_HOTPLUG_INT_STATUS_G4X (1 << 2) |