Commit cab5b406 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/mdss: rename ubwc_version to ubwc_enc_version 



Rename the ubwc_version field to ubwc_enc_version, it denotes the
version of the UBWC encoder, not the "UBWC version".

Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/550051/
Link: https://lore.kernel.org/r/20230728213320.97309-3-dmitry.baryshkov@linaro.org
parent 0fbe7c7d

drivers/gpu/drm/msm/msm_mdss.c

+15 −15
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define MIN_IB_BW	400000000UL /* Min ib vote 400MB */



struct msm_mdss_data {

	u32 ubwc_version;

	u32 ubwc_enc_version;

	/* can be read from register 0x58 */

	u32 ubwc_dec_version;

	u32 ubwc_swizzle;
@@ -205,10 +205,10 @@ static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss) 
		    (data->highest_bank_bit & 0x3) << 4 |

		    (data->macrotile_mode & 0x1) << 12;



	if (data->ubwc_version == UBWC_3_0)

	if (data->ubwc_enc_version == UBWC_3_0)

		value |= BIT(10);



	if (data->ubwc_version == UBWC_1_0)

	if (data->ubwc_enc_version == UBWC_1_0)

		value |= BIT(8);



	writel_relaxed(value, msm_mdss->mmio + UBWC_STATIC);
@@ -224,7 +224,7 @@ static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss) 


	writel_relaxed(value, msm_mdss->mmio + UBWC_STATIC);



	if (data->ubwc_version == UBWC_3_0) {

	if (data->ubwc_enc_version == UBWC_3_0) {

		writel_relaxed(1, msm_mdss->mmio + UBWC_CTRL_2);

		writel_relaxed(0, msm_mdss->mmio + UBWC_PREDICTION_MODE);

	} else {
@@ -507,13 +507,13 @@ static int mdss_remove(struct platform_device *pdev) 
}



static const struct msm_mdss_data sc7180_data = {

	.ubwc_version = UBWC_2_0,

	.ubwc_enc_version = UBWC_2_0,

	.ubwc_dec_version = UBWC_2_0,

	.ubwc_static = 0x1e,

};



static const struct msm_mdss_data sc7280_data = {

	.ubwc_version = UBWC_3_0,

	.ubwc_enc_version = UBWC_3_0,

	.ubwc_dec_version = UBWC_4_0,

	.ubwc_swizzle = 6,

	.ubwc_static = 1,
@@ -522,14 +522,14 @@ static const struct msm_mdss_data sc7280_data = { 
};



static const struct msm_mdss_data sc8180x_data = {

	.ubwc_version = UBWC_3_0,

	.ubwc_enc_version = UBWC_3_0,

	.ubwc_dec_version = UBWC_3_0,

	.highest_bank_bit = 3,

	.macrotile_mode = 1,

};



static const struct msm_mdss_data sc8280xp_data = {

	.ubwc_version = UBWC_4_0,

	.ubwc_enc_version = UBWC_4_0,

	.ubwc_dec_version = UBWC_4_0,

	.ubwc_swizzle = 6,

	.ubwc_static = 1,
@@ -538,13 +538,13 @@ static const struct msm_mdss_data sc8280xp_data = { 
};



static const struct msm_mdss_data sdm845_data = {

	.ubwc_version = UBWC_2_0,

	.ubwc_enc_version = UBWC_2_0,

	.ubwc_dec_version = UBWC_2_0,

	.highest_bank_bit = 2,

};



static const struct msm_mdss_data sm6350_data = {

	.ubwc_version = UBWC_2_0,

	.ubwc_enc_version = UBWC_2_0,

	.ubwc_dec_version = UBWC_2_0,

	.ubwc_swizzle = 6,

	.ubwc_static = 0x1e,
@@ -552,27 +552,27 @@ static const struct msm_mdss_data sm6350_data = { 
};



static const struct msm_mdss_data sm8150_data = {

	.ubwc_version = UBWC_3_0,

	.ubwc_enc_version = UBWC_3_0,

	.ubwc_dec_version = UBWC_3_0,

	.highest_bank_bit = 2,

};



static const struct msm_mdss_data sm6115_data = {

	.ubwc_version = UBWC_1_0,

	.ubwc_enc_version = UBWC_1_0,

	.ubwc_dec_version = UBWC_2_0,

	.ubwc_swizzle = 7,

	.ubwc_static = 0x11f,

};



static const struct msm_mdss_data sm6125_data = {

	.ubwc_version = UBWC_1_0,

	.ubwc_enc_version = UBWC_1_0,

	.ubwc_dec_version = UBWC_3_0,

	.ubwc_swizzle = 1,

	.highest_bank_bit = 1,

};



static const struct msm_mdss_data sm8250_data = {

	.ubwc_version = UBWC_4_0,

	.ubwc_enc_version = UBWC_4_0,

	.ubwc_dec_version = UBWC_4_0,

	.ubwc_swizzle = 6,

	.ubwc_static = 1,
@@ -582,7 +582,7 @@ static const struct msm_mdss_data sm8250_data = { 
};



static const struct msm_mdss_data sm8550_data = {

	.ubwc_version = UBWC_4_0,

	.ubwc_enc_version = UBWC_4_0,

	.ubwc_dec_version = UBWC_4_3,

	.ubwc_swizzle = 6,

	.ubwc_static = 1,