Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 725e30ad authored by Eric Anholt's avatar Eric Anholt Committed by Dave Airlie
Browse files

drm/i915: Skip SDVO/HDMI init when the chipset tells us it's not present. 



This saves startup time from probing SDVO, and saves setting up HDMI outputs
on G4X devices that don't have them.

Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent e806b495

drivers/gpu/drm/i915/intel_display.c

+11 −7
Original line number Diff line number Diff line
@@ -1452,6 +1452,7 @@ static int intel_connector_clones(struct drm_device *dev, int type_mask) 


static void intel_setup_outputs(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_connector *connector;



	intel_crt_init(dev);
@@ -1463,13 +1464,16 @@ static void intel_setup_outputs(struct drm_device *dev) 
	if (IS_I9XX(dev)) {

		int found;



		if (I915_READ(SDVOB) & SDVO_DETECTED) {

			found = intel_sdvo_init(dev, SDVOB);

			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))

				intel_hdmi_init(dev, SDVOB);



		}

		if (!IS_G4X(dev) || (I915_READ(SDVOB) & SDVO_DETECTED)) {

			found = intel_sdvo_init(dev, SDVOC);

			if (!found && SUPPORTS_INTEGRATED_HDMI(dev))

				intel_hdmi_init(dev, SDVOC);

		}

	} else

		intel_dvo_init(dev);