| Message ID | 20241209-no_3dmux-v2-1-fcad057eb92e@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] drm/msm/dpu: filter out too wide modes if no 3dmux is present | expand |
On Mon, Dec 09, 2024 at 12:15:57PM -0800, Abhinav Kumar wrote: > On chipsets such as QCS615, there is no 3dmux present. In such > a case, a layer exceeding the max_mixer_width cannot be split, > hence cannot be supported. > > Filter out the modes which exceed the max_mixer_width when there > is no 3dmux present. Also, add a check in the dpu_crtc_atomic_check() > to return failure for such modes. > > Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> > --- > Note: this was only compile tested, so its pending validation on QCS615 > --- > Changes in v2: > - replace MODE_BAD with MODE_BAD_HVALUE to indicate the failure better > - Link to v1: https://lore.kernel.org/r/20241206-no_3dmux-v1-1-72ad2677a323@quicinc.com > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 9f6ffd344693ecfb633095772a31ada5613345dc..87d76f388bef48c880ae70ddcdb76ccb0336ad32 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -732,6 +732,13 @@ static int _dpu_crtc_check_and_setup_lm_bounds(struct drm_crtc *crtc, > struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc); > int i; > > + /* if we cannot merge 2 LMs (no 3d mux) better to fail earlier > + * before even checking the width after the split > + */ > + if (!dpu_kms->catalog->caps->has_3d_merge > + && adj_mode->hdisplay > dpu_kms->catalog->caps->max_mixer_width) Excuse me that I didn't notice that earlier. && should go to the previous line, not to the next line. > + return -E2BIG; > + > for (i = 0; i < cstate->num_mixers; i++) { > struct drm_rect *r = &cstate->lm_bounds[i]; > r->x1 = crtc_split_width * i; > @@ -1251,6 +1258,12 @@ static enum drm_mode_status dpu_crtc_mode_valid(struct drm_crtc *crtc, > { > struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc); > > + /* if there is no 3d_mux block we cannot merge LMs so we cannot > + * split the large layer into 2 LMs, filter out such modes > + */ > + if (!dpu_kms->catalog->caps->has_3d_merge > + && mode->hdisplay > dpu_kms->catalog->caps->max_mixer_width) > + return MODE_BAD_HVALUE; > /* > * max crtc width is equal to the max mixer width * 2 and max height is 4K > */ > > --- > base-commit: af2ea8ab7a546b430726183458da0a173d331272 > change-id: 20241206-no_3dmux-521a55ea0669 > > Best regards, > -- > Abhinav Kumar <quic_abhinavk@quicinc.com> >
On 12/9/2024 1:05 PM, Dmitry Baryshkov wrote: > On Mon, Dec 09, 2024 at 12:15:57PM -0800, Abhinav Kumar wrote: >> On chipsets such as QCS615, there is no 3dmux present. In such >> a case, a layer exceeding the max_mixer_width cannot be split, >> hence cannot be supported. >> >> Filter out the modes which exceed the max_mixer_width when there >> is no 3dmux present. Also, add a check in the dpu_crtc_atomic_check() >> to return failure for such modes. >> >> Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> >> --- >> Note: this was only compile tested, so its pending validation on QCS615 >> --- >> Changes in v2: >> - replace MODE_BAD with MODE_BAD_HVALUE to indicate the failure better >> - Link to v1: https://lore.kernel.org/r/20241206-no_3dmux-v1-1-72ad2677a323@quicinc.com >> --- >> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >> index 9f6ffd344693ecfb633095772a31ada5613345dc..87d76f388bef48c880ae70ddcdb76ccb0336ad32 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >> @@ -732,6 +732,13 @@ static int _dpu_crtc_check_and_setup_lm_bounds(struct drm_crtc *crtc, >> struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc); >> int i; >> >> + /* if we cannot merge 2 LMs (no 3d mux) better to fail earlier >> + * before even checking the width after the split >> + */ >> + if (!dpu_kms->catalog->caps->has_3d_merge >> + && adj_mode->hdisplay > dpu_kms->catalog->caps->max_mixer_width) > > Excuse me that I didn't notice that earlier. && should go to the > previous line, not to the next line. > Thanks for catching. My bad, I forgot the --strict while running checkpatch. That had also reported this. Fixed this in v3. >> + return -E2BIG; >> + >> for (i = 0; i < cstate->num_mixers; i++) { >> struct drm_rect *r = &cstate->lm_bounds[i]; >> r->x1 = crtc_split_width * i; >> @@ -1251,6 +1258,12 @@ static enum drm_mode_status dpu_crtc_mode_valid(struct drm_crtc *crtc, >> { >> struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc); >> >> + /* if there is no 3d_mux block we cannot merge LMs so we cannot >> + * split the large layer into 2 LMs, filter out such modes >> + */ >> + if (!dpu_kms->catalog->caps->has_3d_merge >> + && mode->hdisplay > dpu_kms->catalog->caps->max_mixer_width) >> + return MODE_BAD_HVALUE; >> /* >> * max crtc width is equal to the max mixer width * 2 and max height is 4K >> */ >> >> --- >> base-commit: af2ea8ab7a546b430726183458da0a173d331272 >> change-id: 20241206-no_3dmux-521a55ea0669 >> >> Best regards, >> -- >> Abhinav Kumar <quic_abhinavk@quicinc.com> >> >
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 9f6ffd344693ecfb633095772a31ada5613345dc..87d76f388bef48c880ae70ddcdb76ccb0336ad32 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -732,6 +732,13 @@ static int _dpu_crtc_check_and_setup_lm_bounds(struct drm_crtc *crtc, struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc); int i; + /* if we cannot merge 2 LMs (no 3d mux) better to fail earlier + * before even checking the width after the split + */ + if (!dpu_kms->catalog->caps->has_3d_merge + && adj_mode->hdisplay > dpu_kms->catalog->caps->max_mixer_width) + return -E2BIG; + for (i = 0; i < cstate->num_mixers; i++) { struct drm_rect *r = &cstate->lm_bounds[i]; r->x1 = crtc_split_width * i; @@ -1251,6 +1258,12 @@ static enum drm_mode_status dpu_crtc_mode_valid(struct drm_crtc *crtc, { struct dpu_kms *dpu_kms = _dpu_crtc_get_kms(crtc); + /* if there is no 3d_mux block we cannot merge LMs so we cannot + * split the large layer into 2 LMs, filter out such modes + */ + if (!dpu_kms->catalog->caps->has_3d_merge + && mode->hdisplay > dpu_kms->catalog->caps->max_mixer_width) + return MODE_BAD_HVALUE; /* * max crtc width is equal to the max mixer width * 2 and max height is 4K */
On chipsets such as QCS615, there is no 3dmux present. In such a case, a layer exceeding the max_mixer_width cannot be split, hence cannot be supported. Filter out the modes which exceed the max_mixer_width when there is no 3dmux present. Also, add a check in the dpu_crtc_atomic_check() to return failure for such modes. Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> --- Note: this was only compile tested, so its pending validation on QCS615 --- Changes in v2: - replace MODE_BAD with MODE_BAD_HVALUE to indicate the failure better - Link to v1: https://lore.kernel.org/r/20241206-no_3dmux-v1-1-72ad2677a323@quicinc.com --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) --- base-commit: af2ea8ab7a546b430726183458da0a173d331272 change-id: 20241206-no_3dmux-521a55ea0669 Best regards,