drm/i915/gvt: Use the full PLANE_KEY*() defines

Stop hand rolling PLANE_KEY*() register defines and just
use the real thing.

Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
CC: Zhi Wang <zhi.wang.linux@gmail.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510152329.24098-8-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
index ad3bf60855bcc7781ca08eb9e42ffad7fcac6501..b53c98cd6d7f9baf6228ace5a67fd71e7e493dd6 100644 (file)
--- a/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
+++ b/drivers/gpu/drm/i915/intel_gvt_mmio_table.c
@@ -1075,15 +1075,15 @@ static int iterate_skl_plus_mmio(struct intel_gvt_mmio_table_iter *iter)
        MMIO_D(_MMIO(0x70034));
        MMIO_D(_MMIO(0x71034));
        MMIO_D(_MMIO(0x72034));
-       MMIO_D(_MMIO(_PLANE_KEYVAL_1(PIPE_A)));
-       MMIO_D(_MMIO(_PLANE_KEYVAL_1(PIPE_B)));
-       MMIO_D(_MMIO(_PLANE_KEYVAL_1(PIPE_C)));
-       MMIO_D(_MMIO(_PLANE_KEYMAX_1(PIPE_A)));
-       MMIO_D(_MMIO(_PLANE_KEYMAX_1(PIPE_B)));
-       MMIO_D(_MMIO(_PLANE_KEYMAX_1(PIPE_C)));
-       MMIO_D(_MMIO(_PLANE_KEYMSK_1(PIPE_A)));
-       MMIO_D(_MMIO(_PLANE_KEYMSK_1(PIPE_B)));
-       MMIO_D(_MMIO(_PLANE_KEYMSK_1(PIPE_C)));
+       MMIO_D(PLANE_KEYVAL(PIPE_A, 0));
+       MMIO_D(PLANE_KEYVAL(PIPE_B, 0));
+       MMIO_D(PLANE_KEYVAL(PIPE_C, 0));
+       MMIO_D(PLANE_KEYMAX(PIPE_A, 0));
+       MMIO_D(PLANE_KEYMAX(PIPE_B, 0));
+       MMIO_D(PLANE_KEYMAX(PIPE_C, 0));
+       MMIO_D(PLANE_KEYMSK(PIPE_A, 0));
+       MMIO_D(PLANE_KEYMSK(PIPE_B, 0));
+       MMIO_D(PLANE_KEYMSK(PIPE_C, 0));
        MMIO_D(_MMIO(0x44500));
 #define CSFE_CHICKEN1_REG(base) _MMIO((base) + 0xD4)
        MMIO_RING_D(CSFE_CHICKEN1_REG);