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

Commit f2d85ad1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/msvld: switch to device pri macros 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 320ca251

drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c

+3 −2
Original line number Diff line number Diff line
@@ -61,14 +61,15 @@ static int 
g98_msvld_init(struct nvkm_object *object)

{

	struct nvkm_falcon *msvld = (void *)object;

	struct nvkm_device *device = msvld->engine.subdev.device;

	int ret;



	ret = nvkm_falcon_init(msvld);

	if (ret)

		return ret;



	nv_wr32(msvld, 0x084010, 0x0000ffd2);

	nv_wr32(msvld, 0x08401c, 0x0000fff2);

	nvkm_wr32(device, 0x084010, 0x0000ffd2);

	nvkm_wr32(device, 0x08401c, 0x0000fff2);

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/engine/msvld/gf100.c

+3 −2
Original line number Diff line number Diff line
@@ -59,14 +59,15 @@ static int 
gf100_msvld_init(struct nvkm_object *object)

{

	struct nvkm_falcon *msvld = (void *)object;

	struct nvkm_device *device = msvld->engine.subdev.device;

	int ret;



	ret = nvkm_falcon_init(msvld);

	if (ret)

		return ret;



	nv_wr32(msvld, 0x084010, 0x0000fff2);

	nv_wr32(msvld, 0x08401c, 0x0000fff2);

	nvkm_wr32(device, 0x084010, 0x0000fff2);

	nvkm_wr32(device, 0x08401c, 0x0000fff2);

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/engine/msvld/gk104.c

+3 −2
Original line number Diff line number Diff line
@@ -59,14 +59,15 @@ static int 
gk104_msvld_init(struct nvkm_object *object)

{

	struct nvkm_falcon *msvld = (void *)object;

	struct nvkm_device *device = msvld->engine.subdev.device;

	int ret;



	ret = nvkm_falcon_init(msvld);

	if (ret)

		return ret;



	nv_wr32(msvld, 0x084010, 0x0000fff2);

	nv_wr32(msvld, 0x08401c, 0x0000fff2);

	nvkm_wr32(device, 0x084010, 0x0000fff2);

	nvkm_wr32(device, 0x08401c, 0x0000fff2);

	return 0;

}