diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-11-27 04:26:19 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-11-27 04:26:19 +0000 |
| commit | 717d01ffcc35bad5843392d0ce8b11ff2b9ac0ad (patch) | |
| tree | 952264ae06afd792bfafe96088678385b5dcbe34 /sys/dev/pci | |
| parent | 83036f7001b79036f244ea673fae2902cab9cfb4 (diff) | |
drm/amd/display: Update swizzle mode enums
From Alvin Lee
3d68d6ee83144044f610d67304cc194c2af7d0c5 in linux 5.10.y/5.10.82
58065a1e524de30df9a2d8214661d5d7eed0a2d9 in mainline linux
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c index 31218165464..53ac8269353 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -1852,7 +1852,9 @@ static void swizzle_to_dml_params( case DC_SW_VAR_D_X: *sw_mode = dm_sw_var_d_x; break; - + case DC_SW_VAR_R_X: + *sw_mode = dm_sw_var_r_x; + break; default: ASSERT(0); /* Not supported */ break; diff --git a/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h b/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h index 64f9c735f74..e73cee27572 100644 --- a/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h +++ b/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h @@ -80,11 +80,11 @@ enum dm_swizzle_mode { dm_sw_SPARE_13 = 24, dm_sw_64kb_s_x = 25, dm_sw_64kb_d_x = 26, - dm_sw_SPARE_14 = 27, + dm_sw_64kb_r_x = 27, dm_sw_SPARE_15 = 28, dm_sw_var_s_x = 29, dm_sw_var_d_x = 30, - dm_sw_64kb_r_x, + dm_sw_var_r_x = 31, dm_sw_gfx7_2d_thin_l_vp, dm_sw_gfx7_2d_thin_gl, }; |