fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 10:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

isl,iris: Add I915_FORMAT_MOD_4_TILED support for XeHP

Browse source 
This patch adds Tile 4 modifier support to Mesa and allows Mesa to
use Tile 4 on gen12-hp with GBM.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Cc: 22.1 <mesa-stable>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14521>
(cherry picked from commit ac441d0953)
This commit is contained in:
Anuj Phogat 2020-01-13 12:51:55 -08:00 • committed by Dylan Baker
parent fa4ad4f679
commit 2385ca720b
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1399,7 +1399,7 @@
"description": "isl,iris: Add I915_FORMAT_MOD_4_TILED support for XeHP",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

10
src/gallium/drivers/iris/iris_resource.c
View file

@ -62,6 +62,7 @@ enum modifier_priority {
MODIFIER_PRIORITY_Y_CCS,
MODIFIER_PRIORITY_Y_GFX12_RC_CCS,
MODIFIER_PRIORITY_Y_GFX12_RC_CCS_CC,
MODIFIER_PRIORITY_4,
};
static const uint64_t priority_to_modifier[] = {
@ -72,6 +73,7 @@ static const uint64_t priority_to_modifier[] = {
[MODIFIER_PRIORITY_Y_CCS] = I915_FORMAT_MOD_Y_TILED_CCS,
[MODIFIER_PRIORITY_Y_GFX12_RC_CCS] = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
[MODIFIER_PRIORITY_Y_GFX12_RC_CCS_CC] = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC,
[MODIFIER_PRIORITY_4] = I915_FORMAT_MOD_4_TILED,
};
static bool
@ -100,6 +102,10 @@ modifier_is_supported(const struct intel_device_info *devinfo,
if (devinfo->verx10 != 120)
return false;
break;
case I915_FORMAT_MOD_4_TILED:
if (devinfo->verx10 < 125)
return false;
break;
case DRM_FORMAT_MOD_INVALID:
default:
return false;
@ -160,6 +166,9 @@ select_best_modifier(struct intel_device_info *devinfo,
continue;
switch (modifiers[i]) {
case I915_FORMAT_MOD_4_TILED:
prio = MAX2(prio, MODIFIER_PRIORITY_4);
break;
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
prio = MAX2(prio, MODIFIER_PRIORITY_Y_GFX12_RC_CCS_CC);
break;
@ -214,6 +223,7 @@ iris_query_dmabuf_modifiers(struct pipe_screen *pscreen,
uint64_t all_modifiers[] = {
DRM_FORMAT_MOD_LINEAR,
I915_FORMAT_MOD_X_TILED,
I915_FORMAT_MOD_4_TILED,
I915_FORMAT_MOD_Y_TILED,
I915_FORMAT_MOD_Y_TILED_CCS,
I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,

5
src/intel/isl/isl_drm.c
View file

@ -121,6 +121,11 @@ isl_drm_modifier_info_list[] = {
.aux_usage = ISL_AUX_USAGE_GFX12_CCS_E,
.supports_clear_color = true,
},
{
.modifier = I915_FORMAT_MOD_4_TILED,
.name = "I915_FORMAT_MOD_4_TILED",
.tiling = ISL_TILING_4,
},
{
.modifier = DRM_FORMAT_MOD_INVALID,
},