summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKelly Doran <kel.p.doran@gmail.com>2013-12-20 18:07:26 +0100
committerBen Skeggs <bskeggs@redhat.com>2014-01-07 04:37:54 +0100
commit854cc0e4cb71d215b1104605f2dbf73578de8a94 (patch)
treed00408e338bf27bd52c8b24ce5f4ace331bbe5da
parentdrm/nouveau: populate master subdev pointer only when fully constructed (diff)
downloadlinux-854cc0e4cb71d215b1104605f2dbf73578de8a94.tar.xz
linux-854cc0e4cb71d215b1104605f2dbf73578de8a94.zip
drm/nvc0/gr: fix mthd data submission
If the initial data element is 0, it will never be written, even though the value from the previous method may be there. Signed-off-by: Kelly Doran <kel.p.doran@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 434bb4b0fa2e..5c8a63dc506a 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -334,7 +334,7 @@ nvc0_graph_mthd(struct nvc0_graph_priv *priv, struct nvc0_graph_mthd *mthds)
while ((mthd = &mthds[i++]) && (init = mthd->init)) {
u32 addr = 0x80000000 | mthd->oclass;
for (data = 0; init->count; init++) {
- if (data != init->data) {
+ if (init == mthd->init || data != init->data) {
nv_wr32(priv, 0x40448c, init->data);
data = init->data;
}