| From 67e26e41ff8aa514826dae79f0b10169b5ba93b4 Mon Sep 17 00:00:00 2001 |
| From: Ben Skeggs <bskeggs@redhat.com> |
| Date: Mon, 20 Oct 2014 15:49:33 +1000 |
| Subject: drm/nouveau: fix regression on agp boards |
| |
| From: Ben Skeggs <bskeggs@redhat.com> |
| |
| commit 67e26e41ff8aa514826dae79f0b10169b5ba93b4 upstream. |
| |
| Extends the fix in f2f9a2cbaf019481feefe231f996d3602612fa99 to also |
| workaround permission issues noticed by people using AGP systems. |
| |
| Signed-off-by: Ben Skeggs <bskeggs@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/gpu/drm/nouveau/nouveau_chan.c | 12 +++++++++--- |
| 1 file changed, 9 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/gpu/drm/nouveau/nouveau_chan.c |
| +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c |
| @@ -400,15 +400,20 @@ nouveau_channel_new(struct nouveau_drm * |
| struct nouveau_channel **pchan) |
| { |
| struct nouveau_cli *cli = (void *)nvif_client(&device->base); |
| + bool super; |
| int ret; |
| |
| + /* hack until fencenv50 is fixed, and agp access relaxed */ |
| + super = cli->base.super; |
| + cli->base.super = true; |
| + |
| ret = nouveau_channel_ind(drm, device, handle, arg0, pchan); |
| if (ret) { |
| NV_PRINTK(debug, cli, "ib channel create, %d\n", ret); |
| ret = nouveau_channel_dma(drm, device, handle, pchan); |
| if (ret) { |
| NV_PRINTK(debug, cli, "dma channel create, %d\n", ret); |
| - return ret; |
| + goto done; |
| } |
| } |
| |
| @@ -416,8 +421,9 @@ nouveau_channel_new(struct nouveau_drm * |
| if (ret) { |
| NV_PRINTK(error, cli, "channel failed to initialise, %d\n", ret); |
| nouveau_channel_del(pchan); |
| - return ret; |
| } |
| |
| - return 0; |
| +done: |
| + cli->base.super = super; |
| + return ret; |
| } |