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

Commit 1c0f1b3d authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: s/IS_G4X && !IS_GM45/IS_G45/ 



We have IS_G45 these days. Let's use it instead of the
'IS_G4X && !IS_GM45' construct.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614180500.2565-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent b2209e62

drivers/gpu/drm/i915/intel_crt.c

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) 
	 * to get a reliable result.

	 */



	if (IS_G4X(dev_priv) && !IS_GM45(dev_priv))

	if (IS_G45(dev_priv))

		tries = 2;

	else

		tries = 1;

drivers/gpu/drm/i915/intel_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -6421,7 +6421,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
	 * 0xd.  Failure to do so will result in spurious interrupts being

	 * generated on the port when a cable is not attached.

	 */

	if (IS_G4X(dev_priv) && !IS_GM45(dev_priv)) {

	if (IS_G45(dev_priv)) {

		u32 temp = I915_READ(PEG_BAND_GAP_DATA);

		I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);

	}

drivers/gpu/drm/i915/intel_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -2341,7 +2341,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, 
	 * 0xd.  Failure to do so will result in spurious interrupts being

	 * generated on the port when a cable is not attached.

	 */

	if (IS_G4X(dev_priv) && !IS_GM45(dev_priv)) {

	if (IS_G45(dev_priv)) {

		u32 temp = I915_READ(PEG_BAND_GAP_DATA);

		I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);

	}