Commit a1c67bca authored by Colin Ian King's avatar Colin Ian King Committed by Kleber Sacilotto de Souza

drm/nouveau/bios/ramcfg: fix missing parentheses when calculating RON

BugLink: https://bugs.launchpad.net/bugs/1864773

[ Upstream commit 13649101 ]

Currently, the expression for calculating RON is always going to result
in zero no matter the value of ram->mr[1] because the ! operator has
higher precedence than the shift >> operator.  I believe the missing
parentheses around the expression before appying the ! operator will
result in the desired result.

[ Note, not tested ]

Detected by CoveritScan, CID#1324005 ("Operands don't affect result")

Fixes: c25bf7b6 ("drm/nouveau/bios/ramcfg: Separate out RON pull value")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 759c9a37
...@@ -87,7 +87,7 @@ nvkm_gddr3_calc(struct nvkm_ram *ram) ...@@ -87,7 +87,7 @@ nvkm_gddr3_calc(struct nvkm_ram *ram)
WR = (ram->next->bios.timing[2] & 0x007f0000) >> 16; WR = (ram->next->bios.timing[2] & 0x007f0000) >> 16;
/* XXX: Get these values from the VBIOS instead */ /* XXX: Get these values from the VBIOS instead */
DLL = !(ram->mr[1] & 0x1); DLL = !(ram->mr[1] & 0x1);
RON = !(ram->mr[1] & 0x300) >> 8; RON = !((ram->mr[1] & 0x300) >> 8);
break; break;
default: default:
return -ENOSYS; return -ENOSYS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment