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

Commit 45d60d1b authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Reset CRTC owner to 0 before BIOS init. 



Fixes suspend+multihead on some boards that also use BIOS scripts for
modesetting.

Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 03cd06ca

drivers/gpu/drm/nouveau/nouveau_bios.c

+4 −2
Original line number Diff line number Diff line
@@ -6551,8 +6551,10 @@ nouveau_run_vbios_init(struct drm_device *dev) 
	int i, ret = 0;



	NVLockVgaCrtcs(dev, false);

	if (nv_two_heads(dev))

		NVSetOwner(dev, bios->state.crtchead);

	if (nv_two_heads(dev)) {

		bios->state.crtchead = 0;

		NVSetOwner(dev, 0);

	}



	if (bios->major_version < 5)	/* BMP only */

		load_nv17_hw_sequencer_ucode(dev, bios);