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

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

drm/nouveau/device: convert to engine, rather than subdev 



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

drivers/gpu/drm/nouveau/Makefile

+9 −9
Original line number Diff line number Diff line
@@ -53,15 +53,6 @@ nouveau-y += core/subdev/clock/nva3.o 
nouveau-y += core/subdev/clock/nvc0.o

nouveau-y += core/subdev/clock/pllnv04.o

nouveau-y += core/subdev/clock/pllnva3.o

nouveau-y += core/subdev/device/base.o

nouveau-y += core/subdev/device/nv04.o

nouveau-y += core/subdev/device/nv10.o

nouveau-y += core/subdev/device/nv20.o

nouveau-y += core/subdev/device/nv30.o

nouveau-y += core/subdev/device/nv40.o

nouveau-y += core/subdev/device/nv50.o

nouveau-y += core/subdev/device/nvc0.o

nouveau-y += core/subdev/device/nve0.o

nouveau-y += core/subdev/devinit/base.o

nouveau-y += core/subdev/devinit/nv04.o

nouveau-y += core/subdev/devinit/nv05.o
@@ -151,6 +142,15 @@ nouveau-y += core/engine/copy/nvc0.o 
nouveau-y += core/engine/copy/nve0.o

nouveau-y += core/engine/crypt/nv84.o

nouveau-y += core/engine/crypt/nv98.o

nouveau-y += core/engine/device/base.o

nouveau-y += core/engine/device/nv04.o

nouveau-y += core/engine/device/nv10.o

nouveau-y += core/engine/device/nv20.o

nouveau-y += core/engine/device/nv30.o

nouveau-y += core/engine/device/nv40.o

nouveau-y += core/engine/device/nv50.o

nouveau-y += core/engine/device/nvc0.o

nouveau-y += core/engine/device/nve0.o

nouveau-y += core/engine/disp/base.o

nouveau-y += core/engine/disp/nv04.o

nouveau-y += core/engine/disp/nv50.o

drivers/gpu/drm/nouveau/core/core/client.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <core/handle.h>

#include <core/option.h>



#include <subdev/device.h>

#include <engine/device.h>



static void

nouveau_client_dtor(struct nouveau_object *object)

drivers/gpu/drm/nouveau/core/core/engine.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ nouveau_engine_create_(struct nouveau_object *parent, 
		       const char *iname, const char *fname,

		       int length, void **pobject)

{

	struct nouveau_device *device = nv_device(parent);

	struct nouveau_engine *engine;

	int ret;
@@ -43,7 +42,8 @@ nouveau_engine_create_(struct nouveau_object *parent, 
	if (ret)

		return ret;



	if (!nouveau_boolopt(device->cfgopt, iname, enable)) {

	if ( parent &&

	    !nouveau_boolopt(nv_device(parent)->cfgopt, iname, enable)) {

		if (!enable)

			nv_warn(engine, "disabled, %s=1 to enable\n", iname);

		return -ENODEV;

drivers/gpu/drm/nouveau/core/subdev/device/base.c→drivers/gpu/drm/nouveau/core/engine/device/base.c

+6 −6
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


#include <core/class.h>



#include <subdev/device.h>

#include <engine/device.h>



static DEFINE_MUTEX(nv_devices_mutex);

static LIST_HEAD(nv_devices);
@@ -428,15 +428,15 @@ nouveau_device_dtor(struct nouveau_object *object) 
	list_del(&device->head);

	mutex_unlock(&nv_devices_mutex);



	if (device->base.mmio)

		iounmap(device->base.mmio);

	if (nv_subdev(device)->mmio)

		iounmap(nv_subdev(device)->mmio);



	nouveau_subdev_destroy(&device->base);

	nouveau_engine_destroy(&device->base);

}



static struct nouveau_oclass

nouveau_device_oclass = {

	.handle = NV_SUBDEV(DEVICE, 0x00),

	.handle = NV_ENGINE(DEVICE, 0x00),

	.ofuncs = &(struct nouveau_ofuncs) {

		.dtor = nouveau_device_dtor,

	},
@@ -456,7 +456,7 @@ nouveau_device_create_(struct pci_dev *pdev, u64 name, const char *sname, 
			goto done;

	}



	ret = nouveau_subdev_create_(NULL, NULL, &nouveau_device_oclass, 0,

	ret = nouveau_engine_create_(NULL, NULL, &nouveau_device_oclass, true,

				     "DEVICE", "device", length, pobject);

	device = *pobject;

	if (ret)

drivers/gpu/drm/nouveau/core/subdev/device/nv04.c→drivers/gpu/drm/nouveau/core/engine/device/nv04.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 * Authors: Ben Skeggs

 */



#include <subdev/device.h>

#include <subdev/bios.h>

#include <subdev/bus.h>

#include <subdev/i2c.h>
@@ -34,6 +33,7 @@ 
#include <subdev/instmem.h>

#include <subdev/vm.h>



#include <engine/device.h>

#include <engine/dmaobj.h>

#include <engine/fifo.h>

#include <engine/software.h>