|
@@ -2790,14 +2790,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
|
|
|
SDVOB_HOTPLUG_INT_STATUS_I915 : SDVOC_HOTPLUG_INT_STATUS_I915;
|
|
|
}
|
|
|
|
|
|
- /* Only enable the hotplug irq if we need it, to work around noisy
|
|
|
- * hotplug lines.
|
|
|
- */
|
|
|
- if (intel_sdvo->hotplug_active) {
|
|
|
- intel_encoder->hpd_pin =
|
|
|
- intel_sdvo->is_sdvob ? HPD_SDVO_B : HPD_SDVO_C;
|
|
|
- }
|
|
|
-
|
|
|
intel_encoder->compute_config = intel_sdvo_compute_config;
|
|
|
intel_encoder->disable = intel_disable_sdvo;
|
|
|
intel_encoder->mode_set = intel_sdvo_mode_set;
|
|
@@ -2816,6 +2808,14 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob)
|
|
|
goto err_output;
|
|
|
}
|
|
|
|
|
|
+ /* Only enable the hotplug irq if we need it, to work around noisy
|
|
|
+ * hotplug lines.
|
|
|
+ */
|
|
|
+ if (intel_sdvo->hotplug_active) {
|
|
|
+ intel_encoder->hpd_pin =
|
|
|
+ intel_sdvo->is_sdvob ? HPD_SDVO_B : HPD_SDVO_C;
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
* Cloning SDVO with anything is often impossible, since the SDVO
|
|
|
* encoder can request a special input timing mode. And even if that's
|