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

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

drm/nouveau/imem: switch to device pri macros 



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

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

+6 −4
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ gk20a_instobj_rd32(struct nvkm_object *object, u64 offset) 
{

	struct gk20a_instmem *imem = (void *)nvkm_instmem(object);

	struct gk20a_instobj *node = (void *)object;

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

	unsigned long flags;

	u64 base = (node->mem->offset + offset) & 0xffffff00000ULL;

	u64 addr = (node->mem->offset + offset) & 0x000000fffffULL;
@@ -114,10 +115,10 @@ gk20a_instobj_rd32(struct nvkm_object *object, u64 offset) 


	spin_lock_irqsave(&imem->lock, flags);

	if (unlikely(imem->addr != base)) {

		nv_wr32(imem, 0x001700, base >> 16);

		nvkm_wr32(device, 0x001700, base >> 16);

		imem->addr = base;

	}

	data = nv_rd32(imem, 0x700000 + addr);

	data = nvkm_rd32(device, 0x700000 + addr);

	spin_unlock_irqrestore(&imem->lock, flags);

	return data;

}
@@ -127,16 +128,17 @@ gk20a_instobj_wr32(struct nvkm_object *object, u64 offset, u32 data) 
{

	struct gk20a_instmem *imem = (void *)nvkm_instmem(object);

	struct gk20a_instobj *node = (void *)object;

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

	unsigned long flags;

	u64 base = (node->mem->offset + offset) & 0xffffff00000ULL;

	u64 addr = (node->mem->offset + offset) & 0x000000fffffULL;



	spin_lock_irqsave(&imem->lock, flags);

	if (unlikely(imem->addr != base)) {

		nv_wr32(imem, 0x001700, base >> 16);

		nvkm_wr32(device, 0x001700, base >> 16);

		imem->addr = base;

	}

	nv_wr32(imem, 0x700000 + addr, data);

	nvkm_wr32(device, 0x700000 + addr, data);

	spin_unlock_irqrestore(&imem->lock, flags);

}

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

+4 −2
Original line number Diff line number Diff line
@@ -105,13 +105,15 @@ nv04_instobj_oclass = { 
static u32

nv04_instmem_rd32(struct nvkm_object *object, u64 addr)

{

	return nv_rd32(object, 0x700000 + addr);

	struct nvkm_instmem *imem = (void *)object;

	return nvkm_rd32(imem->subdev.device, 0x700000 + addr);

}



static void

nv04_instmem_wr32(struct nvkm_object *object, u64 addr, u32 data)

{

	return nv_wr32(object, 0x700000 + addr, data);

	struct nvkm_instmem *imem = (void *)object;

	nvkm_wr32(imem->subdev.device, 0x700000 + addr, data);

}



void

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ nv40_instmem_ctor(struct nvkm_object *parent, struct nvkm_object *engine, 
	 * to fit graphics contexts for every channel, the magics come

	 * from engine/gr/nv40.c

	 */

	vs = hweight8((nv_rd32(imem, 0x001540) & 0x0000ff00) >> 8);

	vs = hweight8((nvkm_rd32(device, 0x001540) & 0x0000ff00) >> 8);

	if      (device->chipset == 0x40) imem->base.reserved = 0x6aa0 * vs;

	else if (device->chipset  < 0x43) imem->base.reserved = 0x4f00 * vs;

	else if (nv44_gr_class(imem))  imem->base.reserved = 0x4980 * vs;

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c

+6 −4
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ nv50_instobj_rd32(struct nvkm_object *object, u64 offset) 
{

	struct nv50_instmem *imem = (void *)nvkm_instmem(object);

	struct nv50_instobj *node = (void *)object;

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

	unsigned long flags;

	u64 base = (node->mem->offset + offset) & 0xffffff00000ULL;

	u64 addr = (node->mem->offset + offset) & 0x000000fffffULL;
@@ -52,10 +53,10 @@ nv50_instobj_rd32(struct nvkm_object *object, u64 offset) 


	spin_lock_irqsave(&imem->lock, flags);

	if (unlikely(imem->addr != base)) {

		nv_wr32(imem, 0x001700, base >> 16);

		nvkm_wr32(device, 0x001700, base >> 16);

		imem->addr = base;

	}

	data = nv_rd32(imem, 0x700000 + addr);

	data = nvkm_rd32(device, 0x700000 + addr);

	spin_unlock_irqrestore(&imem->lock, flags);

	return data;

}
@@ -65,16 +66,17 @@ nv50_instobj_wr32(struct nvkm_object *object, u64 offset, u32 data) 
{

	struct nv50_instmem *imem = (void *)nvkm_instmem(object);

	struct nv50_instobj *node = (void *)object;

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

	unsigned long flags;

	u64 base = (node->mem->offset + offset) & 0xffffff00000ULL;

	u64 addr = (node->mem->offset + offset) & 0x000000fffffULL;



	spin_lock_irqsave(&imem->lock, flags);

	if (unlikely(imem->addr != base)) {

		nv_wr32(imem, 0x001700, base >> 16);

		nvkm_wr32(device, 0x001700, base >> 16);

		imem->addr = base;

	}

	nv_wr32(imem, 0x700000 + addr, data);

	nvkm_wr32(device, 0x700000 + addr, data);

	spin_unlock_irqrestore(&imem->lock, flags);

}