Skip to content

Commit 7898814

Browse files
committed
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: Abhinav Kumar <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/590420/ Link: https://lore.kernel.org/r/[email protected]
1 parent 88148bf commit 7898814

File tree

8 files changed

+169
-219
lines changed

8 files changed

+169
-219
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,19 +2223,19 @@ void dpu_encoder_helper_phys_setup_cdm(struct dpu_encoder_phys *phys_enc,
22232223

22242224
/* enable 10 bit logic */
22252225
switch (cdm_cfg->output_fmt->chroma_sample) {
2226-
case DPU_CHROMA_RGB:
2226+
case CHROMA_FULL:
22272227
cdm_cfg->h_cdwn_type = CDM_CDWN_DISABLE;
22282228
cdm_cfg->v_cdwn_type = CDM_CDWN_DISABLE;
22292229
break;
2230-
case DPU_CHROMA_H2V1:
2230+
case CHROMA_H2V1:
22312231
cdm_cfg->h_cdwn_type = CDM_CDWN_COSITE;
22322232
cdm_cfg->v_cdwn_type = CDM_CDWN_DISABLE;
22332233
break;
2234-
case DPU_CHROMA_420:
2234+
case CHROMA_420:
22352235
cdm_cfg->h_cdwn_type = CDM_CDWN_COSITE;
22362236
cdm_cfg->v_cdwn_type = CDM_CDWN_OFFSITE;
22372237
break;
2238-
case DPU_CHROMA_H1V2:
2238+
case CHROMA_H1V2:
22392239
default:
22402240
DPU_ERROR("[enc:%d] unsupported chroma sampling type\n",
22412241
DRMID(phys_enc->parent));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc
594594
wb_cfg->dest.height = job->fb->height;
595595
wb_cfg->dest.num_planes = wb_cfg->dest.format->num_planes;
596596

597-
if ((wb_cfg->dest.format->fetch_planes == DPU_PLANE_PLANAR) &&
597+
if ((wb_cfg->dest.format->fetch_planes == MDP_PLANE_PLANAR) &&
598598
(wb_cfg->dest.format->element[0] == C1_B_Cb))
599599
swap(wb_cfg->dest.plane_addr[1], wb_cfg->dest.plane_addr[2]);
600600

0 commit comments

Comments
 (0)