| Message ID | 20230118021441.161-1-quic_jesszhan@quicinc.com |
|---|---|
| State | Accepted |
| Commit | 7efd4edc6efafa65039c1ce8b3af951aba495e3a |
| Headers | show |
| Series | drm/msm/dpu: Reapply CTM if modeset is needed | expand |
On Wed, 18 Jan 2023 at 04:14, Jessica Zhang <quic_jesszhan@quicinc.com> wrote: > > Add a !drm_atomic_crtc_needs_modeset() check to > _dpu_crtc_setup_cp_blocks() so that CTM is reapplied after a > suspend/resume. .. or if the LM/DSPP blocks were reallocated by resource allocation during the modeset. > > Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/23 > Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index 13ce321283ff..aa120a230222 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -748,7 +748,7 @@ static void _dpu_crtc_setup_cp_blocks(struct drm_crtc *crtc) > int i; > > > - if (!state->color_mgmt_changed) > + if (!state->color_mgmt_changed && !drm_atomic_crtc_needs_modeset(state)) > return; > > for (i = 0; i < cstate->num_mixers; i++) { > -- > 2.39.0 >
On 1/17/2023 6:16 PM, Dmitry Baryshkov wrote: > On Wed, 18 Jan 2023 at 04:14, Jessica Zhang <quic_jesszhan@quicinc.com> wrote: >> >> Add a !drm_atomic_crtc_needs_modeset() check to >> _dpu_crtc_setup_cp_blocks() so that CTM is reapplied after a >> suspend/resume. > > .. or if the LM/DSPP blocks were reallocated by resource allocation > during the modeset. Hi Dmitry, Acked -- will change the commit message in a v2. Thanks, Jessica Zhang > >> >> Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/23 >> Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> >> --- >> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >> index 13ce321283ff..aa120a230222 100644 >> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c >> @@ -748,7 +748,7 @@ static void _dpu_crtc_setup_cp_blocks(struct drm_crtc *crtc) >> int i; >> >> >> - if (!state->color_mgmt_changed) >> + if (!state->color_mgmt_changed && !drm_atomic_crtc_needs_modeset(state)) >> return; >> >> for (i = 0; i < cstate->num_mixers; i++) { >> -- >> 2.39.0 >> > > > -- > With best wishes > Dmitry
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 13ce321283ff..aa120a230222 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -748,7 +748,7 @@ static void _dpu_crtc_setup_cp_blocks(struct drm_crtc *crtc) int i; - if (!state->color_mgmt_changed) + if (!state->color_mgmt_changed && !drm_atomic_crtc_needs_modeset(state)) return; for (i = 0; i < cstate->num_mixers; i++) {
Add a !drm_atomic_crtc_needs_modeset() check to _dpu_crtc_setup_cp_blocks() so that CTM is reapplied after a suspend/resume. Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/23 Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)