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

Commit e0662d00 authored by Daniel Vetter's avatar Daniel Vetter Committed by Greg Kroah-Hartman
Browse files

drm/nouveau: Stop using drm_crtc_force_disable 



[ Upstream commit 934c5b32a5e43d8de2ab4f1566f91d7c3bf8cb64 ]

The correct way for legacy drivers to update properties that need to
do a full modeset, is to do a full modeset.

Note that we don't need to call the drm_mode_config_internal helper
because we're not changing any of the refcounted paramters.

v2: Fixup error handling (Ville). Since the old code didn't bother
I decided to just delete it instead of adding even more code for just
error handling.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Cc: Sean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181217194303.14397-2-daniel.vetter@ffwll.ch


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1d377200

drivers/gpu/drm/nouveau/dispnv04/tvnv17.c

+3 −1
Original line number Diff line number Diff line
@@ -750,7 +750,9 @@ static int nv17_tv_set_property(struct drm_encoder *encoder, 
		/* Disable the crtc to ensure a full modeset is

		 * performed whenever it's turned on again. */

		if (crtc)

			drm_crtc_force_disable(crtc);

			drm_crtc_helper_set_mode(crtc, &crtc->mode,

						 crtc->x, crtc->y,

						 crtc->primary->fb);

	}



	return 0;