diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-12-16 00:07:45 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-12-16 02:06:05 -0500 |
| commit | 65ec01a9406327f22b1c740f8a42cb93eb676eb5 (patch) | |
| tree | edac7d5157e25ee9346bbfbf2518c55940c93238 /drivers/gpu/drm/nouveau | |
| parent | 0735f62e116fae1e4f36237a97de28e8a56b4c2c (diff) | |
drm/nv50: fix suspend/resume delays without firmware present
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_grctx.c | 3 |
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) | |||
| 56 | char name[32]; | 56 | char name[32]; |
| 57 | int ret, i; | 57 | int ret, i; |
| 58 | 58 | ||
| 59 | if (pgraph->accel_blocked) | ||
| 60 | return -ENODEV; | ||
| 61 | |||
| 59 | if (!pgraph->ctxprog) { | 62 | if (!pgraph->ctxprog) { |
| 60 | sprintf(name, "nouveau/nv%02x.ctxprog", chipset); | 63 | sprintf(name, "nouveau/nv%02x.ctxprog", chipset); |
| 61 | ret = request_firmware(&fw, name, &dev->pdev->dev); | 64 | ret = request_firmware(&fw, name, &dev->pdev->dev); |