On ke, 2016-07-27 at 19:32 +0100, Chris Wilson wrote: > The merge conflict resolution caused some dev->dev_private to return > from the dead. Kill them with to_i915(). > > Signed-off-by: Chris Wilson <[email protected]>
Reviewed-by: Joonas Lahtinen <[email protected]> > --- > drivers/gpu/drm/i915/i915_sysfs.c | 2 +- > drivers/gpu/drm/i915/intel_pm.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_sysfs.c > b/drivers/gpu/drm/i915/i915_sysfs.c > index d47281b4b1c1..f1ffde7f7c0b 100644 > --- a/drivers/gpu/drm/i915/i915_sysfs.c > +++ b/drivers/gpu/drm/i915/i915_sysfs.c > @@ -323,7 +323,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device > *kdev, > { > struct drm_minor *minor = dev_to_drm_minor(kdev); > struct drm_device *dev = minor->dev; > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > u32 val; > ssize_t ret; > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index a807e1045b1d..94f41e72cf52 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -57,7 +57,7 @@ > > static void gen9_init_clock_gating(struct drm_device *dev) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */ > I915_WRITE(CHICKEN_PAR1_1, > @@ -7056,7 +7056,7 @@ static void kabylake_init_clock_gating(struct > drm_device *dev) > > static void skylake_init_clock_gating(struct drm_device *dev) > { > - struct drm_i915_private *dev_priv = dev->dev_private; > + struct drm_i915_private *dev_priv = to_i915(dev); > > gen9_init_clock_gating(dev); > -- Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
