On Tue, 2009-04-21 at 09:29 +0200, Jonas Bonn wrote: > It looks like some code got left behind while generalizing. This patch > removes the old, non-general version and fixes up the generalized version > so that it does what its supposed to.
NAK.
There is SDVOB, and SDVOC.
To detect SDVOB, you look in SDVOB.
To detect SDVOC, you look in SDVOB on old hardware, and SDVOC on new
hardware.
> 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 c2c8e95..3811992 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1838,12 +1838,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;
> @@ -1851,9 +1845,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);
--
Eric Anholt
e...@anholt.net eric.anh...@intel.com
signature.asc
Description: This is a digitally signed message part
------------------------------------------------------------------------------ Stay on top of everything new and different, both inside and around Java (TM) technology - register by April 22, and save $200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco. 300 plus technical and hands-on sessions. Register today. Use priority code J9JMT32. http://p.sf.net/sfu/p
-- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
