drm/nv50: fix suspend/resume delays without firmware present
authorBen Skeggs <bskeggs@redhat.com>
Wed, 16 Dec 2009 05:07:45 +0000 (15:07 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 16 Dec 2009 07:06:05 +0000 (17:06 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nouveau_grctx.c

index d5d84c87f757ee1c9edb39e296ebf0c33e892389..419f4c2b3b89e529075f1b8afe077ba504b7e20f 100644 (file)
@@ -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);