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

drm/msm/dpu: use format-related definitions from mdp_common.xml.h 



Instead of having DPU-specific defines, switch to the definitions from
the mdp_common.xml.h file. This is the preparation for merged of DPU and
MDP format tables.

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/590420/
Link: https://lore.kernel.org/r/20240420-dpu-format-v2-1-9e93226cbffd@linaro.org
parent 88148bfe

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+4 −4
Original line number Diff line number Diff line
@@ -2223,19 +2223,19 @@ void dpu_encoder_helper_phys_setup_cdm(struct dpu_encoder_phys *phys_enc, 


	/* enable 10 bit logic */

	switch (cdm_cfg->output_fmt->chroma_sample) {

	case DPU_CHROMA_RGB:

	case CHROMA_FULL:

		cdm_cfg->h_cdwn_type = CDM_CDWN_DISABLE;

		cdm_cfg->v_cdwn_type = CDM_CDWN_DISABLE;

		break;

	case DPU_CHROMA_H2V1:

	case CHROMA_H2V1:

		cdm_cfg->h_cdwn_type = CDM_CDWN_COSITE;

		cdm_cfg->v_cdwn_type = CDM_CDWN_DISABLE;

		break;

	case DPU_CHROMA_420:

	case CHROMA_420:

		cdm_cfg->h_cdwn_type = CDM_CDWN_COSITE;

		cdm_cfg->v_cdwn_type = CDM_CDWN_OFFSITE;

		break;

	case DPU_CHROMA_H1V2:

	case CHROMA_H1V2:

	default:

		DPU_ERROR("[enc:%d] unsupported chroma sampling type\n",

			  DRMID(phys_enc->parent));

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c

+1 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc 
	wb_cfg->dest.height = job->fb->height;

	wb_cfg->dest.num_planes = wb_cfg->dest.format->num_planes;



	if ((wb_cfg->dest.format->fetch_planes == DPU_PLANE_PLANAR) &&

	if ((wb_cfg->dest.format->fetch_planes == MDP_PLANE_PLANAR) &&

			(wb_cfg->dest.format->element[0] == C1_B_Cb))

		swap(wb_cfg->dest.plane_addr[1], wb_cfg->dest.plane_addr[2]);

drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c

+145 −145

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static int dpu_hw_cdm_enable(struct dpu_hw_cdm *ctx, struct dpu_hw_cdm_cfg *cdm) 
	dpu_hw_cdm_setup_cdwn(ctx, cdm);



	if (cdm->output_type == CDM_CDWN_OUTPUT_HDMI) {

		if (fmt->chroma_sample == DPU_CHROMA_H1V2)

		if (fmt->chroma_sample == CHROMA_H1V2)

			return -EINVAL; /*unsupported format */

		opmode = CDM_HDMI_PACK_OP_MODE_EN;

		opmode |= (fmt->chroma_sample << 1);

drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c

+3 −3
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ static void dpu_hw_intf_setup_timing_engine(struct dpu_hw_intf *intf, 
				(0x21 << 8));

	else

		/* Interface treats all the pixel data in RGB888 format */

		panel_format = (COLOR_8BIT |

				(COLOR_8BIT << 2) |

				(COLOR_8BIT << 4) |

		panel_format = (BPC8 |

				(BPC8 << 2) |

				(BPC8 << 4) |

				(0x21 << 8));



	DPU_REG_WRITE(c, INTF_HSYNC_CTL, hsync_ctl);