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

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

drm/nouveau: remove nouveau_gpuobj_ref completely, replace with sanity 



Reviewed-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent de3a6c0a

drivers/gpu/drm/nouveau/nouveau_channel.c

+3 −9
Original line number Diff line number Diff line
@@ -70,14 +70,8 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan) 
		chan->pushbuf_base = pb->bo.mem.mm_node->start << PAGE_SHIFT;

	}



	ret = nouveau_gpuobj_ref_add(dev, chan, 0, pushbuf, &chan->pushbuf);

	if (ret) {

		NV_ERROR(dev, "Error referencing pushbuf ctxdma: %d\n", ret);

		if (pushbuf != dev_priv->gart_info.sg_ctxdma)

			nouveau_gpuobj_del(dev, &pushbuf);

		return ret;

	}



	nouveau_gpuobj_ref(pushbuf, &chan->pushbuf);

	nouveau_gpuobj_ref(NULL, &pushbuf);

	return 0;

}
@@ -308,7 +302,7 @@ nouveau_channel_free(struct nouveau_channel *chan) 
	spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags);



	/* Release the channel's resources */

	nouveau_gpuobj_ref_del(dev, &chan->pushbuf);

	nouveau_gpuobj_ref(NULL, &chan->pushbuf);

	if (chan->pushbuf_bo) {

		nouveau_bo_unmap(chan->pushbuf_bo);

		nouveau_bo_unpin(chan->pushbuf_bo);

drivers/gpu/drm/nouveau/nouveau_dma.c

+8 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "drm.h"

#include "nouveau_drv.h"

#include "nouveau_dma.h"

#include "nouveau_ramht.h"



void

nouveau_dma_pre_init(struct nouveau_channel *chan)
@@ -58,26 +59,27 @@ nouveau_dma_init(struct nouveau_channel *chan) 
{

	struct drm_device *dev = chan->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_gpuobj *m2mf = NULL;

	struct nouveau_gpuobj *nvsw = NULL;

	struct nouveau_gpuobj *obj = NULL;

	int ret, i;



	/* Create NV_MEMORY_TO_MEMORY_FORMAT for buffer moves */

	ret = nouveau_gpuobj_gr_new(chan, dev_priv->card_type < NV_50 ?

				    0x0039 : 0x5039, &m2mf);

				    0x0039 : 0x5039, &obj);

	if (ret)

		return ret;



	ret = nouveau_gpuobj_ref_add(dev, chan, NvM2MF, m2mf, NULL);

	ret = nouveau_ramht_insert(chan, NvM2MF, obj);

	nouveau_gpuobj_ref(NULL, &obj);

	if (ret)

		return ret;



	/* Create an NV_SW object for various sync purposes */

	ret = nouveau_gpuobj_sw_new(chan, NV_SW, &nvsw);

	ret = nouveau_gpuobj_sw_new(chan, NV_SW, &obj);

	if (ret)

		return ret;



	ret = nouveau_gpuobj_ref_add(dev, chan, NvSw, nvsw, NULL);

	ret = nouveau_ramht_insert(chan, NvSw, obj);

	nouveau_gpuobj_ref(NULL, &obj);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/nouveau_drv.h

+18 −43
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ enum nouveau_flags { 
#define NVOBJ_ENGINE_DISPLAY	2

#define NVOBJ_ENGINE_INT	0xdeadbeef



#define NVOBJ_FLAG_ALLOW_NO_REFS	(1 << 0)

#define NVOBJ_FLAG_ZERO_ALLOC		(1 << 1)

#define NVOBJ_FLAG_ZERO_FREE		(1 << 2)

#define NVOBJ_FLAG_FAKE			(1 << 3)
@@ -141,7 +140,6 @@ struct nouveau_gpuobj { 
	struct drm_device *dev;

	struct list_head list;



	struct nouveau_channel *im_channel;

	struct drm_mm_node *im_pramin;

	struct nouveau_bo *im_backing;

	uint32_t im_backing_start;
@@ -162,16 +160,6 @@ struct nouveau_gpuobj { 
	void *priv;

};



struct nouveau_gpuobj_ref {

	struct list_head list;



	struct nouveau_gpuobj *gpuobj;

	uint32_t instance;



	struct nouveau_channel *channel;

	int handle;

};



struct nouveau_channel {

	struct drm_device *dev;

	int id;
@@ -197,7 +185,7 @@ struct nouveau_channel { 
	} fence;



	/* DMA push buffer */

	struct nouveau_gpuobj_ref *pushbuf;

	struct nouveau_gpuobj *pushbuf;

	struct nouveau_bo     *pushbuf_bo;

	uint32_t               pushbuf_base;
@@ -206,24 +194,23 @@ struct nouveau_channel { 
	struct drm_mm notifier_heap;



	/* PFIFO context */

	struct nouveau_gpuobj_ref *ramfc;

	struct nouveau_gpuobj_ref *cache;

	struct nouveau_gpuobj *ramfc;

	struct nouveau_gpuobj *cache;



	/* PGRAPH context */

	/* XXX may be merge 2 pointers as private data ??? */

	struct nouveau_gpuobj_ref *ramin_grctx;

	struct nouveau_gpuobj *ramin_grctx;

	void *pgraph_ctx;



	/* NV50 VM */

	struct nouveau_gpuobj *vm_pd;

	struct nouveau_gpuobj_ref *vm_gart_pt;

	struct nouveau_gpuobj_ref *vm_vram_pt[NV50_VM_VRAM_NR];

	struct nouveau_gpuobj *vm_gart_pt;

	struct nouveau_gpuobj *vm_vram_pt[NV50_VM_VRAM_NR];



	/* Objects */

	struct nouveau_gpuobj_ref *ramin; /* Private instmem */

	struct nouveau_gpuobj *ramin; /* Private instmem */

	struct drm_mm          ramin_heap; /* Private PRAMIN heap */

	struct nouveau_gpuobj_ref *ramht; /* Hash table */

	struct list_head           ramht_refs; /* Objects referenced by RAMHT */

	struct nouveau_ramht  *ramht; /* Hash table */



	/* GPU object info for stuff used in-kernel (mm_enabled) */

	uint32_t m2mf_ntfy;
@@ -301,7 +288,7 @@ struct nouveau_fb_engine { 
struct nouveau_fifo_engine {

	int  channels;



	struct nouveau_gpuobj_ref *playlist[2];

	struct nouveau_gpuobj *playlist[2];

	int cur_playlist;



	int  (*init)(struct drm_device *);
@@ -339,7 +326,7 @@ struct nouveau_pgraph_engine { 
	int grctx_size;



	/* NV2x/NV3x context table (0x400780) */

	struct nouveau_gpuobj_ref *ctx_table;

	struct nouveau_gpuobj *ctx_table;



	int  (*init)(struct drm_device *);

	void (*takedown)(struct drm_device *);
@@ -555,7 +542,7 @@ struct drm_nouveau_private { 
	spinlock_t context_switch_lock;



	/* RAMIN configuration, RAMFC, RAMHT and RAMRO offsets */

	struct nouveau_gpuobj *ramht;

	struct nouveau_ramht *ramht;

	uint32_t ramin_rsvd_vram;

	uint32_t ramht_offset;

	uint32_t ramht_size;
@@ -764,24 +751,12 @@ extern void nouveau_gpuobj_channel_takedown(struct nouveau_channel *); 
extern int nouveau_gpuobj_new(struct drm_device *, struct nouveau_channel *,

			      uint32_t size, int align, uint32_t flags,

			      struct nouveau_gpuobj **);

extern int nouveau_gpuobj_del(struct drm_device *, struct nouveau_gpuobj **);

extern int nouveau_gpuobj_ref_add(struct drm_device *, struct nouveau_channel *,

				  uint32_t handle, struct nouveau_gpuobj *,

				  struct nouveau_gpuobj_ref **);

extern int nouveau_gpuobj_ref_del(struct drm_device *,

				  struct nouveau_gpuobj_ref **);

extern int nouveau_gpuobj_ref_find(struct nouveau_channel *, uint32_t handle,

				   struct nouveau_gpuobj_ref **ref_ret);

extern int nouveau_gpuobj_new_ref(struct drm_device *,

				  struct nouveau_channel *alloc_chan,

				  struct nouveau_channel *ref_chan,

				  uint32_t handle, uint32_t size, int align,

				  uint32_t flags, struct nouveau_gpuobj_ref **);

extern void nouveau_gpuobj_ref(struct nouveau_gpuobj *,

			       struct nouveau_gpuobj **);

extern int nouveau_gpuobj_new_fake(struct drm_device *,

				   uint32_t p_offset, uint32_t b_offset,

				   uint32_t size, uint32_t flags,

				   struct nouveau_gpuobj **,

				   struct nouveau_gpuobj_ref**);

				   struct nouveau_gpuobj **);

extern int nouveau_gpuobj_dma_new(struct nouveau_channel *, int class,

				  uint64_t offset, uint64_t size, int access,

				  int target, struct nouveau_gpuobj **);

drivers/gpu/drm/nouveau/nouveau_irq.c

+9 −7
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "nouveau_drm.h"

#include "nouveau_drv.h"

#include "nouveau_reg.h"

#include "nouveau_ramht.h"

#include <linux/ratelimit.h>



/* needed for hotplug irq */
@@ -106,15 +107,16 @@ nouveau_fifo_swmthd(struct nouveau_channel *chan, uint32_t addr, uint32_t data) 
	const int mthd = addr & 0x1ffc;



	if (mthd == 0x0000) {

		struct nouveau_gpuobj_ref *ref = NULL;

		struct nouveau_gpuobj *gpuobj;



		if (nouveau_gpuobj_ref_find(chan, data, &ref))

		gpuobj = nouveau_ramht_find(chan, data);

		if (!gpuobj)

			return false;



		if (ref->gpuobj->engine != NVOBJ_ENGINE_SW)

		if (gpuobj->engine != NVOBJ_ENGINE_SW)

			return false;



		chan->sw_subchannel[subc] = ref->gpuobj->class;

		chan->sw_subchannel[subc] = gpuobj->class;

		nv_wr32(dev, NV04_PFIFO_CACHE1_ENGINE, nv_rd32(dev,

			NV04_PFIFO_CACHE1_ENGINE) & ~(0xf << subc * 4));

		return true;
@@ -357,7 +359,7 @@ nouveau_graph_chid_from_grctx(struct drm_device *dev) 
			if (!chan || !chan->ramin_grctx)

				continue;



			if (inst == chan->ramin_grctx->instance)

			if (inst == chan->ramin_grctx->pinst)

				break;

		}

	} else {
@@ -369,7 +371,7 @@ nouveau_graph_chid_from_grctx(struct drm_device *dev) 
			if (!chan || !chan->ramin)

				continue;



			if (inst == chan->ramin->instance)

			if (inst == chan->ramin->vinst)

				break;

		}

	}
@@ -625,7 +627,7 @@ nv50_pfb_vm_trap(struct drm_device *dev, int display, const char *name) 
				if (!chan || !chan->ramin)

					continue;



				if (trap[1] == chan->ramin->instance >> 12)

				if (trap[1] == chan->ramin->vinst >> 12)

					break;

			}

			NV_INFO(dev, "%s - VM: Trapped %s at %02x%04x%04x status %08x %08x channel %d\n",

drivers/gpu/drm/nouveau/nouveau_notifier.c

+4 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "drmP.h"

#include "drm.h"

#include "nouveau_drv.h"

#include "nouveau_ramht.h"



int

nouveau_notifier_init_channel(struct nouveau_channel *chan)
@@ -146,11 +147,11 @@ nouveau_notifier_alloc(struct nouveau_channel *chan, uint32_t handle, 
	nobj->dtor = nouveau_notifier_gpuobj_dtor;

	nobj->priv = mem;



	ret = nouveau_gpuobj_ref_add(dev, chan, handle, nobj, NULL);

	ret = nouveau_ramht_insert(chan, handle, nobj);

	nouveau_gpuobj_ref(NULL, &nobj);

	if (ret) {

		nouveau_gpuobj_del(dev, &nobj);

		drm_mm_put_block(mem);

		NV_ERROR(dev, "Error referencing notifier ctxdma: %d\n", ret);

		NV_ERROR(dev, "Error adding notifier to ramht: %d\n", ret);

		return ret;

	}