diff options
| author | Alexandre Oliva <lxoliva@fsfla.org> | 2010-08-29 00:03:21 +0000 |
|---|---|---|
| committer | Alexandre Oliva <lxoliva@fsfla.org> | 2010-08-29 00:03:21 +0000 |
| commit | 38532ed971dd43ea11f199f44263a4ad0748ff95 (patch) | |
| tree | 35fd4f8845b107f0cd76330765c71eaf4b7bb96c /freed-ora/current/f14/drm-nouveau-updates.patch | |
| parent | b04f6272249304a5d343706deeb51fc9434d5df0 (diff) | |
| download | linux-libre-raptor-38532ed971dd43ea11f199f44263a4ad0748ff95.tar.gz linux-libre-raptor-38532ed971dd43ea11f199f44263a4ad0748ff95.zip | |
2.6.35-3.fc14
Diffstat (limited to 'freed-ora/current/f14/drm-nouveau-updates.patch')
| -rw-r--r-- | freed-ora/current/f14/drm-nouveau-updates.patch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/freed-ora/current/f14/drm-nouveau-updates.patch b/freed-ora/current/f14/drm-nouveau-updates.patch index 1b704ff0a..b7db6144c 100644 --- a/freed-ora/current/f14/drm-nouveau-updates.patch +++ b/freed-ora/current/f14/drm-nouveau-updates.patch @@ -1,3 +1,5 @@ +* drivers/gpu/drm/nouveau/nouveau_grctx.c: Adjusted, was already deblobbed. + drivers/gpu/drm/drm_crtc_helper.c | 22 +- drivers/gpu/drm/i2c/ch7006_drv.c | 22 +- drivers/gpu/drm/i2c/ch7006_priv.h | 2 +- @@ -2716,8 +2718,8 @@ index f731c5f..0000000 - return -ENODEV; - - if (!pgraph->ctxprog) { -- sprintf(name, "nouveau/nv%02x.ctxprog", chipset); -- ret = request_firmware(&fw, name, &dev->pdev->dev); +- sprintf(name, "/*(DEBLOBBED)*/", chipset); +- ret = reject_firmware(&fw, name, &dev->pdev->dev); - if (ret) { - NV_ERROR(dev, "No ctxprog for NV%02x\n", chipset); - return ret; @@ -2743,8 +2745,8 @@ index f731c5f..0000000 - } - - if (!pgraph->ctxvals) { -- sprintf(name, "nouveau/nv%02x.ctxvals", chipset); -- ret = request_firmware(&fw, name, &dev->pdev->dev); +- sprintf(name, "/*(DEBLOBBED)*/", chipset); +- ret = reject_firmware(&fw, name, &dev->pdev->dev); - if (ret) { - NV_ERROR(dev, "No ctxvals for NV%02x\n", chipset); - nouveau_grctx_fini(dev); |
