From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 16 Dec 2009 05:07:45 +0000 (+1000)
Subject: drm/nv50: fix suspend/resume delays without firmware present
X-Git-Tag: firefly_0821_release~9833^2~3227^2~58^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=65ec01a9406327f22b1c740f8a42cb93eb676eb5;p=firefly-linux-kernel-4.4.55.git

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 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);