Skip to content

Commit 2728285

Browse files
quic-kdybcioRob Clark
authored andcommitted
soc: qcom: ubwc: Fill in UBWC swizzle cfg for platforms that lack one
The UBWC 1.0 case is easy - it must be all 3 enabled. UBWC2.0 and 3.x require that level1 is removed, follow suit. Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Konrad Dybcio <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/660983/ Signed-off-by: Rob Clark <[email protected]>
1 parent 709dd2f commit 2728285

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

drivers/soc/qcom/ubwc_config.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@
1515
static const struct qcom_ubwc_cfg_data msm8937_data = {
1616
.ubwc_enc_version = UBWC_1_0,
1717
.ubwc_dec_version = UBWC_1_0,
18+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL1 |
19+
UBWC_SWIZZLE_ENABLE_LVL2 |
20+
UBWC_SWIZZLE_ENABLE_LVL3,
1821
.highest_bank_bit = 14,
1922
};
2023

2124
static const struct qcom_ubwc_cfg_data msm8998_data = {
2225
.ubwc_enc_version = UBWC_1_0,
2326
.ubwc_dec_version = UBWC_1_0,
27+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL1 |
28+
UBWC_SWIZZLE_ENABLE_LVL2 |
29+
UBWC_SWIZZLE_ENABLE_LVL3,
2430
.highest_bank_bit = 15,
2531
};
2632

@@ -70,6 +76,8 @@ static const struct qcom_ubwc_cfg_data sc7280_data = {
7076
static const struct qcom_ubwc_cfg_data sc8180x_data = {
7177
.ubwc_enc_version = UBWC_3_0,
7278
.ubwc_dec_version = UBWC_3_0,
79+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
80+
UBWC_SWIZZLE_ENABLE_LVL3,
7381
.highest_bank_bit = 16,
7482
.macrotile_mode = true,
7583
};
@@ -87,12 +95,16 @@ static const struct qcom_ubwc_cfg_data sc8280xp_data = {
8795
static const struct qcom_ubwc_cfg_data sdm670_data = {
8896
.ubwc_enc_version = UBWC_2_0,
8997
.ubwc_dec_version = UBWC_2_0,
98+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
99+
UBWC_SWIZZLE_ENABLE_LVL3,
90100
.highest_bank_bit = 14,
91101
};
92102

93103
static const struct qcom_ubwc_cfg_data sdm845_data = {
94104
.ubwc_enc_version = UBWC_2_0,
95105
.ubwc_dec_version = UBWC_2_0,
106+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
107+
UBWC_SWIZZLE_ENABLE_LVL3,
96108
.highest_bank_bit = 15,
97109
};
98110

@@ -118,6 +130,8 @@ static const struct qcom_ubwc_cfg_data sm6125_data = {
118130
static const struct qcom_ubwc_cfg_data sm6150_data = {
119131
.ubwc_enc_version = UBWC_2_0,
120132
.ubwc_dec_version = UBWC_2_0,
133+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
134+
UBWC_SWIZZLE_ENABLE_LVL3,
121135
.highest_bank_bit = 14,
122136
};
123137

@@ -133,12 +147,16 @@ static const struct qcom_ubwc_cfg_data sm6350_data = {
133147
static const struct qcom_ubwc_cfg_data sm7150_data = {
134148
.ubwc_enc_version = UBWC_2_0,
135149
.ubwc_dec_version = UBWC_2_0,
150+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
151+
UBWC_SWIZZLE_ENABLE_LVL3,
136152
.highest_bank_bit = 14,
137153
};
138154

139155
static const struct qcom_ubwc_cfg_data sm8150_data = {
140156
.ubwc_enc_version = UBWC_3_0,
141157
.ubwc_dec_version = UBWC_3_0,
158+
.ubwc_swizzle = UBWC_SWIZZLE_ENABLE_LVL2 |
159+
UBWC_SWIZZLE_ENABLE_LVL3,
142160
.highest_bank_bit = 15,
143161
};
144162

0 commit comments

Comments
 (0)