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

drm/nouveau/gpio/nve0: interrupt regs moved on kepler apparently 



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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ nouveau-y += core/subdev/gpio/base.o 
nouveau-y += core/subdev/gpio/nv10.o

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

nouveau-y += core/subdev/gpio/nvd0.o

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

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

nouveau-y += core/subdev/i2c/aux.o

nouveau-y += core/subdev/i2c/bit.o

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

+1 −7
Original line number Diff line number Diff line
@@ -48,12 +48,6 @@ int nouveau_gpio_init(struct nouveau_gpio *); 
extern struct nouveau_oclass nv10_gpio_oclass;

extern struct nouveau_oclass nv50_gpio_oclass;

extern struct nouveau_oclass nvd0_gpio_oclass;



void nv50_gpio_dtor(struct nouveau_object *);

int  nv50_gpio_init(struct nouveau_object *);

int  nv50_gpio_fini(struct nouveau_object *, bool);

void nv50_gpio_intr(struct nouveau_subdev *);

void nv50_gpio_intr_enable(struct nouveau_event *, int line);

void nv50_gpio_intr_disable(struct nouveau_event *, int line);

extern struct nouveau_oclass nve0_gpio_oclass;



#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xe4:

		device->cname = "GK104";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;
@@ -86,7 +86,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xe7:

		device->cname = "GK107";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;
@@ -115,7 +115,7 @@ nve0_identify(struct nouveau_device *device) 
	case 0xe6:

		device->cname = "GK106";

		device->oclass[NVDEV_SUBDEV_VBIOS  ] = &nouveau_bios_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nvd0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_GPIO   ] = &nve0_gpio_oclass;

		device->oclass[NVDEV_SUBDEV_I2C    ] = &nouveau_i2c_oclass;

		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nvc0_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nvd0_therm_oclass;

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
 *

 */



#include <subdev/gpio.h>

#include "priv.h"



struct nv10_gpio_priv {

	struct nouveau_gpio base;

drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c

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

 */



#include <subdev/gpio.h>

#include "priv.h"



struct nv50_gpio_priv {

	struct nouveau_gpio base;