Reviewed-by: Mika Kahola <mika.kahola@xxxxxxxxx> On Thu, 2016-09-15 at 17:04 -0700, Manasi Navare wrote: > Replace dev with dev_priv and INTEL_INFO with INTEL_GEN > > Signed-off-by: Manasi Navare <manasi.d.navare@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_dp.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c > b/drivers/gpu/drm/i915/intel_dp.c > index 61d71fa..8061e32 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -230,13 +230,13 @@ static int > intel_dp_source_rates(struct intel_dp *intel_dp, const int > **source_rates) > { > struct intel_digital_port *dig_port = > dp_to_dig_port(intel_dp); > - struct drm_device *dev = dig_port->base.base.dev; > + struct drm_i915_private *dev_priv = to_i915(dig_port- > >base.base.dev); > int size; > > - if (IS_BROXTON(dev)) { > + if (IS_BROXTON(dev_priv)) { > *source_rates = bxt_rates; > size = ARRAY_SIZE(bxt_rates); > - } else if (IS_SKYLAKE(dev) || IS_KABYLAKE(dev)) { > + } else if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv)) { > *source_rates = skl_rates; > size = ARRAY_SIZE(skl_rates); > } else { > @@ -1359,14 +1359,14 @@ intel_dp_aux_init(struct intel_dp *intel_dp) > bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp) > { > struct intel_digital_port *dig_port = > dp_to_dig_port(intel_dp); > - struct drm_device *dev = dig_port->base.base.dev; > + struct drm_i915_private *dev_priv = to_i915(dig_port- > >base.base.dev); > > /* WaDisableHBR2:skl */ > - if (IS_SKL_REVID(dev, 0, SKL_REVID_B0)) > + if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0)) > return false; > > - if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || > IS_BROADWELL(dev) || > - (INTEL_INFO(dev)->gen >= 9)) > + if ((IS_HASWELL(dev_priv) && !IS_HSW_ULX(dev_priv)) || > + IS_BROADWELL(dev_priv) || (INTEL_GEN(dev_priv) >= 9)) > return true; > else > return false; -- Mika Kahola - Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx