Add a tiling atttribute to the modifier descriptor, which let's us get the tiling without listing the modifiers twice.
v1-v2: Unchanged. v3: - Initialize .tiling to I915_TILING_NONE explicitly (Ville) - Move from previous patch lookup_modifier() to here, where it's first used. Cc: Juha-Pekka Heikkila <[email protected]> Cc: Ville Syrjälä <[email protected]> Signed-off-by: Imre Deak <[email protected]> Reviewed-by: Juha-Pekka Heikkila <[email protected]> --- drivers/gpu/drm/i915/display/intel_fb.c | 33 ++++++++++++++++--------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index 772a68a9f65b0..06697379a9917 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -120,6 +120,7 @@ struct intel_modifier_desc { .formats = format_list, \ .format_count = ARRAY_SIZE(format_list) + u8 tiling; u8 is_linear:1; struct { @@ -136,24 +137,29 @@ static const struct intel_modifier_desc intel_modifiers[] = { { .modifier = DRM_FORMAT_MOD_LINEAR, .display_ver = DISPLAY_VER_ALL, + .tiling = I915_TILING_NONE, .is_linear = true, }, { .modifier = I915_FORMAT_MOD_X_TILED, .display_ver = DISPLAY_VER_ALL, + .tiling = I915_TILING_X, }, { .modifier = I915_FORMAT_MOD_Y_TILED, .display_ver = { 9, 13 }, + .tiling = I915_TILING_Y, }, { .modifier = I915_FORMAT_MOD_Yf_TILED, .display_ver = { 9, 11 }, + .tiling = I915_TILING_NONE, }, { .modifier = I915_FORMAT_MOD_Y_TILED_CCS, .display_ver = { 9, 11 }, + .tiling = I915_TILING_Y, .ccs.type = INTEL_CCS_RC, @@ -162,6 +168,7 @@ static const struct intel_modifier_desc intel_modifiers[] = { { .modifier = I915_FORMAT_MOD_Yf_TILED_CCS, .display_ver = { 9, 11 }, + .tiling = I915_TILING_NONE, .ccs.type = INTEL_CCS_RC, @@ -170,6 +177,7 @@ static const struct intel_modifier_desc intel_modifiers[] = { { .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS, .display_ver = { 12, 13 }, + .tiling = I915_TILING_Y, .ccs.type = INTEL_CCS_RC, @@ -178,6 +186,7 @@ static const struct intel_modifier_desc intel_modifiers[] = { { .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC, .display_ver = { 12, 13 }, + .tiling = I915_TILING_Y, .ccs.type = INTEL_CCS_RC_CC, @@ -186,6 +195,7 @@ static const struct intel_modifier_desc intel_modifiers[] = { { .modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS, .display_ver = { 12, 13 }, + .tiling = I915_TILING_Y, .ccs.type = INTEL_CCS_MC, @@ -204,6 +214,16 @@ static const struct intel_modifier_desc *lookup_modifier_or_null(u64 modifier) return NULL; } +static const struct intel_modifier_desc *lookup_modifier(u64 modifier) +{ + const struct intel_modifier_desc *md = lookup_modifier_or_null(modifier); + + if (WARN_ON(!md)) + return &intel_modifiers[0]; + + return md; +} + static const struct drm_format_info * lookup_format_info(const struct drm_format_info formats[], int num_formats, u32 format) @@ -535,18 +555,7 @@ intel_fb_align_height(const struct drm_framebuffer *fb, static unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier) { - switch (fb_modifier) { - case I915_FORMAT_MOD_X_TILED: - return I915_TILING_X; - case I915_FORMAT_MOD_Y_TILED: - case I915_FORMAT_MOD_Y_TILED_CCS: - case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS: - case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: - case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS: - return I915_TILING_Y; - default: - return I915_TILING_NONE; - } + return lookup_modifier(fb_modifier)->tiling; } unsigned int intel_cursor_alignment(const struct drm_i915_private *i915) -- 2.27.0
