Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8acd9ca0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "display: msm: sde: update qos lut after scaler config"

parents 71d4e079 80bf89b8

msm/sde/sde_crtc.c

+1 −8
Original line number Diff line number Diff line
@@ -3257,7 +3257,6 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc, 
	struct drm_encoder *encoder;

	struct drm_device *dev;

	struct sde_kms *sde_kms;

	struct drm_plane *plane;

	struct sde_splash_display *splash_display;

	bool cont_splash_enabled = false, apply_cp_prop = false;

	size_t i;
@@ -3317,14 +3316,8 @@ static void sde_crtc_atomic_begin(struct drm_crtc *crtc, 
	_sde_crtc_blend_setup(crtc, old_state, true);

	_sde_crtc_dest_scaler_setup(crtc);



	if (old_state->mode_changed) {

	if (crtc->state->mode_changed)

		sde_core_perf_crtc_update_uidle(crtc, true);

		drm_atomic_crtc_for_each_plane(plane, crtc) {

			if (plane->state && plane->state->fb)

				_sde_plane_set_qos_lut(plane, crtc,

					plane->state->fb);

		}

	}



	/*

	 * Since CP properties use AXI buffer to program the

msm/sde/sde_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ void sde_plane_set_sid(struct drm_plane *plane, u32 vm) 
	sde_hw_set_sspp_sid(sde_kms->hw_sid, psde->pipe, vm);

}



void _sde_plane_set_qos_lut(struct drm_plane *plane,

static void _sde_plane_set_qos_lut(struct drm_plane *plane,

		struct drm_crtc *crtc,

		struct drm_framebuffer *fb)

{
@@ -3267,7 +3267,7 @@ static int sde_plane_sspp_atomic_update(struct drm_plane *plane, 
	_sde_plane_set_scanout(plane, pstate, &psde->pipe_cfg, fb);



	is_rt = sde_crtc_is_rt_client(crtc, crtc->state);

	if (is_rt != psde->is_rt_pipe) {

	if (is_rt != psde->is_rt_pipe || crtc->state->mode_changed) {

		psde->is_rt_pipe = is_rt;

		pstate->dirty |= SDE_PLANE_DIRTY_QOS;

	}

msm/sde/sde_plane.h

+0 −9
Original line number Diff line number Diff line
@@ -195,15 +195,6 @@ void sde_plane_ctl_flush(struct drm_plane *plane, struct sde_hw_ctl *ctl, 
 */

void sde_plane_restore(struct drm_plane *plane);



/**

 * _sde_plane_set_qos_lut - set danger, safe and creq LUT of the given plane

 * @plane:		Pointer to drm plane

 * @crtc:		Pointer to drm crtc to find refresh rate on mode

 * @fb:			Pointer to framebuffer associated with the given plane

 */

void _sde_plane_set_qos_lut(struct drm_plane *plane,

		struct drm_crtc *crtc,

		struct drm_framebuffer *fb);

/**

 * sde_plane_flush - final plane operations before commit flush

 * @plane: Pointer to drm plane structure