drm/nv50: fix suspend/resume delays without firmware present

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.c b/drivers/gpu/drm/nouveau/nouveau_grctx.c
index d5d84c87f757ee1c9edb39e296ebf0c33e892389..419f4c2b3b89e529075f1b8afe077ba504b7e20f 100644 (file)
--- 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);