AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-26 00:35:35 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180614180500.2565-1-ville.syrjala@linux.intel.com
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Ville Syrjälä 2018-06-14 21:05:00 +03:00
parent b2209e62a4
commit 1c0f1b3db7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/intel_crt.c
View File

@ -517,7 +517,7 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
* to get a reliable result. * to get a reliable result.
*/ */
if (IS_G4X(dev_priv) && !IS_GM45(dev_priv)) if (IS_G45(dev_priv))
tries = 2; tries = 2;
else else
tries = 1; tries = 1;

2
drivers/gpu/drm/i915/intel_dp.c
View File

@ -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 * 0xd. Failure to do so will result in spurious interrupts being
* generated on the port when a cable is not attached. * 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); u32 temp = I915_READ(PEG_BAND_GAP_DATA);
I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd); I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
} }

2
drivers/gpu/drm/i915/intel_hdmi.c
View File

@ -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 * 0xd. Failure to do so will result in spurious interrupts being
* generated on the port when a cable is not attached. * 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); u32 temp = I915_READ(PEG_BAND_GAP_DATA);
I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd); I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
} }