Skip to content

Commit

Permalink
iris/resource: Support prelim DG2 modifiers when using prelim_drm
Browse files Browse the repository at this point in the history 
Tracked-On: OAM-112578
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
  • Loading branch information
@jljusten2
jljusten2 authored and buildslave committed Nov 2, 2023
1 parent 986f967 commit 710407a
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
29 changes: 29 additions & 0 deletions src/gallium/drivers/iris/iris_resource.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ enum modifier_priority {
MODIFIER_PRIORITY_4,
MODIFIER_PRIORITY_4_DG2_RC_CCS,
MODIFIER_PRIORITY_4_DG2_RC_CCS_CC,
MODIFIER_PRIORITY_PRELIM_F_DG2_RC_CCS,
MODIFIER_PRIORITY_PRELIM_F_DG2_RC_CCS_CC,
};

static const uint64_t priority_to_modifier[] = {
Expand All @@ -78,6 +80,8 @@ static const uint64_t priority_to_modifier[] = {
[MODIFIER_PRIORITY_4] = I915_FORMAT_MOD_4_TILED,
[MODIFIER_PRIORITY_4_DG2_RC_CCS] = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS,
[MODIFIER_PRIORITY_4_DG2_RC_CCS_CC] = I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC,
[MODIFIER_PRIORITY_PRELIM_F_DG2_RC_CCS] = PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS,
[MODIFIER_PRIORITY_PRELIM_F_DG2_RC_CCS_CC] = PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC,
};

static bool
Expand Down Expand Up @@ -116,13 +120,20 @@ modifier_is_supported(const struct intel_device_info *devinfo,
if (devinfo->verx10 < 125 || devinfo->prelim_drm)
return false;
break;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS:
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS:
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC:
if (devinfo->verx10 < 125 || !devinfo->prelim_drm)
return false;
break;
case DRM_FORMAT_MOD_INVALID:
default:
return false;
}

/* Check remaining requirements. */
switch (modifier) {
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS:
case I915_FORMAT_MOD_4_TILED_DG2_MC_CCS:
case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
if (INTEL_DEBUG(DEBUG_NO_CCS))
Expand All @@ -141,6 +152,8 @@ modifier_is_supported(const struct intel_device_info *devinfo,
return false;
}
break;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC:
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS:
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
Expand Down Expand Up @@ -179,6 +192,12 @@ select_best_modifier(const struct intel_device_info *devinfo,
continue;

switch (modifiers[i]) {
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC:
prio = MAX2(prio, MODIFIER_PRIORITY_PRELIM_F_DG2_RC_CCS_CC);
break;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS:
prio = MAX2(prio, MODIFIER_PRIORITY_PRELIM_F_DG2_RC_CCS);
break;
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
prio = MAX2(prio, MODIFIER_PRIORITY_4_DG2_RC_CCS_CC);
break;
Expand Down Expand Up @@ -246,6 +265,9 @@ iris_query_dmabuf_modifiers(struct pipe_screen *pscreen,
I915_FORMAT_MOD_4_TILED_DG2_RC_CCS,
I915_FORMAT_MOD_4_TILED_DG2_MC_CCS,
I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC,
PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS,
PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS,
PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC,
I915_FORMAT_MOD_Y_TILED,
I915_FORMAT_MOD_Y_TILED_CCS,
I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS,
Expand Down Expand Up @@ -304,11 +326,14 @@ iris_get_dmabuf_modifier_planes(struct pipe_screen *pscreen, uint64_t modifier,
switch (modifier) {
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
return 3;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS:
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS:
case I915_FORMAT_MOD_Y_TILED_CCS:
return 2 * planes;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS:
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS:
case I915_FORMAT_MOD_4_TILED_DG2_MC_CCS:
default:
Expand Down Expand Up @@ -1042,6 +1067,7 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
4096, IRIS_MEMZONE_OTHER, BO_ALLOC_ZEROED);
}
break;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS:
assert(num_main_planes == 1);
assert(num_planes == 1);
Expand All @@ -1061,6 +1087,7 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
r[0]->aux.clear_color_offset = r[2]->aux.clear_color_offset;
r[0]->aux.clear_color_unknown = true;
break;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
assert(num_main_planes == 1);
assert(num_planes == 2);
Expand All @@ -1084,6 +1111,7 @@ iris_resource_finish_aux_import(struct pipe_screen *pscreen,
}
assert(!isl_aux_usage_has_fast_clears(res->mod_info->aux_usage));
break;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS:
case I915_FORMAT_MOD_4_TILED_DG2_MC_CCS:
assert(!isl_aux_usage_has_fast_clears(res->mod_info->aux_usage));
break;
Expand Down Expand Up @@ -1362,6 +1390,7 @@ mod_plane_is_clear_color(uint64_t modifier, uint32_t plane)
case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC:
assert(mod_info->supports_clear_color);
return plane == 2;
case PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC:
case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC:
assert(mod_info->supports_clear_color);
return plane == 1;
Expand Down
21 changes: 21 additions & 0 deletions src/intel/isl/isl_drm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,27 @@ isl_drm_modifier_info_list[] = {
.aux_usage = ISL_AUX_USAGE_GFX12_CCS_E,
.supports_clear_color = true,
},
{
.modifier = PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS,
.name = "PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS",
.tiling = ISL_TILING_4,
.aux_usage = ISL_AUX_USAGE_GFX12_CCS_E,
.supports_clear_color = false,
},
{
.modifier = PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS,
.name = "PRELIM_I915_FORMAT_MOD_F_TILED_DG2_MC_CCS",
.tiling = ISL_TILING_4,
.aux_usage = ISL_AUX_USAGE_MC,
.supports_clear_color = false,
},
{
.modifier = PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC,
.name = "PRELIM_I915_FORMAT_MOD_F_TILED_DG2_RC_CCS_CC",
.tiling = ISL_TILING_4,
.aux_usage = ISL_AUX_USAGE_GFX12_CCS_E,
.supports_clear_color = true,
},
{
.modifier = DRM_FORMAT_MOD_INVALID,
},
Expand Down

0 comments on commit 710407a

Please sign in to comment.