summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_fbc.c
diff options
context:
space:
mode:
authorDaniele Ceraolo Spurio2019-03-25 22:49:39 +0100
committerChris Wilson2019-03-26 21:20:24 +0100
commit97a04e0d07c4b32dd76c6a03b3384170b738972f (patch)
tree7451750610b3e866a7d0629078411f6a53005f43 /drivers/gpu/drm/i915/intel_fbc.c
parentdrm/i915: intel_wait_for_register_fw to uncore (diff)
downloadkernel-qcow2-linux-97a04e0d07c4b32dd76c6a03b3384170b738972f.tar.gz
kernel-qcow2-linux-97a04e0d07c4b32dd76c6a03b3384170b738972f.tar.xz
kernel-qcow2-linux-97a04e0d07c4b32dd76c6a03b3384170b738972f.zip
drm/i915: switch intel_wait_for_register to uncore
The intel_uncore structure is the owner of register access, so subclass the function to it. While at it, use a local uncore var and switch to the new read/write functions where it makes sense. Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20190325214940.23632-9-daniele.ceraolospurio@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbc.c')
-rw-r--r--drivers/gpu/drm/i915/intel_fbc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 656e684e7c9a..43fe08be3b7d 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -108,7 +108,7 @@ static void i8xx_fbc_deactivate(struct drm_i915_private *dev_priv)
I915_WRITE(FBC_CONTROL, fbc_ctl);
/* Wait for compressing bit to clear */
- if (intel_wait_for_register(dev_priv,
+ if (intel_wait_for_register(&dev_priv->uncore,
FBC_STATUS, FBC_STAT_COMPRESSING, 0,
10)) {
DRM_DEBUG_KMS("FBC idle timed out\n");