openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/devinit/gm100-: force devinit table execution on boards without PDISP 

Should fix fdo#89558

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-05-21 15:47:16 +10:00
parent c9ab50d210
commit 4d4d6f7520
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
View File

@ -90,7 +90,7 @@ gf100_devinit_disable(struct nvkm_devinit *devinit)
return disable; return disable;
} }
static int int
gf100_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine, gf100_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)

2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
View File

@ -48,7 +48,7 @@ struct nvkm_oclass *
gm107_devinit_oclass = &(struct nvkm_devinit_impl) { gm107_devinit_oclass = &(struct nvkm_devinit_impl) {
.base.handle = NV_SUBDEV(DEVINIT, 0x07), .base.handle = NV_SUBDEV(DEVINIT, 0x07),
.base.ofuncs = &(struct nvkm_ofuncs) { .base.ofuncs = &(struct nvkm_ofuncs) {
.ctor = nv50_devinit_ctor, .ctor = gf100_devinit_ctor,
.dtor = _nvkm_devinit_dtor, .dtor = _nvkm_devinit_dtor,
.init = nv50_devinit_init, .init = nv50_devinit_init,
.fini = _nvkm_devinit_fini, .fini = _nvkm_devinit_fini,

2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
View File

@ -161,7 +161,7 @@ struct nvkm_oclass *
gm204_devinit_oclass = &(struct nvkm_devinit_impl) { gm204_devinit_oclass = &(struct nvkm_devinit_impl) {
.base.handle = NV_SUBDEV(DEVINIT, 0x07), .base.handle = NV_SUBDEV(DEVINIT, 0x07),
.base.ofuncs = &(struct nvkm_ofuncs) { .base.ofuncs = &(struct nvkm_ofuncs) {
.ctor = nv50_devinit_ctor, .ctor = gf100_devinit_ctor,
.dtor = _nvkm_devinit_dtor, .dtor = _nvkm_devinit_dtor,
.init = nv50_devinit_init, .init = nv50_devinit_init,
.fini = _nvkm_devinit_fini, .fini = _nvkm_devinit_fini,

3
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
View File

@ -15,6 +15,9 @@ int nv50_devinit_pll_set(struct nvkm_devinit *, u32, u32);
int gt215_devinit_pll_set(struct nvkm_devinit *, u32, u32); int gt215_devinit_pll_set(struct nvkm_devinit *, u32, u32);
int gf100_devinit_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *, u32,
struct nvkm_object **);
int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32); int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32);
u64 gm107_devinit_disable(struct nvkm_devinit *); u64 gm107_devinit_disable(struct nvkm_devinit *);