Commit 82836692 authored by Kalyan Thota's avatar Kalyan Thota Committed by Dmitry Baryshkov
Browse files

drm/msm/dpu: manage DPU resources if CTM is requested 



Allow modeset to be triggered during CTM enable/disable.
In the modeset callbacks, DPU resources required for the
CTM feature are managed appropriately.

Signed-off-by: default avatarKalyan Thota <quic_kalyant@quicinc.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/522448/
Link: https://lore.kernel.org/r/1676286704-818-5-git-send-email-quic_kalyant@quicinc.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
parent f4eddf1d

drivers/gpu/drm/msm/msm_atomic.c

+18 −0
Original line number Diff line number Diff line
@@ -179,6 +179,24 @@ static unsigned get_crtc_mask(struct drm_atomic_state *state) 
	return mask;

}



int msm_atomic_check(struct drm_device *dev, struct drm_atomic_state *state)

{

	struct drm_crtc_state *old_crtc_state, *new_crtc_state;

	struct drm_crtc *crtc;

	int i;



	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,

				      new_crtc_state, i) {

		if ((old_crtc_state->ctm && !new_crtc_state->ctm) ||

		    (!old_crtc_state->ctm && new_crtc_state->ctm)) {

			new_crtc_state->mode_changed = true;

			state->allow_modeset = true;

		}

	}



	return drm_atomic_helper_check(dev, state);

}



void msm_atomic_commit_tail(struct drm_atomic_state *state)

{

	struct drm_device *dev = state->dev;

drivers/gpu/drm/msm/msm_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
static const struct drm_mode_config_funcs mode_config_funcs = {

	.fb_create = msm_framebuffer_create,

	.output_poll_changed = drm_fb_helper_output_poll_changed,

	.atomic_check = drm_atomic_helper_check,

	.atomic_check = msm_atomic_check,

	.atomic_commit = drm_atomic_helper_commit,

};

drivers/gpu/drm/msm/msm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ int msm_atomic_init_pending_timer(struct msm_pending_timer *timer, 
		struct msm_kms *kms, int crtc_idx);

void msm_atomic_destroy_pending_timer(struct msm_pending_timer *timer);

void msm_atomic_commit_tail(struct drm_atomic_state *state);

int msm_atomic_check(struct drm_device *dev, struct drm_atomic_state *state);

struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev);

void msm_atomic_state_clear(struct drm_atomic_state *state);

void msm_atomic_state_free(struct drm_atomic_state *state);