diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-04-09 06:28:06 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-06 15:17:17 -0400 |
commit | fac12f6cdcb25cac8f28818a8f9adb079575f9a0 (patch) | |
tree | a21ec530e5d4a88658619d66ddb23e545aa8a971 /drivers/gpu/drm/i915/i915_reg.h | |
parent | f3c67fdd6112a6af9505f3af782e145024aa9643 (diff) |
drm/i915/chv: Add display interrupt registers bits for Cherryview
v2: Rebase on top of Ben's GT interrupt shuffling.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rafael Barbalho <rafael.barbalho@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 3fe9b56337ab..4250717e8dec 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h | |||
@@ -1124,24 +1124,43 @@ enum punit_power_well { | |||
1124 | 1124 | ||
1125 | /* These are all the "old" interrupts */ | 1125 | /* These are all the "old" interrupts */ |
1126 | #define ILK_BSD_USER_INTERRUPT (1<<5) | 1126 | #define ILK_BSD_USER_INTERRUPT (1<<5) |
1127 | |||
1128 | #define I915_PM_INTERRUPT (1<<31) | ||
1129 | #define I915_ISP_INTERRUPT (1<<22) | ||
1130 | #define I915_LPE_PIPE_B_INTERRUPT (1<<21) | ||
1131 | #define I915_LPE_PIPE_A_INTERRUPT (1<<20) | ||
1132 | #define I915_MIPIB_INTERRUPT (1<<19) | ||
1133 | #define I915_MIPIA_INTERRUPT (1<<18) | ||
1127 | #define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1<<18) | 1134 | #define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1<<18) |
1128 | #define I915_DISPLAY_PORT_INTERRUPT (1<<17) | 1135 | #define I915_DISPLAY_PORT_INTERRUPT (1<<17) |
1136 | #define I915_DISPLAY_PIPE_C_HBLANK_INTERRUPT (1<<16) | ||
1137 | #define I915_MASTER_ERROR_INTERRUPT (1<<15) | ||
1129 | #define I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT (1<<15) | 1138 | #define I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT (1<<15) |
1139 | #define I915_DISPLAY_PIPE_B_HBLANK_INTERRUPT (1<<14) | ||
1130 | #define I915_GMCH_THERMAL_SENSOR_EVENT_INTERRUPT (1<<14) /* p-state */ | 1140 | #define I915_GMCH_THERMAL_SENSOR_EVENT_INTERRUPT (1<<14) /* p-state */ |
1141 | #define I915_DISPLAY_PIPE_A_HBLANK_INTERRUPT (1<<13) | ||
1131 | #define I915_HWB_OOM_INTERRUPT (1<<13) | 1142 | #define I915_HWB_OOM_INTERRUPT (1<<13) |
1143 | #define I915_LPE_PIPE_C_INTERRUPT (1<<12) | ||
1132 | #define I915_SYNC_STATUS_INTERRUPT (1<<12) | 1144 | #define I915_SYNC_STATUS_INTERRUPT (1<<12) |
1145 | #define I915_MISC_INTERRUPT (1<<11) | ||
1133 | #define I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT (1<<11) | 1146 | #define I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT (1<<11) |
1147 | #define I915_DISPLAY_PIPE_C_VBLANK_INTERRUPT (1<<10) | ||
1134 | #define I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT (1<<10) | 1148 | #define I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT (1<<10) |
1149 | #define I915_DISPLAY_PIPE_C_EVENT_INTERRUPT (1<<9) | ||
1135 | #define I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT (1<<9) | 1150 | #define I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT (1<<9) |
1151 | #define I915_DISPLAY_PIPE_C_DPBM_INTERRUPT (1<<8) | ||
1136 | #define I915_DISPLAY_PLANE_C_FLIP_PENDING_INTERRUPT (1<<8) | 1152 | #define I915_DISPLAY_PLANE_C_FLIP_PENDING_INTERRUPT (1<<8) |
1137 | #define I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT (1<<7) | 1153 | #define I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT (1<<7) |
1138 | #define I915_DISPLAY_PIPE_A_EVENT_INTERRUPT (1<<6) | 1154 | #define I915_DISPLAY_PIPE_A_EVENT_INTERRUPT (1<<6) |
1139 | #define I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT (1<<5) | 1155 | #define I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT (1<<5) |
1140 | #define I915_DISPLAY_PIPE_B_EVENT_INTERRUPT (1<<4) | 1156 | #define I915_DISPLAY_PIPE_B_EVENT_INTERRUPT (1<<4) |
1157 | #define I915_DISPLAY_PIPE_A_DPBM_INTERRUPT (1<<3) | ||
1158 | #define I915_DISPLAY_PIPE_B_DPBM_INTERRUPT (1<<2) | ||
1141 | #define I915_DEBUG_INTERRUPT (1<<2) | 1159 | #define I915_DEBUG_INTERRUPT (1<<2) |
1160 | #define I915_WINVALID_INTERRUPT (1<<1) | ||
1142 | #define I915_USER_INTERRUPT (1<<1) | 1161 | #define I915_USER_INTERRUPT (1<<1) |
1143 | #define I915_ASLE_INTERRUPT (1<<0) | 1162 | #define I915_ASLE_INTERRUPT (1<<0) |
1144 | #define I915_BSD_USER_INTERRUPT (1 << 25) | 1163 | #define I915_BSD_USER_INTERRUPT (1<<25) |
1145 | 1164 | ||
1146 | #define GEN6_BSD_RNCID 0x12198 | 1165 | #define GEN6_BSD_RNCID 0x12198 |
1147 | 1166 | ||