Commit 4cdd2450 authored by Ben Skeggs's avatar Ben Skeggs Committed by Karol Herbst
Browse files

drm/nouveau/pmu/gm200-: use alternate falcon reset sequence 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarKarol Herbst <kherbst@redhat.com>
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/10
parent 1d2271d2

drivers/gpu/drm/nouveau/nvkm/falcon/base.c

+6 −2
Original line number Diff line number Diff line
@@ -117,10 +117,14 @@ nvkm_falcon_disable(struct nvkm_falcon *falcon) 
int

nvkm_falcon_reset(struct nvkm_falcon *falcon)

{

	if (!falcon->func->reset) {

		nvkm_falcon_disable(falcon);

		return nvkm_falcon_enable(falcon);

	}



	return falcon->func->reset(falcon);

}



int

nvkm_falcon_wait_for_halt(struct nvkm_falcon *falcon, u32 ms)

{

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm200.c

+30 −1
Original line number Diff line number Diff line
@@ -23,9 +23,38 @@ 
 */

#include "priv.h"



static int

gm200_pmu_flcn_reset(struct nvkm_falcon *falcon)

{

	struct nvkm_pmu *pmu = container_of(falcon, typeof(*pmu), falcon);



	nvkm_falcon_wr32(falcon, 0x014, 0x0000ffff);

	pmu->func->reset(pmu);

	return nvkm_falcon_enable(falcon);

}



const struct nvkm_falcon_func

gm200_pmu_flcn = {

	.debug = 0xc08,

	.fbif = 0xe00,

	.load_imem = nvkm_falcon_v1_load_imem,

	.load_dmem = nvkm_falcon_v1_load_dmem,

	.read_dmem = nvkm_falcon_v1_read_dmem,

	.bind_context = nvkm_falcon_v1_bind_context,

	.wait_for_halt = nvkm_falcon_v1_wait_for_halt,

	.clear_interrupt = nvkm_falcon_v1_clear_interrupt,

	.set_start_addr = nvkm_falcon_v1_set_start_addr,

	.start = nvkm_falcon_v1_start,

	.enable = nvkm_falcon_v1_enable,

	.disable = nvkm_falcon_v1_disable,

	.reset = gm200_pmu_flcn_reset,

	.cmdq = { 0x4a0, 0x4b0, 4 },

	.msgq = { 0x4c8, 0x4cc, 0 },

};



static const struct nvkm_pmu_func

gm200_pmu = {

	.flcn = &gt215_pmu_flcn,

	.flcn = &gm200_pmu_flcn,

	.enabled = gf100_pmu_enabled,

	.reset = gf100_pmu_reset,

};

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ gm20b_pmu_recv(struct nvkm_pmu *pmu) 


static const struct nvkm_pmu_func

gm20b_pmu = {

	.flcn = &gt215_pmu_flcn,

	.flcn = &gm200_pmu_flcn,

	.enabled = gf100_pmu_enabled,

	.intr = gt215_pmu_intr,

	.recv = gm20b_pmu_recv,

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ gp102_pmu_enabled(struct nvkm_pmu *pmu) 


static const struct nvkm_pmu_func

gp102_pmu = {

	.flcn = &gt215_pmu_flcn,

	.flcn = &gm200_pmu_flcn,

	.enabled = gp102_pmu_enabled,

	.reset = gp102_pmu_reset,

};

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ gp10b_pmu_acr = { 


static const struct nvkm_pmu_func

gp10b_pmu = {

	.flcn = &gt215_pmu_flcn,

	.flcn = &gm200_pmu_flcn,

	.enabled = gf100_pmu_enabled,

	.intr = gt215_pmu_intr,

	.recv = gm20b_pmu_recv,