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

Commit 3fec3d2f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Ditch SUPPORTS_INTEGRATED_HDMI|DP and use IS_G4X instead 



Since that's really what we want to test for. Note remove the gen5
case doesn't change anything: In intel_setup_outputs ilk is handled
already in the HAS_PCH_SPLIT case, and the register save/restore code
touches registers which simply doesn't exist anymore at all.

v2: Drop UMS parts.

v3: Update commit message to reflect that the reg save/restore code is
gone (Ville).

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d26a5b6e

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -2519,8 +2519,6 @@ struct drm_i915_cmd_table { 
#define HAS_128_BYTE_Y_TILING(dev) (!IS_GEN2(dev) && !(IS_I915G(dev) || \

#define HAS_128_BYTE_Y_TILING(dev) (!IS_GEN2(dev) && !(IS_I915G(dev) || \

						      IS_I915GM(dev)))

						      IS_I915GM(dev)))

#define SUPPORTS_DIGITAL_OUTPUTS(dev)	(!IS_GEN2(dev) && !IS_PINEVIEW(dev))

#define SUPPORTS_DIGITAL_OUTPUTS(dev)	(!IS_GEN2(dev) && !IS_PINEVIEW(dev))

#define SUPPORTS_INTEGRATED_HDMI(dev)	(IS_G4X(dev) || IS_GEN5(dev))

#define SUPPORTS_INTEGRATED_DP(dev)	(IS_G4X(dev) || IS_GEN5(dev))

#define SUPPORTS_TV(dev)		(INTEL_INFO(dev)->supports_tv)

#define SUPPORTS_TV(dev)		(INTEL_INFO(dev)->supports_tv)

#define I915_HAS_HOTPLUG(dev)		 (INTEL_INFO(dev)->has_hotplug)

#define I915_HAS_HOTPLUG(dev)		 (INTEL_INFO(dev)->has_hotplug)

drivers/gpu/drm/i915/intel_display.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -14312,12 +14312,12 @@ static void intel_setup_outputs(struct drm_device *dev) 
		if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {

		if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {

			DRM_DEBUG_KMS("probing SDVOB\n");

			DRM_DEBUG_KMS("probing SDVOB\n");

			found = intel_sdvo_init(dev, GEN3_SDVOB, true);

			found = intel_sdvo_init(dev, GEN3_SDVOB, true);

			if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) {

			if (!found && IS_G4X(dev)) {

				DRM_DEBUG_KMS("probing HDMI on SDVOB\n");

				DRM_DEBUG_KMS("probing HDMI on SDVOB\n");

				intel_hdmi_init(dev, GEN4_HDMIB, PORT_B);

				intel_hdmi_init(dev, GEN4_HDMIB, PORT_B);

			}

			}





			if (!found && SUPPORTS_INTEGRATED_DP(dev))

			if (!found && IS_G4X(dev))

				intel_dp_init(dev, DP_B, PORT_B);

				intel_dp_init(dev, DP_B, PORT_B);

		}

		}
@@ -14330,15 +14330,15 @@ static void intel_setup_outputs(struct drm_device *dev) 




		if (!found && (I915_READ(GEN3_SDVOC) & SDVO_DETECTED)) {

		if (!found && (I915_READ(GEN3_SDVOC) & SDVO_DETECTED)) {





			if (SUPPORTS_INTEGRATED_HDMI(dev)) {

			if (IS_G4X(dev)) {

				DRM_DEBUG_KMS("probing HDMI on SDVOC\n");

				DRM_DEBUG_KMS("probing HDMI on SDVOC\n");

				intel_hdmi_init(dev, GEN4_HDMIC, PORT_C);

				intel_hdmi_init(dev, GEN4_HDMIC, PORT_C);

			}

			}

			if (SUPPORTS_INTEGRATED_DP(dev))

			if (IS_G4X(dev))

				intel_dp_init(dev, DP_C, PORT_C);

				intel_dp_init(dev, DP_C, PORT_C);

		}

		}





		if (SUPPORTS_INTEGRATED_DP(dev) &&

		if (IS_G4X(dev) &&

		    (I915_READ(DP_D) & DP_DETECTED))

		    (I915_READ(DP_D) & DP_DETECTED))

			intel_dp_init(dev, DP_D, PORT_D);

			intel_dp_init(dev, DP_D, PORT_D);

	} else if (IS_GEN2(dev))

	} else if (IS_GEN2(dev))