openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau: fix thinkos in mem timing table recordlen check 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Roy Spliet 2010-10-04 23:01:08 +02:00 committed by Ben Skeggs
parent ca8e7c6ccd
commit a845fff841
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/nouveau/nouveau_mem.c
View File

@ -35,6 +35,8 @@
#include "drm_sarea.h" #include "drm_sarea.h"
#include "nouveau_drv.h" #include "nouveau_drv.h"
#define MIN(a,b) a < b ? a : b
/* /*
* NV10-NV40 tiling helpers * NV10-NV40 tiling helpers
*/ */
@ -717,14 +719,14 @@ nouveau_mem_timing_init(struct drm_device *dev)
tUNK_19 = 1; tUNK_19 = 1;
tUNK_20 = 0; tUNK_20 = 0;
tUNK_21 = 0; tUNK_21 = 0;
switch (recordlen) { switch (MIN(recordlen,21)) {
case 0x21: case 21:
tUNK_21 = entry[21]; tUNK_21 = entry[21];
case 0x20: case 20:
tUNK_20 = entry[20]; tUNK_20 = entry[20];
case 0x19: case 19:
tUNK_19 = entry[19]; tUNK_19 = entry[19];
case 0x18: case 18:
tUNK_18 = entry[18]; tUNK_18 = entry[18];
default: default:
tUNK_0 = entry[0]; tUNK_0 = entry[0];