drm/amd/display: Revert logic for plane modifiers
PATCH 1/1 drm/amd/display: Revert logic for plane modifiers
This file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f ("drm/amd/display: Create a file dedicated to planes") the logic in dm_plane_format_mod_supported() function got changed by a switch logic. That change broke drm_plane modifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reproted on GitHub[1]
To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcube
With said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +++---------------- 1 file changed, 8 insertions(+), 42 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +8 -42
@@ -1371,6 +1371,8 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,const struct drm_format_info *info =drm_format_info (format);struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; +int i; +enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;if (!info)
@@ -1386,49 +1388,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check
Signature · 1 line
2.38.0
Quoted 24 lines · Joaquín Ignacio Aramendía
This file was split in commit
5d945cbcd4b16a29d6470a80dfb19738f9a4319f("drm/amd/display: Create a file dedicated to planes") the logic indm_plane_format_mod_supported()function got changed by a switch logic. That change brokedrm_planemodifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reproted on GitHub[1]To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcubeWith said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624>> Signed-off-by: Joaquín Ignacio Aramendía <[email protected]>
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +++---------------- 1 file changed, 8 insertions(+), 42 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +0
-0
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c static bool dm_plane_format_mod_supported(struct drm_plane *plane, · line 1372
Quoted 2 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +0
-0@@ -1371,6 +1371,8 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,const struct drm_format_info *info =drm_format_info (format);struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id;
Hi,
First of all, thanks a lot for this patch.
You can drop asic_id since it is not used anymore.
Thanks
Siqueira
Quoted 62 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +8
-42+int i; +enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;if (!info)@@ -1386,49 +1388,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check
PATCH 1/1 drm/amd/display: Revert logic for plane modifiers
This file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f ("drm/amd/display: Create a file dedicated to planes") and the logic in dm_plane_format_mod_supported() function got changed by a switch logic. That change broke drm_plane modifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1]
To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcube
With said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 51 +++---------------- 1 file changed, 8 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +8 -43
@@ -1369,7 +1369,8 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format); -struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; + +int i;enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;
@@ -1386,49 +1387,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check
--
2.38.1
Please also add a
to ensure it gets backported.
Quoted 27 lines · Joaquín Ignacio Aramendía
This file was split in commit
5d945cbcd4b16a29d6470a80dfb19738f9a4319f("drm/amd/display: Create a file dedicated to planes") and the logic indm_plane_format_mod_supported()function got changed by a switch logic. That change brokedrm_planemodifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1]To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcubeWith said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
Signed-off-by Joaquín Ignacio Aramendía <[email protected]>--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 51 +++---------------- 1 file changed, 8 insertions(+), 43 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +0
-0
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c static bool dm_plane_format_mod_supported(struct drm_plane *plane, · line 1372
Quoted 5 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +1
-1@@ -1369,7 +1369,8 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format); -struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; +
Can remove this newline.
With that removed, this patch is
Thanks,
Bas
Quoted 63 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +7
-43+int i;enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;@@ -1386,49 +1387,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check -- 2.38.1
PATCH v2 1/1 drm/amd/display: Revert logic for plane modifiers
This file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f ("drm/amd/display: Create a file dedicated to planes") and the logic in dm_plane_format_mod_supported() function got changed by a switch logic. That change broke drm_plane modifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1]
To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcube
With said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
---
Removed asic_id and excess newlines
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +++---------------- 1 file changed, 7 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +7 -43
@@ -1369,7 +1369,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format); -struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; +int i;enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;
@@ -1386,49 +1386,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check
--
2.38.1
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'
Subject: [PATCH v2] drm/amd/display: Revert logic for plane modifiers
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
PATCH v2 1/1 drm/amd/display: Revert logic for plane modifiers
In reply to Bas NieuwenhuizenThis file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f ("drm/amd/display: Create a file dedicated to planes") and the logic in dm_plane_format_mod_supported() function got changed by a switch logic. That change broke drm_plane modifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1]
To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcube
With said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
---
Removed asic_id and excess newlines. Resend with correct Cc line.
--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +++---------------- 1 file changed, 7 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +7 -43
@@ -1369,7 +1369,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format); -struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; +int i;enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;
@@ -1386,49 +1386,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check
--
2.38.1
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 98 lines · Joaquín Ignacio Aramendía
This file was split in commit
5d945cbcd4b16a29d6470a80dfb19738f9a4319f("drm/amd/display: Create a file dedicated to planes") and the logic indm_plane_format_mod_supported()function got changed by a switch logic. That change brokedrm_planemodifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1]To reproduce the issue, enter a TTY and run:
$ gamescope -- vkcubeWith said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope.
[1](https://github.com/Plagman/gamescope/issues/624)
Cc <[email protected]> # 6.0.xSigned-off-by Joaquín Ignacio Aramendía <[email protected]>Reviewed-by Bas Nieuwenhuizen <[email protected]>---
Removedasic_idand excess newlines. Resend with correct Cc line.--- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 50 +++---------------- 1 file changed, 7 insertions(+), 43 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +7
-44@@ -1369,7 +1369,7 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, {struct amdgpu_device *adev =drm_to_adev (plane->dev);const struct drm_format_info *info =drm_format_info (format); -struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; +int i;enum dm_micro_swizzle microtile =modifier_gfx9_swizzle_mode (modifier) &3 ;@@ -1386,49 +1386,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane,return true; } -/* check if swizzle mode is supported by this version of DCN */ -switch (asic_id.chip_family) { -case FAMILY_SI : -case FAMILY_CI : -case FAMILY_KV : -case FAMILY_CZ : -case FAMILY_VI : -/* asics before AI does not have modifier support */ -return false; -case FAMILY_AI : -case FAMILY_RV : -case FAMILY_NV : -case FAMILY_VGH : -case FAMILY_YELLOW_CARP : -case AMDGPU_FAMILY_GC_10_3_6 : -case AMDGPU_FAMILY_GC_10_3_7 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -case AMDGPU_FAMILY_GC_11_0_0 : -case AMDGPU_FAMILY_GC_11_0_1 : -switch (AMD_FMT_MOD_GET (TILE , modifier)) { -case AMD_FMT_MOD_TILE_GFX11_256K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_R_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D_X : -case AMD_FMT_MOD_TILE_GFX9_64K_S_X : -case AMD_FMT_MOD_TILE_GFX9_64K_D : -return true; -default : -return false; - } -break ; -default : -ASSERT (0 );/* Unknown asic */ -break ; +/* Check that the modifier is on the list of the plane's supported modifiers. */ +for (i =0 ; i < plane->modifier_count; i++) { +if (modifier == plane->modifiers[i]) +break ; } +if (i == plane->modifier_count) +return false;/* * For D swizzle the canonical modifier depends on the bpp, so check -- 2.38.1
Hello. Thanks for the reply, Rodrigo
Will redo the patch and resubmit.
Cheers