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

Commit 9418c1f1 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915/chv: Register port D encoders and connectors

parent 71485e0a
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -2457,6 +2457,7 @@ enum punit_power_well {
#define GEN3_SDVOC	0x61160
#define GEN3_SDVOC	0x61160
#define GEN4_HDMIB	GEN3_SDVOB
#define GEN4_HDMIB	GEN3_SDVOB
#define GEN4_HDMIC	GEN3_SDVOC
#define GEN4_HDMIC	GEN3_SDVOC
#define CHV_HDMID	0x6116C
#define PCH_SDVOB	0xe1140
#define PCH_SDVOB	0xe1140
#define PCH_HDMIB	PCH_SDVOB
#define PCH_HDMIB	PCH_SDVOB
#define PCH_HDMIC	0xe1150
#define PCH_HDMIC	0xe1150
+9 −0
Original line number Original line Diff line number Diff line
@@ -11053,6 +11053,15 @@ static void intel_setup_outputs(struct drm_device *dev)
				intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C);
				intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C);
		}
		}


		if (IS_CHERRYVIEW(dev)) {
			if (I915_READ(VLV_DISPLAY_BASE + CHV_HDMID) & SDVO_DETECTED) {
				intel_hdmi_init(dev, VLV_DISPLAY_BASE + CHV_HDMID,
						PORT_D);
				if (I915_READ(VLV_DISPLAY_BASE + DP_D) & DP_DETECTED)
					intel_dp_init(dev, VLV_DISPLAY_BASE + DP_D, PORT_D);
			}
		}

		intel_dsi_init(dev);
		intel_dsi_init(dev);
	} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
	} else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
		bool found = false;
		bool found = false;