drm/i915/ddi: Ensure the HW is powered during HW state readout

[cascardo/linux.git] / drivers / gpu / drm / i915 / i915_vgpu.h

diff --git a/drivers/gpu/drm/i915/i915_vgpu.h b/drivers/gpu/drm/i915/i915_vgpu.h
index 21c97f4..3c83b47 100644 (file)
--- a/drivers/gpu/drm/i915/i915_vgpu.h
+++ b/drivers/gpu/drm/i915/i915_vgpu.h
@@ -92,14 +92,10 @@ struct vgt_if {
        uint32_t g2v_notify;
        uint32_t rsv6[7];
 
-       uint32_t pdp0_lo;
-       uint32_t pdp0_hi;
-       uint32_t pdp1_lo;
-       uint32_t pdp1_hi;
-       uint32_t pdp2_lo;
-       uint32_t pdp2_hi;
-       uint32_t pdp3_lo;
-       uint32_t pdp3_hi;
+       struct {
+               uint32_t lo;
+               uint32_t hi;
+       } pdp[4];
 
        uint32_t execlist_context_descriptor_lo;
        uint32_t execlist_context_descriptor_hi;
@@ -108,7 +104,7 @@ struct vgt_if {
 } __packed;
 
 #define vgtif_reg(x) \
-       (VGT_PVINFO_PAGE + (long)&((struct vgt_if *)NULL)->x)
+       _MMIO((VGT_PVINFO_PAGE + (long)&((struct vgt_if *)NULL)->x))
 
 /* vGPU display status to be used by the host side */
 #define VGT_DRV_DISPLAY_NOT_READY 0