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

Commit 6758745b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/fb: switch to device pri macros 



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

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

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
int

nvkm_fb_bios_memtype(struct nvkm_bios *bios)

{

	const u8 ramcfg = (nv_rd32(bios, 0x101000) & 0x0000003c) >> 2;

	struct nvkm_device *device = bios->subdev.device;

	const u8 ramcfg = (nvkm_rd32(device, 0x101000) & 0x0000003c) >> 2;

	struct nvbios_M0203E M0203E;

	u8 ver, hdr;

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

+5 −3
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ gf100_fb_memtype_valid(struct nvkm_fb *fb, u32 tile_flags) 
static void

gf100_fb_intr(struct nvkm_subdev *subdev)

{

	struct nvkm_device *device = subdev->device;

	struct gf100_fb *fb = (void *)subdev;

	u32 intr = nv_rd32(fb, 0x000100);

	u32 intr = nvkm_rd32(device, 0x000100);

	if (intr & 0x08000000)

		nv_debug(fb, "PFFB intr\n");

	if (intr & 0x00002000)
@@ -47,6 +48,7 @@ int 
gf100_fb_init(struct nvkm_object *object)

{

	struct gf100_fb *fb = (void *)object;

	struct nvkm_device *device = fb->base.subdev.device;

	int ret;



	ret = nvkm_fb_init(&fb->base);
@@ -54,9 +56,9 @@ gf100_fb_init(struct nvkm_object *object) 
		return ret;



	if (fb->r100c10_page)

		nv_wr32(fb, 0x100c10, fb->r100c10 >> 8);

		nvkm_wr32(device, 0x100c10, fb->r100c10 >> 8);



	nv_mask(fb, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */

	nvkm_mask(device, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */

	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ static int 
gk20a_fb_init(struct nvkm_object *object)

{

	struct nvkm_fb *fb = (void *)object;

	struct nvkm_device *device = fb->subdev.device;

	int ret;



	ret = nvkm_fb_init(fb);

	if (ret)

		return ret;



	nv_mask(fb, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */

	nvkm_mask(device, 0x100c80, 0x00000001, 0x00000000); /* 128KiB lpg */

	return 0;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static int 
nv04_fb_init(struct nvkm_object *object)

{

	struct nvkm_fb *fb = (void *)object;

	struct nvkm_device *device = fb->subdev.device;

	int ret;



	ret = nvkm_fb_init(fb);
@@ -47,7 +48,7 @@ nv04_fb_init(struct nvkm_object *object) 
	 * nvidia reading PFB_CFG_0, then writing back its original value.

	 * (which was 0x701114 in this case)

	 */

	nv_wr32(fb, NV04_PFB_CFG0, 0x1114);

	nvkm_wr32(device, NV04_PFB_CFG0, 0x1114);

	return 0;

}

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

+5 −4
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ nv10_fb_tile_fini(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile) 
void

nv10_fb_tile_prog(struct nvkm_fb *fb, int i, struct nvkm_fb_tile *tile)

{

	nv_wr32(fb, 0x100244 + (i * 0x10), tile->limit);

	nv_wr32(fb, 0x100248 + (i * 0x10), tile->pitch);

	nv_wr32(fb, 0x100240 + (i * 0x10), tile->addr);

	nv_rd32(fb, 0x100240 + (i * 0x10));

	struct nvkm_device *device = fb->subdev.device;

	nvkm_wr32(device, 0x100244 + (i * 0x10), tile->limit);

	nvkm_wr32(device, 0x100248 + (i * 0x10), tile->pitch);

	nvkm_wr32(device, 0x100240 + (i * 0x10), tile->addr);

	nvkm_rd32(device, 0x100240 + (i * 0x10));

}



struct nvkm_oclass *