drm/i915: Stop inheriting IP_VER(12, 50)

All the platforms that inherit the media/graphics version
from XE_HPM_FEATURES / XE_HP_FEATURES just override it to another
version. Just set the version directly in the respective struct
and remove the versions from the _FEATURES macros. Since that was the
only use for XE_HPM_FEATURES, remove it completely.

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: Tvrtko Ursulin <tursulin@ursulin.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20240320060543.4034215-4-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index b318b7c6bf73796734ddc34e79326a8435e9042b..8b673fdcf178fc8c982c3d6348081875e3192aed 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -705,8 +705,6 @@ static const struct intel_device_info adl_p_info = {
                I915_GTT_PAGE_SIZE_2M
 
 #define XE_HP_FEATURES \
-       .__runtime.graphics.ip.ver = 12, \
-       .__runtime.graphics.ip.rel = 50, \
        XE_HP_PAGE_SIZES, \
        TGL_CACHELEVEL, \
        .dma_mask_size = 46, \
@@ -730,15 +728,12 @@ static const struct intel_device_info adl_p_info = {
        .__runtime.ppgtt_size = 48, \
        .__runtime.ppgtt_type = INTEL_PPGTT_FULL
 
-#define XE_HPM_FEATURES \
-       .__runtime.media.ip.ver = 12, \
-       .__runtime.media.ip.rel = 50
-
 #define DG2_FEATURES \
        XE_HP_FEATURES, \
-       XE_HPM_FEATURES, \
        DGFX_FEATURES, \
+       .__runtime.graphics.ip.ver = 12, \
        .__runtime.graphics.ip.rel = 55, \
+       .__runtime.media.ip.ver = 12, \
        .__runtime.media.ip.rel = 55, \
        PLATFORM(INTEL_DG2), \
        .has_64k_pages = 1, \
@@ -773,9 +768,10 @@ static const struct intel_device_info ats_m_info = {
 __maybe_unused
 static const struct intel_device_info pvc_info = {
        XE_HPC_FEATURES,
-       XE_HPM_FEATURES,
        DGFX_FEATURES,
+       .__runtime.graphics.ip.ver = 12,
        .__runtime.graphics.ip.rel = 60,
+       .__runtime.media.ip.ver = 12,
        .__runtime.media.ip.rel = 60,
        PLATFORM(INTEL_PONTEVECCHIO),
        .has_flat_ccs = 0,