Commit 380b1cad authored by Karol Herbst's avatar Karol Herbst Committed by Ben Skeggs
Browse files

drm/nouveau/fb/ramgk104: Touch 0x62c000 only when there is a display engine 



Signed-off-by: default avatarKarol Herbst <karolherbst@gmail.com>
Tested-by: default avatarAidan Epstein <aidan@jmad.org>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cc90badd

drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c

+12 −4
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ gk104_ram_calc_gddr5(struct gk104_ram *ram, u32 freq) 


	ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000);

	ram_block(fuc);



	if (nvkm_device_engine(ram->base.fb->subdev.device, NVKM_ENGINE_DISP))

		ram_wr32(fuc, 0x62c000, 0x0f0f0000);



	/* MR1: turn termination on early, for some reason.. */
@@ -658,6 +660,8 @@ gk104_ram_calc_gddr5(struct gk104_ram *ram, u32 freq) 
		gk104_ram_train(fuc, 0x80020000, 0x01000000);



	ram_unblock(fuc);



	if (nvkm_device_engine(ram->base.fb->subdev.device, NVKM_ENGINE_DISP))

		ram_wr32(fuc, 0x62c000, 0x0f0f0f00);



	if (next->bios.rammap_11_08_01)
@@ -706,6 +710,8 @@ gk104_ram_calc_sddr3(struct gk104_ram *ram, u32 freq) 


	ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000);

	ram_block(fuc);



	if (nvkm_device_engine(ram->base.fb->subdev.device, NVKM_ENGINE_DISP))

		ram_wr32(fuc, 0x62c000, 0x0f0f0000);



	if (vc == 1 && ram_have(fuc, gpio2E)) {
@@ -936,6 +942,8 @@ gk104_ram_calc_sddr3(struct gk104_ram *ram, u32 freq) 
	ram_nsec(fuc, 1000);



	ram_unblock(fuc);



	if (nvkm_device_engine(ram->base.fb->subdev.device, NVKM_ENGINE_DISP))

		ram_wr32(fuc, 0x62c000, 0x0f0f0f00);



	if (next->bios.rammap_11_08_01)

CRA Git | Maintained and supported by SUSTech CRA and CCSE