Attachment 112412 Details for Bug 83992 – patch for lockups.

[patch] patch for lockups.

nouveau.patch (text/plain), 1.45 KB, created by Tom Englund on 2015-01-18 05:27:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Englund

Created: 2015-01-18 05:27:33 UTC

Size: 1.45 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
>index b8e5fe6..c681715 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
>@@ -1002,19 +1002,15 @@ nvc0_grctx_mmio_item(struct nvc0_grctx *info, u32 addr, u32 data,
> 		     int shift, int buffer)
> {
> 	if (info->data) {
>-		if (shift >= 0) {
>-			info->mmio->addr = addr;
>-			info->mmio->data = data;
>-			info->mmio->shift = shift;
>-			info->mmio->buffer = buffer;
>-			if (buffer >= 0)
>-				data |= info->buffer[buffer] >> shift;
>-			info->mmio++;
>-		} else
>-			return;
>+		info->mmio->addr = addr;
>+		info->mmio->data = data;
>+		info->mmio->shift = shift;
>+		info->mmio->buffer = buffer;
>+		if (buffer >= 0 && shift > 0)
>+			data |= info->buffer[buffer] >> shift;
>+		info->mmio++;
> 	} else {
>-		if (buffer >= 0)
>-			return;
>+		return;
> 	}
> 
> 	nv_wr32(info->priv, addr, data);
>diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
>index 30fd1dc..d41e0dd 100644
>--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
>+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
>@@ -315,7 +315,7 @@ nvc0_graph_context_ctor(struct nouveau_object *parent,
> 		u32 addr = mmio->addr;
> 		u32 data = mmio->data;
> 
>-		if (mmio->buffer >= 0) {
>+		if (mmio->shift) {
> 			u64 info = chan->data[mmio->buffer].vma.offset;
> 			data |= info >> mmio->shift;
> 		}

Actions: View | Splinter Review

Attachments on bug 83992: 106428 | 106429 | 112412

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.