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

Commit 20abd163 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: create real execution engine for software object class 



Just a cleanup more or less, and to remove the need for special handling of
software objects.

This removes a heap of documentation on dma/graph object formats.  The info
is very out of date with our current understanding, and is far better
documented in rnndb in envytools git.

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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nv50_fb.o nvc0_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o nvc0_fifo.o \

             nve0_fifo.o \

             nv04_software.o nv50_software.o nvc0_software.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o nvc0_graph.o nve0_graph.o \

             nv40_grctx.o nv50_grctx.o nvc0_grctx.o nve0_grctx.o \

drivers/gpu/drm/nouveau/nouveau_channel.c

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

#include "nouveau_dma.h"

#include "nouveau_ramht.h"

#include "nouveau_software.h"



static int

nouveau_channel_pushbuf_init(struct nouveau_channel *chan)
@@ -155,8 +156,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
	}



	NV_DEBUG(dev, "initialising channel %d\n", chan->id);

	INIT_LIST_HEAD(&chan->nvsw.vbl_wait);

	INIT_LIST_HEAD(&chan->nvsw.flip);

	INIT_LIST_HEAD(&chan->fence.pending);

	spin_lock_init(&chan->fence.lock);
@@ -213,6 +212,12 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
		OUT_RING  (chan, 0x00000000);

	FIRE_RING(chan);



	ret = nouveau_gpuobj_gr_new(chan, NvSw, nouveau_software_class(dev));

	if (ret) {

		nouveau_channel_put(&chan);

		return ret;

	}



	ret = nouveau_fence_channel_init(chan);

	if (ret) {

		nouveau_channel_put(&chan);

drivers/gpu/drm/nouveau/nouveau_display.c

+6 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "nouveau_crtc.h"

#include "nouveau_dma.h"

#include "nouveau_connector.h"

#include "nouveau_software.h"

#include "nouveau_gpio.h"

#include "nv50_display.h"
@@ -432,6 +433,7 @@ nouveau_page_flip_emit(struct nouveau_channel *chan, 
		       struct nouveau_page_flip_state *s,

		       struct nouveau_fence **pfence)

{

	struct nouveau_software_chan *swch = chan->engctx[NVOBJ_ENGINE_SW];

	struct drm_nouveau_private *dev_priv = chan->dev->dev_private;

	struct drm_device *dev = chan->dev;

	unsigned long flags;
@@ -439,7 +441,7 @@ nouveau_page_flip_emit(struct nouveau_channel *chan, 


	/* Queue it to the pending list */

	spin_lock_irqsave(&dev->event_lock, flags);

	list_add_tail(&s->head, &chan->nvsw.flip);

	list_add_tail(&s->head, &swch->flip);

	spin_unlock_irqrestore(&dev->event_lock, flags);



	/* Synchronize with the old framebuffer */
@@ -547,20 +549,20 @@ int 
nouveau_finish_page_flip(struct nouveau_channel *chan,

			 struct nouveau_page_flip_state *ps)

{

	struct nouveau_software_chan *swch = chan->engctx[NVOBJ_ENGINE_SW];

	struct drm_device *dev = chan->dev;

	struct nouveau_page_flip_state *s;

	unsigned long flags;



	spin_lock_irqsave(&dev->event_lock, flags);



	if (list_empty(&chan->nvsw.flip)) {

	if (list_empty(&swch->flip)) {

		NV_ERROR(dev, "Unexpected pageflip in channel %d.\n", chan->id);

		spin_unlock_irqrestore(&dev->event_lock, flags);

		return -EINVAL;

	}



	s = list_first_entry(&chan->nvsw.flip,

			     struct nouveau_page_flip_state, head);

	s = list_first_entry(&swch->flip, struct nouveau_page_flip_state, head);

	if (s->event) {

		struct drm_pending_vblank_event *e = s->event;

		struct timeval now;

drivers/gpu/drm/nouveau/nouveau_drv.h

+0 −8
Original line number Diff line number Diff line
@@ -296,14 +296,6 @@ struct nouveau_channel { 
	uint32_t sw_subchannel[8];



	struct nouveau_vma dispc_vma[4];

	struct {

		struct nouveau_gpuobj *vblsem;

		uint32_t vblsem_head;

		uint32_t vblsem_offset;

		uint32_t vblsem_rval;

		struct list_head vbl_wait;

		struct list_head flip;

	} nvsw;



	struct {

		bool active;

drivers/gpu/drm/nouveau/nouveau_fence.c

+1 −5
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include "nouveau_drv.h"

#include "nouveau_ramht.h"

#include "nouveau_software.h"

#include "nouveau_dma.h"



#define USE_REFCNT(dev) (nouveau_private(dev)->chipset >= 0x10)
@@ -503,11 +504,6 @@ nouveau_fence_channel_init(struct nouveau_channel *chan) 
	int ret;



	if (dev_priv->card_type < NV_C0) {

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

		ret = nouveau_gpuobj_gr_new(chan, NvSw, NV_SW);

		if (ret)

			return ret;



		ret = RING_SPACE(chan, 2);

		if (ret)

			return ret;