On Mon, 30 Nov 2015, [email protected] wrote: > From: Ville Syrjälä <[email protected]> > > We have HAS_PCH_LPT_LP() already, so add HAS_PCH_LPT_H() and use it > where appropriate. > > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/intel_dp.c | 2 +- > drivers/gpu/drm/i915/intel_panel.c | 2 +- > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index bc865e234df2..9ab3e25ddf38 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2615,6 +2615,7 @@ struct drm_i915_cmd_table { > #define HAS_PCH_SPT(dev) (INTEL_PCH_TYPE(dev) == PCH_SPT) > #define HAS_PCH_LPT(dev) (INTEL_PCH_TYPE(dev) == PCH_LPT) > #define HAS_PCH_LPT_LP(dev) (__I915__(dev)->pch_id == > INTEL_PCH_LPT_LP_DEVICE_ID_TYPE) > +#define HAS_PCH_LPT_H(dev) (__I915__(dev)->pch_id == > INTEL_PCH_LPT_DEVICE_ID_TYPE) > #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT) > #define HAS_PCH_IBX(dev) (INTEL_PCH_TYPE(dev) == PCH_IBX) > #define HAS_PCH_NOP(dev) (INTEL_PCH_TYPE(dev) == PCH_NOP) > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index f2bfca0ae6b6..77ae5821e9c0 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -711,7 +711,7 @@ static uint32_t hsw_get_aux_clock_divider(struct intel_dp > *intel_dp, int index) > if (index) > return 0; > return DIV_ROUND_CLOSEST(dev_priv->cdclk_freq, 2000); > - } else if (dev_priv->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE) { > + } else if (HAS_PCH_LPT_H(dev_priv)) { > /* Workaround for non-ULT HSW */ > switch (index) { > case 0: return 63; > diff --git a/drivers/gpu/drm/i915/intel_panel.c > b/drivers/gpu/drm/i915/intel_panel.c > index 737e12349e81..d4b18b56f3ca 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -1300,7 +1300,7 @@ static u32 lpt_hz_to_pwm(struct intel_connector > *connector, u32 pwm_freq_hz) > else > mul = 128; > > - if (dev_priv->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE) > + if (HAS_PCH_LPT_H(dev_priv)) > clock = MHz(135); /* LPT:H */ > else > clock = MHz(24); /* LPT:LP */ -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
