In apparent haste to generalize, the old version got left behind. This patch
removes the old version and cleans up the generalization in the new one.
Signed-off-by: Jonas Bonn <jo...@southpole.se>
---
drivers/gpu/drm/i915/intel_display.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 64773ce..3148cda 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1836,12 +1836,6 @@ static void intel_setup_outputs(struct drm_device *dev)
int found;
u32 reg;
- if (I915_READ(SDVOB) & SDVO_DETECTED) {
- found = intel_sdvo_init(dev, SDVOB);
- if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- intel_hdmi_init(dev, SDVOB);
- }
-
/* Before G4X SDVOC doesn't have its own detect register */
if (IS_G4X(dev))
reg = SDVOC;
@@ -1849,9 +1843,9 @@ static void intel_setup_outputs(struct drm_device *dev)
reg = SDVOB;
if (I915_READ(reg) & SDVO_DETECTED) {
- found = intel_sdvo_init(dev, SDVOC);
+ found = intel_sdvo_init(dev, reg);
if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
- intel_hdmi_init(dev, SDVOC);
+ intel_hdmi_init(dev, reg);
}
} else
intel_dvo_init(dev);
--
1.6.0.4
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
