aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-06-28 20:45:07 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 02:04:29 -0400
commit0b3b5579e1e498af2383b0d0d68e84f2e0bc76db (patch)
treea2de5a6b8551236f18b6e2f26f6287d5c66bf8db
parente425e0b33990575fd1c41671725b36247a325ea9 (diff)
drm/nouveau: don't complain for disabled timingset entries
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_perf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index bb50f2490234..b4327dad6e56 100644
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -127,7 +127,8 @@ nouveau_perf_timing(struct drm_device *dev, struct bit_entry *P,
127 127
128 entry += ramcfg * recordlen; 128 entry += ramcfg * recordlen;
129 if (entry[1] >= pm->memtimings.nr_timing) { 129 if (entry[1] >= pm->memtimings.nr_timing) {
130 NV_WARN(dev, "timingset %d does not exist\n", entry[1]); 130 if (entry[1] != 0xff)
131 NV_WARN(dev, "timingset %d does not exist\n", entry[1]);
131 return NULL; 132 return NULL;
132 } 133 }
133 134