| Message ID | 20230118233848.611-1-quic_jesszhan@quicinc.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v3] drm/msm/dpu: Reapply CTM if modeset is needed | expand |
On 1/18/2023 3:38 PM, Jessica Zhang wrote: > Add a !drm_atomic_crtc_needs_modeset() check to > _dpu_crtc_setup_cp_blocks() so that CTM is reapplied if the LM/DSPP > blocks were reallocated during modeset or after a suspend/resume. > > Changes in V2: > - Fixed commit message > > Changes in V3: > - Added mention of suspend/resume case back to commit message > > Closes: https://gitlab.freedesktop.org/drm/msm/-/issues/23 > Signed-off-by: Jessica Zhang <quic_jesszhan@quicinc.com> Reviewed-by: Abhinav Kumar <quic_abhinavk@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++) {
On 19/01/2023 01:38, Jessica Zhang wrote: > Add a !drm_atomic_crtc_needs_modeset() check to > _dpu_crtc_setup_cp_blocks() so that CTM is reapplied if the LM/DSPP > blocks were reallocated during modeset or after a suspend/resume. > > Changes in V2: > - Fixed commit message > > Changes in V3: > - Added mention of suspend/resume case back to commit message > > 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(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
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 if the LM/DSPP blocks were reallocated during modeset or after a suspend/resume. Changes in V2: - Fixed commit message Changes in V3: - Added mention of suspend/resume case back to commit message 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(-)