From: Ben Skeggs Date: Fri, 22 Jan 2010 03:17:28 +0000 (+1000) Subject: drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50 X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~8441^2~2^2~9 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e235c1f3e132a243a1f81b3d95c99ee199b4d3f3;p=mirror_ubuntu-zesty-kernel.git drm/nv40: make INIT_COMPUTE_MEM a NOP, just like nv50 It appears we aren't required to do memory sizing ourselves on nv40 either. NV40 init tables read a strap from PEXTDEV_BOOT_0 into a CRTC register, and then later use that value to select a memory configuration (written to PFB_CFG0, just like INIT_COMPUTE_MEM on earlier cards) with INIT_IO_RESTRICT_PROG. Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index d7f8d8b4a4b8..fb4793e65ff2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -1865,7 +1865,7 @@ init_compute_mem(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) struct drm_nouveau_private *dev_priv = bios->dev->dev_private; - if (dev_priv->card_type >= NV_50) + if (dev_priv->card_type >= NV_40) return 1; /*