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

Ben Skeggs · Ben Skeggs · commit 61b365a505d6 · 2014-01-07T13:37:36.000+10:00
Signed-off-by: Ben Skeggs &lt;bskeggs@redhat.com&gt;
diff --git a/drivers/gpu/drm/nouveau/core/core/subdev.c b/drivers/gpu/drm/nouveau/core/core/subdev.c
@@ -104,11 +104,8 @@ nouveau_subdev_create_(struct nouveau_object *parent,
 
 	if (parent) {
 		struct nouveau_device *device = nv_device(parent);
-		int subidx = nv_hclass(subdev) & 0xff;
-
 		subdev->debug = nouveau_dbgopt(device->dbgopt, subname);
 		subdev->mmio  = nv_subdev(device)->mmio;
-		device->subdev[subidx] = *pobject;
 	}
 
 	return 0;
diff --git a/drivers/gpu/drm/nouveau/core/engine/device/base.c b/drivers/gpu/drm/nouveau/core/engine/device/base.c
@@ -268,6 +268,8 @@ nouveau_devobj_ctor(struct nouveau_object *parent,
 		if (ret)
 			return ret;
 
+		device->subdev[i] = devobj->subdev[i];
+
 		/* note: can't init *any* subdevs until devinit has been run
 		 * due to not knowing exactly what the vbios init tables will
 		 * mess with.  devinit also can't be run until all of its
diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
@@ -75,6 +75,11 @@ struct nouveau_fb {
 static inline struct nouveau_fb *
 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];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,11 @@ struct nouveau_fb {`
`75`	`75`	`static inline struct nouveau_fb *`
`76`	`76`	`nouveau_fb(void *obj)`
`77`	`77`	`{`
	`78`	`+ /* fbram uses this before device subdev pointer is valid */`
	`79`	`+ if (nv_iclass(obj, NV_SUBDEV_CLASS) &&`
	`80`	`+ nv_subidx(obj) == NVDEV_SUBDEV_FB)`
	`81`	`+ return obj;`
	`82`	`+`
`78`	`83`	`return (void *)nv_device(obj)->subdev[NVDEV_SUBDEV_FB];`
`79`	`84`	`}`
`80`	`85`