Commit 011e8c32 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2021-12-29' of... 

Merge tag 'drm-intel-next-fixes-2021-12-29' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

drm/i915 fixes for the v5.17-rc1:
- Update FBC state even when not reallocating CFB

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87ee5vk54u.fsf@intel.com
parents 2b534e90 c65fe9cb

drivers/gpu/drm/i915/display/intel_fbc.c

+3 −1
Original line number Diff line number Diff line
@@ -1384,8 +1384,10 @@ static void __intel_fbc_enable(struct intel_atomic_state *state, 
		if (fbc->state.plane != plane)

			return;



		if (intel_fbc_is_ok(plane_state))

		if (intel_fbc_is_ok(plane_state)) {

			intel_fbc_update_state(state, crtc, plane);

			return;

		}



		__intel_fbc_disable(fbc);

	}