summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-10-21 08:50:25 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-11-08 16:04:19 +1000
commitbdc1da1c53d9cbec075d6427259a92e733dfabee (patch)
tree80376ac88cdfded5ee6d7772c62bfba388480c4d /drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
parent52a7d756d983bcfb05a865dc05b2a7b255882dc5 (diff)
drm/nouveau/fb: remove ram oclass argument from base fb constructor
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
index 50d93d71f479..61a278f3f1ce 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv46.c
@@ -52,7 +52,7 @@ nv46_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nv46_fb_priv *priv;
int ret;
- ret = nouveau_fb_create(parent, engine, oclass, &nv44_ram_oclass, &priv);
+ ret = nouveau_fb_create(parent, engine, oclass, &priv);
*pobject = nv_object(priv);
if (ret)
return ret;
@@ -67,12 +67,13 @@ nv46_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
struct nouveau_oclass *
-nv46_fb_oclass = &(struct nouveau_oclass) {
- .handle = NV_SUBDEV(FB, 0x46),
- .ofuncs = &(struct nouveau_ofuncs) {
+nv46_fb_oclass = &(struct nouveau_fb_impl) {
+ .base.handle = NV_SUBDEV(FB, 0x46),
+ .base.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv46_fb_ctor,
.dtor = _nouveau_fb_dtor,
.init = nv44_fb_init,
.fini = _nouveau_fb_fini,
},
-};
+ .ram = &nv44_ram_oclass,
+}.base;