summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/gvt/firmware.c
diff options
context:
space:
mode:
authorTvrtko Ursulin <tvrtko.ursulin@intel.com>2019-06-11 11:45:47 +0100
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>2019-06-12 15:33:13 +0100
commit5a31d30b22c04615329132f0c7fa20b4b6079b43 (patch)
tree79d520aa6ff936354ccfc8096a15b59ae76d1aa2 /drivers/gpu/drm/i915/gvt/firmware.c
parent54ac6479737be1d00adbacb659c79d3393028c08 (diff)
downloadlinux-stable-5a31d30b22c04615329132f0c7fa20b4b6079b43.tar.gz
linux-stable-5a31d30b22c04615329132f0c7fa20b4b6079b43.tar.bz2
linux-stable-5a31d30b22c04615329132f0c7fa20b4b6079b43.zip
drm/i915: Remove I915_READ_NOTRACE
Only a few call sites remain which have been converted to uncore mmio accessors and so the macro can be removed. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190611104548.30545-5-tvrtko.ursulin@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/firmware.c')
-rw-r--r--drivers/gpu/drm/i915/gvt/firmware.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index 4ac18b447247..049775e8e350 100644
--- a/drivers/gpu/drm/i915/gvt/firmware.c
+++ b/drivers/gpu/drm/i915/gvt/firmware.c
@@ -68,9 +68,10 @@ static struct bin_attribute firmware_attr = {
static int mmio_snapshot_handler(struct intel_gvt *gvt, u32 offset, void *data)
{
- struct drm_i915_private *dev_priv = gvt->dev_priv;
+ struct drm_i915_private *i915 = gvt->dev_priv;
- *(u32 *)(data + offset) = I915_READ_NOTRACE(_MMIO(offset));
+ *(u32 *)(data + offset) = intel_uncore_read_notrace(&i915->uncore,
+ _MMIO(offset));
return 0;
}