| Message ID | 20170309154434.29303-3-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2017-03-09 at 17:44 +0200, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Replace __raw_i915_read32() with I915_READ_FW() in the workaround for > the SKL+ scanline counter hardware fail. The two are the same thing > but everyone else uses I915_READ_FW() so let's follow suit. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Mika Kahola <mika.kahola@intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c > b/drivers/gpu/drm/i915/i915_irq.c > index 70214e1fcd10..3c2109b4be2c 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -817,8 +817,7 @@ static int __intel_get_crtc_scanline(struct > intel_crtc *crtc) > > for (i = 0; i < 100; i++) { > udelay(1); > - temp = __raw_i915_read32(dev_priv, > PIPEDSL(pipe)) & > - DSL_LINEMASK_GEN3; > + temp = I915_READ_FW(PIPEDSL(pipe)) & > DSL_LINEMASK_GEN3; > if (temp != position) { > position = temp; > break;
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 70214e1fcd10..3c2109b4be2c 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -817,8 +817,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc) for (i = 0; i < 100; i++) { udelay(1); - temp = __raw_i915_read32(dev_priv, PIPEDSL(pipe)) & - DSL_LINEMASK_GEN3; + temp = I915_READ_FW(PIPEDSL(pipe)) & DSL_LINEMASK_GEN3; if (temp != position) { position = temp; break;