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

Commit 08a470d1 authored by Samantha Tran's avatar Samantha Tran
Browse files

disp: msm: sde: remove check comparing encoder's crtc and crtc 



This change removes the check comparing encoder's crtc to the
crtc passed in. This check was required up until commit 70486d20
("disp: msm: sde: remove vblank cache logic"). Now that iteration
is only happening over encoders in the encoder mask, there is no
need to check for a matching crtc to ensure it is valid.

Change-Id: I4ee08061e6c8679fe03f42cf2f889704c99526e5
Signed-off-by: default avatarSamantha Tran <samtran@codeaurora.org>
parent 80a42363

msm/sde/sde_crtc.c

+1 −7
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 * Author: Rob Clark <robdclark@gmail.com>

 *

 *
@@ -3660,9 +3660,6 @@ static int _sde_crtc_vblank_enable_no_lock( 




		drm_for_each_encoder_mask(enc, crtc->dev,

		drm_for_each_encoder_mask(enc, crtc->dev,

			crtc->state->encoder_mask) {

			crtc->state->encoder_mask) {

			if (enc->crtc != crtc)

				continue;



			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,

			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,

					sde_crtc->enabled);

					sde_crtc->enabled);
@@ -3672,9 +3669,6 @@ static int _sde_crtc_vblank_enable_no_lock( 
	} else {

	} else {

		drm_for_each_encoder_mask(enc, crtc->dev,

		drm_for_each_encoder_mask(enc, crtc->dev,

			crtc->state->encoder_mask) {

			crtc->state->encoder_mask) {

			if (enc->crtc != crtc)

				continue;



			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,

			SDE_EVT32(DRMID(&sde_crtc->base), DRMID(enc), enable,

					sde_crtc->enabled);

					sde_crtc->enabled);