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

Commit 20d4ac65 authored by Leo (Sunpeng) Li's avatar Leo (Sunpeng) Li Committed by Alex Deucher
Browse files

drm/amd/display: Fix BUG_ON during CRTC atomic check update 

For cases where the CRTC is inactive (DPMS off), where a modeset is not
required, yet the CRTC is still in the atomic state, we should not
attempt to update anything on it.

Previously, we were relying on the modereset_required() helper to check
the above condition. However, the function returns false immediately if
a modeset is not required, ignoring the CRTC's enable/active state
flags. The correct way to filter is by looking at these flags instead.

Fixes: e277adc5 "drm/amd/display: Hookup color management functions"
Bugzilla: https://bugs.freedesktop.org/106194



Signed-off-by: default avatarLeo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Tested-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c733e40c

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+7 −6
Original line number Diff line number Diff line
@@ -4765,15 +4765,16 @@ static int dm_update_crtcs_state(struct dc *dc, 
		 * We want to do dc stream updates that do not require a

		 * full modeset below.

		 */

		if (!enable || !aconnector || modereset_required(new_crtc_state))

		if (!(enable && aconnector && new_crtc_state->enable &&

		      new_crtc_state->active))

			continue;

		/*

		 * Given above conditions, the dc state cannot be NULL because:

		 * 1. We're attempting to enable a CRTC. Which has a...

		 * 2. Valid connector attached, and

		 * 3. User does not want to reset it (disable or mark inactive,

		 *    which can happen on a CRTC that's already disabled).

		 * => It currently exists.

		 * 1. We're in the process of enabling CRTCs (just been added

		 *    to the dc context, or already is on the context)

		 * 2. Has a valid connector attached, and

		 * 3. Is currently active and enabled.

		 * => The dc stream state currently exists.

		 */

		BUG_ON(dm_new_crtc_state->stream == NULL);