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

Commit fa8c9ac7 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nv4c/mc: nv4x igp's have a different msi rearm register 

See https://bugs.freedesktop.org/show_bug.cgi?id=74492



Reported-by: default avatarRonald <ronald645@gmail.com>
Suggested-by: default avatarMarcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7d3428cd

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ 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/nv4c.o

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

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

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

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

+5 −5
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv4c_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;
@@ -334,7 +334,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv4c_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv4e_fb_oclass;
@@ -357,7 +357,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv4c_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;
@@ -380,7 +380,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv4c_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;
@@ -403,7 +403,7 @@ nv40_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_CLOCK  ] = &nv40_clock_oclass;

		device->oclass[NVDEV_SUBDEV_THERM  ] = &nv40_therm_oclass;

		device->oclass[NVDEV_SUBDEV_DEVINIT] =  nv1a_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv44_mc_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] =  nv4c_mc_oclass;

		device->oclass[NVDEV_SUBDEV_BUS    ] =  nv31_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  nv46_fb_oclass;

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct nouveau_mc_oclass { 
extern struct nouveau_oclass *nv04_mc_oclass;

extern struct nouveau_oclass *nv40_mc_oclass;

extern struct nouveau_oclass *nv44_mc_oclass;

extern struct nouveau_oclass *nv4c_mc_oclass;

extern struct nouveau_oclass *nv50_mc_oclass;

extern struct nouveau_oclass *nv94_mc_oclass;

extern struct nouveau_oclass *nv98_mc_oclass;

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ int nv04_mc_ctor(struct nouveau_object *, struct nouveau_object *, 
extern const struct nouveau_mc_intr nv04_mc_intr[];

int  nv04_mc_init(struct nouveau_object *);

void nv40_mc_msi_rearm(struct nouveau_mc *);

int  nv44_mc_init(struct nouveau_object *object);

int  nv50_mc_init(struct nouveau_object *);

extern const struct nouveau_mc_intr nv50_mc_intr[];

extern const struct nouveau_mc_intr nvc0_mc_intr[];

drivers/gpu/drm/nouveau/core/subdev/mc/nv44.c

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


#include "nv04.h"



static int

int

nv44_mc_init(struct nouveau_object *object)

{

	struct nv04_mc_priv *priv = (void *)object;