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

Commit 7d9115de authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: port to subdev interfaces 



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

drivers/gpu/drm/nouveau/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -69,9 +69,12 @@ nouveau-y += core/subdev/i2c/bit.o 
nouveau-y += core/subdev/instmem/nv04.o

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

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

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

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

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

nouveau-y += core/subdev/mc/nv44.o

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

nouveau-y += core/subdev/mc/nv98.o

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

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

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

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

drivers/gpu/drm/nouveau/core/include/subdev/mc.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
#ifndef __NOUVEAU_MC_H__

#define __NOUVEAU_MC_H__



#include <core/subdev.h>

#include <core/device.h>



struct nouveau_mc_intr {

	u32 stat;

	u32 unit;

};



struct nouveau_mc {

	struct nouveau_subdev base;

	const struct nouveau_mc_intr *intr_map;

};



static inline struct nouveau_mc *

nouveau_mc(void *obj)

{

	return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_MC];

}



#define nouveau_mc_create(p,e,o,d)                                             \

	nouveau_subdev_create_((p), (e), (o), 0, "PMC", "master",              \

			       sizeof(**d), (void **)d)

#define nouveau_mc_destroy(p)                                                  \

	nouveau_subdev_destroy(&(p)->base)

#define nouveau_mc_init(p)                                                     \

	nouveau_subdev_init(&(p)->base)

#define nouveau_mc_fini(p,s)                                                   \

	nouveau_subdev_fini(&(p)->base, (s))



#define _nouveau_mc_dtor _nouveau_subdev_dtor

#define _nouveau_mc_init _nouveau_subdev_init

#define _nouveau_mc_fini _nouveau_subdev_fini



extern struct nouveau_oclass nv04_mc_oclass;

extern struct nouveau_oclass nv44_mc_oclass;

extern struct nouveau_oclass nv50_mc_oclass;

extern struct nouveau_oclass nv98_mc_oclass;

extern struct nouveau_oclass nvc0_mc_oclass;



void nouveau_mc_intr(struct nouveau_subdev *);



extern const struct nouveau_mc_intr nv04_mc_intr[];

int nv04_mc_init(struct nouveau_object *);

int nv50_mc_init(struct nouveau_object *);



#endif

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

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <subdev/i2c.h>

#include <subdev/clock.h>

#include <subdev/devinit.h>

#include <subdev/mc.h>



int

nv04_identify(struct nouveau_device *device)
@@ -37,12 +38,14 @@ nv04_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv04_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x05:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv05_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	default:

		nv_fatal(device, "unknown RIVA chipset\n");

drivers/gpu/drm/nouveau/core/subdev/device/nv10.c

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <subdev/i2c.h>

#include <subdev/clock.h>

#include <subdev/devinit.h>

#include <subdev/mc.h>



int

nv10_identify(struct nouveau_device *device)
@@ -39,6 +40,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x15:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -46,6 +48,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x16:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -53,6 +56,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x1a:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -60,6 +64,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x11:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -67,6 +72,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x17:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -74,6 +80,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x1f:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -81,6 +88,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x18:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -88,6 +96,7 @@ nv10_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	default:

		nv_fatal(device, "unknown Celsius chipset\n");

drivers/gpu/drm/nouveau/core/subdev/device/nv20.c

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <subdev/i2c.h>

#include <subdev/clock.h>

#include <subdev/devinit.h>

#include <subdev/mc.h>



int

nv20_identify(struct nouveau_device *device)
@@ -39,6 +40,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x25:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -46,6 +48,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x28:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -53,6 +56,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	case 0x2a:

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;
@@ -60,6 +64,7 @@ nv20_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv04_clock_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		break;

	default:

		nv_fatal(device, "unknown Kelvin chipset\n");