Quoting Ville Syrjala (2018-06-14 19:05:00)
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_crt.c | 2 +-
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 95aa29cf2d9c..0ec95901ed58 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -513,7 +513,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;
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index a58bac01aeea..8069618fb451 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -6400,7 +6400,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);
> }
> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> index 09d7d38f0d4e..f1d84a8b42f7 100644
> --- a/drivers/gpu/drm/i915/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> @@ -2340,7 +2340,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);
> }
Reviewed-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
