From: Ville Syrjälä Date: Thu, 9 Mar 2017 15:44:31 +0000 (+0200) Subject: drm/i915: s/__raw_i915_read32/I915_READ_FW/ in the SKL+ scanline read w/a X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=707bdd3f66b0314bc861f74e8215fc17ac5e28f0;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drm/i915: s/__raw_i915_read32/I915_READ_FW/ in the SKL+ scanline read w/a 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ä Link: http://patchwork.freedesktop.org/patch/msgid/20170309154434.29303-3-ville.syrjala@linux.intel.com Reviewed-by: Mika Kahola Reviewed-by: Maarten Lankhorst --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index da5137fbf6d5..31f0d7c8992f 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -812,8 +812,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;