From d20e071155da671250a478c6c86d3a0dec04438e Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 29 Jun 2011 10:45:07 +1000 Subject: [PATCH] --- yaml --- r: 269611 b: refs/heads/master c: 0b3b5579e1e498af2383b0d0d68e84f2e0bc76db h: refs/heads/master i: 269609: f56e7ba17a00de76c126a19530e2df280cb61687 269607: 3c602d90af4af36755216c8b5b16b8c7d4078d91 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_perf.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 66e1994858a2..0be33ecf3f53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e425e0b33990575fd1c41671725b36247a325ea9 +refs/heads/master: 0b3b5579e1e498af2383b0d0d68e84f2e0bc76db diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c index bb50f2490234..b4327dad6e56 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -127,7 +127,8 @@ nouveau_perf_timing(struct drm_device *dev, struct bit_entry *P, entry += ramcfg * recordlen; if (entry[1] >= pm->memtimings.nr_timing) { - NV_WARN(dev, "timingset %d does not exist\n", entry[1]); + if (entry[1] != 0xff) + NV_WARN(dev, "timingset %d does not exist\n", entry[1]); return NULL; }