|
@@ -45,7 +45,7 @@
|
|
* and related files, but that will be described in separate chapters.
|
|
* and related files, but that will be described in separate chapters.
|
|
*/
|
|
*/
|
|
|
|
|
|
-static const u32 hpd_ibx[] = {
|
|
|
|
|
|
+static const u32 hpd_ibx[HPD_NUM_PINS] = {
|
|
[HPD_CRT] = SDE_CRT_HOTPLUG,
|
|
[HPD_CRT] = SDE_CRT_HOTPLUG,
|
|
[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG,
|
|
[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG,
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG,
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG,
|
|
@@ -53,7 +53,7 @@ static const u32 hpd_ibx[] = {
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG
|
|
};
|
|
};
|
|
|
|
|
|
-static const u32 hpd_cpt[] = {
|
|
|
|
|
|
+static const u32 hpd_cpt[HPD_NUM_PINS] = {
|
|
[HPD_CRT] = SDE_CRT_HOTPLUG_CPT,
|
|
[HPD_CRT] = SDE_CRT_HOTPLUG_CPT,
|
|
[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG_CPT,
|
|
[HPD_SDVO_B] = SDE_SDVOB_HOTPLUG_CPT,
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
|
|
[HPD_PORT_B] = SDE_PORTB_HOTPLUG_CPT,
|
|
@@ -61,7 +61,7 @@ static const u32 hpd_cpt[] = {
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT
|
|
[HPD_PORT_D] = SDE_PORTD_HOTPLUG_CPT
|
|
};
|
|
};
|
|
|
|
|
|
-static const u32 hpd_mask_i915[] = {
|
|
|
|
|
|
+static const u32 hpd_mask_i915[HPD_NUM_PINS] = {
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_EN,
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_EN,
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_EN,
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_EN,
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_EN,
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_EN,
|
|
@@ -70,7 +70,7 @@ static const u32 hpd_mask_i915[] = {
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_EN
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_EN
|
|
};
|
|
};
|
|
|
|
|
|
-static const u32 hpd_status_g4x[] = {
|
|
|
|
|
|
+static const u32 hpd_status_g4x[HPD_NUM_PINS] = {
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_STATUS,
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_STATUS,
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_G4X,
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_G4X,
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_G4X,
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_G4X,
|
|
@@ -79,7 +79,7 @@ static const u32 hpd_status_g4x[] = {
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS
|
|
[HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS
|
|
};
|
|
};
|
|
|
|
|
|
-static const u32 hpd_status_i915[] = { /* i915 and valleyview are the same */
|
|
|
|
|
|
+static const u32 hpd_status_i915[HPD_NUM_PINS] = { /* i915 and valleyview are the same */
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_STATUS,
|
|
[HPD_CRT] = CRT_HOTPLUG_INT_STATUS,
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915,
|
|
[HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915,
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915,
|
|
[HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915,
|
|
@@ -1506,7 +1506,7 @@ static inline enum port get_port_from_pin(enum hpd_pin pin)
|
|
static inline void intel_hpd_irq_handler(struct drm_device *dev,
|
|
static inline void intel_hpd_irq_handler(struct drm_device *dev,
|
|
u32 hotplug_trigger,
|
|
u32 hotplug_trigger,
|
|
u32 dig_hotplug_reg,
|
|
u32 dig_hotplug_reg,
|
|
- const u32 *hpd)
|
|
|
|
|
|
+ const u32 hpd[HPD_NUM_PINS])
|
|
{
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
int i;
|
|
int i;
|