diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-08-22 00:34:58 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-22 00:34:58 (GMT) |
| commit | 317b07b58c4312358410bf9b50dc7baeda9ed833 (patch) | |
| tree | db0ac764ee73d8eb9228c8a4cda2df821c3509ff /drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c | |
| parent | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (diff) | |
| parent | 78ae0ad403daf11cf63da86923d2b5dbeda3af8f (diff) | |
| download | linux-fsl-qoriq-317b07b58c4312358410bf9b50dc7baeda9ed833.tar.xz | |
Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
regression fixes and null derefs and oops fixes.
* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nv04/disp: fix framebuffer pin refcounting
drm/nouveau/mc: fix race condition between constructor and request_irq()
drm/nouveau: fix reclocking on nv40
drm/nouveau/ltcg: fix allocating memory as free
drm/nouveau/ltcg: fix ltcg memory initialization after suspend
drm/nouveau/fb: fix null derefs in nv49 and nv4e init
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c index 19e3a9a..ab7ef0a 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnv49.c @@ -40,15 +40,15 @@ nv49_ram_create(struct nouveau_object *parent, struct nouveau_object *engine, return ret; switch (pfb914 & 0x00000003) { - case 0x00000000: pfb->ram->type = NV_MEM_TYPE_DDR1; break; - case 0x00000001: pfb->ram->type = NV_MEM_TYPE_DDR2; break; - case 0x00000002: pfb->ram->type = NV_MEM_TYPE_GDDR3; break; + case 0x00000000: ram->type = NV_MEM_TYPE_DDR1; break; + case 0x00000001: ram->type = NV_MEM_TYPE_DDR2; break; + case 0x00000002: ram->type = NV_MEM_TYPE_GDDR3; break; case 0x00000003: break; } - pfb->ram->size = nv_rd32(pfb, 0x10020c) & 0xff000000; - pfb->ram->parts = (nv_rd32(pfb, 0x100200) & 0x00000003) + 1; - pfb->ram->tags = nv_rd32(pfb, 0x100320); + ram->size = nv_rd32(pfb, 0x10020c) & 0xff000000; + ram->parts = (nv_rd32(pfb, 0x100200) & 0x00000003) + 1; + ram->tags = nv_rd32(pfb, 0x100320); return 0; } |