Commit 99d519fe authored by Marijn Suijten's avatar Marijn Suijten Committed by Dmitry Baryshkov
Browse files

drm/msm/dsi: Replace dsi_get_bpp() with mipi_dsi header function 



drm_mipi_dsi.h already provides a conversion function from MIPI_DSI_FMT_
to bpp, named mipi_dsi_pixel_format_to_bpp().

Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/577065/
Link: https://lore.kernel.org/r/20240204-drm-msm-dsi-remove-open-coded-get-bpp-v1-1-c16212de7e86@somainline.org


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent 4825b207

drivers/gpu/drm/msm/dsi/dsi_host.c

+4 −14
Original line number Diff line number Diff line
@@ -183,16 +183,6 @@ struct msm_dsi_host { 
	int irq;

};



static u32 dsi_get_bpp(const enum mipi_dsi_pixel_format fmt)

{

	switch (fmt) {

	case MIPI_DSI_FMT_RGB565:		return 16;

	case MIPI_DSI_FMT_RGB666_PACKED:	return 18;

	case MIPI_DSI_FMT_RGB666:

	case MIPI_DSI_FMT_RGB888:

	default:				return 24;

	}

}



static inline u32 dsi_read(struct msm_dsi_host *msm_host, u32 reg)

{
@@ -567,7 +557,7 @@ unsigned long dsi_byte_clk_get_rate(struct mipi_dsi_host *host, bool is_bonded_d 
{

	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);

	u8 lanes = msm_host->lanes;

	u32 bpp = dsi_get_bpp(msm_host->format);

	u32 bpp = mipi_dsi_pixel_format_to_bpp(msm_host->format);

	unsigned long pclk_rate = dsi_get_pclk_rate(mode, msm_host->dsc, is_bonded_dsi);

	unsigned long pclk_bpp;
@@ -610,7 +600,7 @@ int dsi_calc_clk_rate_6g(struct msm_dsi_host *msm_host, bool is_bonded_dsi) 


int dsi_calc_clk_rate_v2(struct msm_dsi_host *msm_host, bool is_bonded_dsi)

{

	u32 bpp = dsi_get_bpp(msm_host->format);

	u32 bpp = mipi_dsi_pixel_format_to_bpp(msm_host->format);

	unsigned int esc_mhz, esc_div;

	unsigned long byte_mhz;
@@ -993,7 +983,7 @@ static void dsi_timing_setup(struct msm_dsi_host *msm_host, bool is_bonded_dsi) 


		/* image data and 1 byte write_memory_start cmd */

		if (!msm_host->dsc)

			wc = hdisplay * dsi_get_bpp(msm_host->format) / 8 + 1;

			wc = hdisplay * mipi_dsi_pixel_format_to_bpp(msm_host->format) / 8 + 1;

		else

			/*

			 * When DSC is enabled, WC = slice_chunk_size * slice_per_pkt + 1.
@@ -1413,7 +1403,7 @@ static int dsi_cmds2buf_tx(struct msm_dsi_host *msm_host, 
{

	int len, ret;

	int bllp_len = msm_host->mode->hdisplay *

			dsi_get_bpp(msm_host->format) / 8;

			mipi_dsi_pixel_format_to_bpp(msm_host->format) / 8;



	len = dsi_cmd_dma_add(msm_host, msg);

	if (len < 0) {