drm/nouveau: mark last megabyte as usable
Subsystems (3)
PATCH 1/1 drm/nouveau: mark last megabyte as usable
It's my megabyte, I want to use it! At this point in init vbios is copied over already, so there's no reason it cannot used to hold other data now.
---
drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c +2 -3
@@ -119,7 +119,6 @@ nvc0_ram_create(struct nouveau_object *parent, struct nouveau_object *engine,struct nouveau_bios *bios =nouveau_bios (pfb);struct nouveau_ram *ram;const u32 rsvd_head = (256 *1024 ) >>12 ;/* vga memory */ -const u32 rsvd_tail = (1024 *1024 ) >>12 ;/* vbios etc */ u32 parts =nv_rd32 (pfb,0x022438 );u32 pmask =nv_rd32 (pfb,0x022554 );u32 bsize =nv_rd32 (pfb,0x10f20c );
@@ -156,7 +155,7 @@ nvc0_ram_create(struct nouveau_object *parent, struct nouveau_object *engine,/* if all controllers have the same amount attached, there's no holes */ if (uniform) { offset = rsvd_head; - length = (ram->size >>12 ) - rsvd_head - rsvd_tail; + length = (ram->size >>12 ) - rsvd_head; ret =nouveau_mm_init (&pfb->vram, offset, length,1 ); }else {/* otherwise, address lowest common amount from 0GiB */
@@ -167,7 +166,7 @@ nvc0_ram_create(struct nouveau_object *parent, struct nouveau_object *engine,/* 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 <<8 ); ret =nouveau_mm_init (&pfb->vram, offset, length,0 );if (ret)
Quoted 3 lines · Maarten Lankhorst
It's my megabyte, I want to use it! At this point in init vbios is copied over already, so there's no reason it cannot used to hold other data now.
I believe there's areas in here where the SBIOS/VBIOS can communicate to the driver on various events actually, at least in some situations.
I'd rather leave it reserved for the moment. Also, if/when we do do
this, we'll want to stick the vbios image back on module unload so it's there for reload too.
Ben.
Quoted 38 lines
Signed-off-by Maarten Lankhorst <[email protected]>---
drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c +2
-3@@ -119,7 +119,6 @@ nvc0_ram_create(struct nouveau_object *parent, struct nouveau_object *engine,struct nouveau_bios *bios =nouveau_bios (pfb);struct nouveau_ram *ram;const u32 rsvd_head = (256 *1024 ) >>12 ;/* vga memory */ -const u32 rsvd_tail = (1024 *1024 ) >>12 ;/* vbios etc */ u32 parts =nv_rd32 (pfb,0x022438 );u32 pmask =nv_rd32 (pfb,0x022554 );u32 bsize =nv_rd32 (pfb,0x10f20c );@@ -156,7 +155,7 @@ nvc0_ram_create(struct nouveau_object *parent, struct nouveau_object *engine,/* if all controllers have the same amount attached, there's no holes */ if (uniform) { offset = rsvd_head; - length = (ram->size >>12 ) - rsvd_head - rsvd_tail; + length = (ram->size >>12 ) - rsvd_head; ret =nouveau_mm_init (&pfb->vram, offset, length,1 ); }else {/* otherwise, address lowest common amount from 0GiB */ @@ -167,7 +166,7 @@ nvc0_ram_create(struct nouveau_object *parent, struct nouveau_object *engine,/* 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 <<8 ); ret =nouveau_mm_init (&pfb->vram, offset, length,0 );if (ret)_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau