← Back to branch summary

~ubuntu-branches/ubuntu/natty/linux-backports-modules-2.6.32/natty

« back to all changes in this revision

Viewing changes to updates/nouveau-patches/0002-drm-nv50-Remove-redundant-incorrect-ctxvals-initiali.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andy Whitcroft, Andy Whitcroft, Christopher James Halse Rogers, Upstream Kernel Changes
  • Date: 2010-02-26 19:06:43 UTC
  • Revision ID: james.westby@ubuntu.com-20100226190643-t5wuxgcpwkbbo3m6
Tags: 2.6.32-14.4
https://launchpad.net/bugs/528190
[ Andy Whitcroft ]

* UPDATE_NOUVEAU -- add support for dropping patches on top
* update Nouveau to v2.6.33

[ Christopher James Halse Rogers ]

* fix legacy paths in UPDATE_NOUVEAU
* pull in ctxprog voodoo from Nouveau upstream
  - LP: #528190
* update Nouveau package description to mention lbm-nouveau metapackage
* update VCS-Git field to point to lucid lbm

[ Upstream Kernel Changes ]

* drm/nv50: Implement ctxprog/state generation.
* drm/nv50: Remove redundant/incorrect ctxvals initialisation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
updates/nouveau-patches/0002-drm-nv50-Remove-redundant-incorrect-ctxvals-initiali.patch
 
1
From 53293422072043e897c2d755d4139b5e4d5532de Mon Sep 17 00:00:00 2001
 
2
From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin@0x04.net>
 
3
Date: Thu, 25 Feb 2010 18:53:37 +0000
 
4
Subject: [PATCH] drm/nv50: Remove redundant/incorrect ctxvals initialisation.
 
5
MIME-Version: 1.0
 
6
Content-Type: text/plain; charset=UTF-8
 
7
Content-Transfer-Encoding: 8bit
 
8
 
 
9
11c/004 offset corresponds to PGRAPH reg 0x400828, and is initialised
 
10
earlier anyway by both our ctxprog generator and blob ctxvals. It's
 
11
actually incorrect with the generator, since we use different layout
 
12
on pre-NVA0.
 
13
 
 
14
Signed-off-by: Marcin Kościelnicki <koriakin@0x04.net>
 
15
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
 
16
(cherry-picked from 53293422072043e897c2d755d4139b5e4d5532de)
 
17
Signed-off-by: Andy Whitcroft <apw@canonical.com>
 
18
---
 
19
 drivers/gpu/drm/nouveau/nv50_graph.c |    4 ----
 
20
 1 files changed, 0 insertions(+), 4 deletions(-)
 
21
 
 
22
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
 
23
index 857a096..08d87b7 100644
 
24
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
 
25
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
 
26
@@ -229,10 +229,6 @@ nv50_graph_create_context(struct nouveau_channel *chan)
 
27
                nouveau_grctx_vals_load(dev, ctx);
 
28
        }
 
29
        nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12);
 
30
-       if ((dev_priv->chipset & 0xf0) == 0xa0)
 
31
-               nv_wo32(dev, ctx, 0x00004/4, 0x00000000);
 
32
-       else
 
33
-               nv_wo32(dev, ctx, 0x0011c/4, 0x00000000);
 
34
        dev_priv->engine.instmem.finish_access(dev);
 
35
 
 
36
        return 0;
 
37
-- 
 
38
1.7.0
 
39