diff options
| author | Colin Ian King <colin.king@canonical.com> | 2018-11-25 18:09:18 +0100 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2019-02-19 23:59:58 +0100 |
| commit | 13649101a25c53c87f4ab98a076dfe61f3636ab1 (patch) | |
| tree | 72cc6657b133d13db20dd467b2a12440ee7cf724 /drivers | |
| parent | drm/nouveau/bios/dp: make array vsoff static, shrinks object size (diff) | |
| download | linux-13649101a25c53c87f4ab98a076dfe61f3636ab1.tar.xz linux-13649101a25c53c87f4ab98a076dfe61f3636ab1.zip | |
drm/nouveau/bios/ramcfg: fix missing parentheses when calculating RON
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: c25bf7b6155c ("drm/nouveau/bios/ramcfg: Separate out RON pull value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c index 60ece0a8a2e1..1d2d6bae73cd 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gddr3.c @@ -87,7 +87,7 @@ nvkm_gddr3_calc(struct nvkm_ram *ram) WR = (ram->next->bios.timing[2] & 0x007f0000) >> 16; /* XXX: Get these values from the VBIOS instead */ DLL = !(ram->mr[1] & 0x1); - RON = !(ram->mr[1] & 0x300) >> 8; + RON = !((ram->mr[1] & 0x300) >> 8); break; default: return -ENOSYS; |