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

drm/nouveau: populate master subdev pointer only when fully constructed 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-11-27 09:46:56 +10:00
parent bdefc8cbdf
commit 61b365a505
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/nouveau/core/core/subdev.c
View File

@ -104,11 +104,8 @@ nouveau_subdev_create_(struct nouveau_object *parent,
if (parent) { if (parent) {
struct nouveau_device *device = nv_device(parent); struct nouveau_device *device = nv_device(parent);
int subidx = nv_hclass(subdev) & 0xff;
subdev->debug = nouveau_dbgopt(device->dbgopt, subname); subdev->debug = nouveau_dbgopt(device->dbgopt, subname);
subdev->mmio = nv_subdev(device)->mmio; subdev->mmio = nv_subdev(device)->mmio;
device->subdev[subidx] = *pobject;
} }
return 0; return 0;

2
drivers/gpu/drm/nouveau/core/engine/device/base.c
View File

@ -268,6 +268,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
if (ret) if (ret)
return ret; return ret;
device->subdev[i] = devobj->subdev[i];
/* note: can't init *any* subdevs until devinit has been run /* note: can't init *any* subdevs until devinit has been run
* due to not knowing exactly what the vbios init tables will * due to not knowing exactly what the vbios init tables will
* mess with. devinit also can't be run until all of its * mess with. devinit also can't be run until all of its

5
drivers/gpu/drm/nouveau/core/include/subdev/fb.h
View File

@ -75,6 +75,11 @@ struct nouveau_fb {
static inline struct nouveau_fb * static inline struct nouveau_fb *
nouveau_fb(void *obj) nouveau_fb(void *obj)
{ {
/* fbram uses this before device subdev pointer is valid */
if (nv_iclass(obj, NV_SUBDEV_CLASS) &&
nv_subidx(obj) == NVDEV_SUBDEV_FB)
return obj;
return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FB]; return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FB];
} }