summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2009-12-16 15:07:45 +1000
committerBen Skeggs <bskeggs@redhat.com>2009-12-16 17:06:05 +1000
commit65ec01a9406327f22b1c740f8a42cb93eb676eb5 (patch)
treeedac7d5157e25ee9346bbfbf2518c55940c93238 /drivers/gpu/drm
parent0735f62e116fae1e4f36237a97de28e8a56b4c2c (diff)
downloadblackbird-op-linux-65ec01a9406327f22b1c740f8a42cb93eb676eb5.tar.gz
blackbird-op-linux-65ec01a9406327f22b1c740f8a42cb93eb676eb5.zip
drm/nv50: fix suspend/resume delays without firmware present
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_grctx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.c b/drivers/gpu/drm/nouveau/nouveau_grctx.c
index d5d84c87f757..419f4c2b3b89 100644
--- a/drivers/gpu/drm/nouveau/nouveau_grctx.c
+++ b/drivers/gpu/drm/nouveau/nouveau_grctx.c
@@ -56,6 +56,9 @@ nouveau_grctx_prog_load(struct drm_device *dev)
char name[32];
int ret, i;
+ if (pgraph->accel_blocked)
+ return -ENODEV;
+
if (!pgraph->ctxprog) {
sprintf(name, "nouveau/nv%02x.ctxprog", chipset);
ret = request_firmware(&fw, name, &dev->pdev->dev);
OpenPOWER on IntegriCloud