Merge tag 'gvt-next-fixes-2019-09-06' of https://github.com/intel/gvt-linux into...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gvt / firmware.c

diff --git a/drivers/gpu/drm/i915/gvt/firmware.c b/drivers/gpu/drm/i915/gvt/firmware.c
index 4ac18b4..049775e 100644 (file)
--- 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;
 }