diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-10-21 08:50:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-08 15:39:51 +1000 |
| commit | 8613e7314ac254fdd67ed46192f021d76141e4c9 (patch) | |
| tree | c6b4ef097235c4be5340b4690f7eab7cfc68d570 /drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | |
| parent | 9ca3037e60924c8fcb53977d72efa493c821eec5 (diff) | |
| download | linux-8613e7314ac254fdd67ed46192f021d76141e4c9.tar.bz2 | |
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/nv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c index 1fd0dc73aa7c..8577e3a10120 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c @@ -243,7 +243,7 @@ nv50_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, struct nv50_fb_priv *priv; int ret; - ret = nouveau_fb_create(parent, engine, oclass, &nv50_ram_oclass, &priv); + ret = nouveau_fb_create(parent, engine, oclass, &priv); *pobject = nv_object(priv); if (ret) return ret; @@ -304,12 +304,13 @@ nv50_fb_init(struct nouveau_object *object) struct nouveau_oclass * nv50_fb_oclass = &(struct nv50_fb_impl) { - .base.handle = NV_SUBDEV(FB, 0x50), - .base.ofuncs = &(struct nouveau_ofuncs) { + .base.base.handle = NV_SUBDEV(FB, 0x50), + .base.base.ofuncs = &(struct nouveau_ofuncs) { .ctor = nv50_fb_ctor, .dtor = nv50_fb_dtor, .init = nv50_fb_init, .fini = _nouveau_fb_fini, }, + .base.ram = &nv50_ram_oclass, .trap = 0x000707ff, -}.base; +}.base.base; |