Message ID | 20240125193834.7065-16-quic_parellan@quicinc.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Add support for CDM over DP | expand |
On 25/01/2024 21:38, Paloma Arellano wrote: > CDM block supports formats other than H1V2 for DP. Since we are now > adding support for CDM over DP, relax the checks to allow all other > formats for DP other than H1V2. > > Signed-off-by: Paloma Arellano <quic_parellan@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c > index e9cdc7934a499..9016b3ade6bc3 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c > @@ -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 == DPU_CHROMA_H1V2) > return -EINVAL; /*unsupported format */ This means that the original check was incorrect. Please add corresponding Fixes tag and move to the top of the patchset. > opmode = CDM_HDMI_PACK_OP_MODE_EN; > opmode |= (fmt->chroma_sample << 1);
On 1/25/2024 1:58 PM, Dmitry Baryshkov wrote: > On 25/01/2024 21:38, Paloma Arellano wrote: >> CDM block supports formats other than H1V2 for DP. Since we are now >> adding support for CDM over DP, relax the checks to allow all other >> formats for DP other than H1V2. >> >> Signed-off-by: Paloma Arellano <quic_parellan@quicinc.com> >> --- >> drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c >> b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c >> index e9cdc7934a499..9016b3ade6bc3 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c >> @@ -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 == DPU_CHROMA_H1V2) >> return -EINVAL; /*unsupported format */ > > This means that the original check was incorrect. Please add > corresponding Fixes tag and move to the top of the patchset. Ack. > >> opmode = CDM_HDMI_PACK_OP_MODE_EN; >> opmode |= (fmt->chroma_sample << 1); >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c index e9cdc7934a499..9016b3ade6bc3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c @@ -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 == DPU_CHROMA_H1V2) return -EINVAL; /*unsupported format */ opmode = CDM_HDMI_PACK_OP_MODE_EN; opmode |= (fmt->chroma_sample << 1);
CDM block supports formats other than H1V2 for DP. Since we are now adding support for CDM over DP, relax the checks to allow all other formats for DP other than H1V2. Signed-off-by: Paloma Arellano <quic_parellan@quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)