Commit b183bdf2 authored by Lucas De Marchi's avatar Lucas De Marchi

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: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Acked-by: default avatarTvrtko Ursulin <tursulin@ursulin.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20240320060543.4034215-4-lucas.demarchi@intel.comSigned-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent ecab2a6e
...@@ -705,8 +705,6 @@ static const struct intel_device_info adl_p_info = { ...@@ -705,8 +705,6 @@ static const struct intel_device_info adl_p_info = {
I915_GTT_PAGE_SIZE_2M I915_GTT_PAGE_SIZE_2M
#define XE_HP_FEATURES \ #define XE_HP_FEATURES \
.__runtime.graphics.ip.ver = 12, \
.__runtime.graphics.ip.rel = 50, \
XE_HP_PAGE_SIZES, \ XE_HP_PAGE_SIZES, \
TGL_CACHELEVEL, \ TGL_CACHELEVEL, \
.dma_mask_size = 46, \ .dma_mask_size = 46, \
...@@ -730,15 +728,12 @@ static const struct intel_device_info adl_p_info = { ...@@ -730,15 +728,12 @@ static const struct intel_device_info adl_p_info = {
.__runtime.ppgtt_size = 48, \ .__runtime.ppgtt_size = 48, \
.__runtime.ppgtt_type = INTEL_PPGTT_FULL .__runtime.ppgtt_type = INTEL_PPGTT_FULL
#define XE_HPM_FEATURES \
.__runtime.media.ip.ver = 12, \
.__runtime.media.ip.rel = 50
#define DG2_FEATURES \ #define DG2_FEATURES \
XE_HP_FEATURES, \ XE_HP_FEATURES, \
XE_HPM_FEATURES, \
DGFX_FEATURES, \ DGFX_FEATURES, \
.__runtime.graphics.ip.ver = 12, \
.__runtime.graphics.ip.rel = 55, \ .__runtime.graphics.ip.rel = 55, \
.__runtime.media.ip.ver = 12, \
.__runtime.media.ip.rel = 55, \ .__runtime.media.ip.rel = 55, \
PLATFORM(INTEL_DG2), \ PLATFORM(INTEL_DG2), \
.has_64k_pages = 1, \ .has_64k_pages = 1, \
...@@ -773,9 +768,10 @@ static const struct intel_device_info ats_m_info = { ...@@ -773,9 +768,10 @@ static const struct intel_device_info ats_m_info = {
__maybe_unused __maybe_unused
static const struct intel_device_info pvc_info = { static const struct intel_device_info pvc_info = {
XE_HPC_FEATURES, XE_HPC_FEATURES,
XE_HPM_FEATURES,
DGFX_FEATURES, DGFX_FEATURES,
.__runtime.graphics.ip.ver = 12,
.__runtime.graphics.ip.rel = 60, .__runtime.graphics.ip.rel = 60,
.__runtime.media.ip.ver = 12,
.__runtime.media.ip.rel = 60, .__runtime.media.ip.rel = 60,
PLATFORM(INTEL_PONTEVECCHIO), PLATFORM(INTEL_PONTEVECCHIO),
.has_flat_ccs = 0, .has_flat_ccs = 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment