From: Ben Skeggs Date: Mon, 11 Aug 2014 23:17:41 +0000 (+1000) Subject: drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d9e3921f4d77bcaeea913c48b894d1208f0cb06;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform Likely a large part of the GK106 woes.. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c index 946518572346..2b284b192763 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c @@ -554,13 +554,13 @@ nvc0_ram_create_(struct nouveau_object *parent, struct nouveau_object *engine, } else { /* otherwise, address lowest common amount from 0GiB */ ret = nouveau_mm_init(&pfb->vram, rsvd_head, - (bsize << 8) * parts, 1); + (bsize << 8) * parts - rsvd_head, 1); if (ret) return ret; /* and the rest starting from (8GiB + common_size) */ offset = (0x0200000000ULL >> 12) + (bsize << 8); - length = (ram->size >> 12) - (bsize << 8) - rsvd_tail; + length = (ram->size >> 12) - ((bsize * parts) << 8) - rsvd_tail; ret = nouveau_mm_init(&pfb->vram, offset, length, 0); if (ret)