Maarten Maathuis
2009-Dec-03 21:57 UTC
[Nouveau] strange change in commit 38c34b28f04518fec8ec474a6530d0fb37002cf5
diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c
b/drivers/gpu/drm/nouveau/nv10_fifo.c
index 877f00e..ed7f466 100644
--- a/drivers/gpu/drm/nouveau/nv10_fifo.c
+++ b/drivers/gpu/drm/nouveau/nv10_fifo.c
@@ -216,7 +216,7 @@ nv10_fifo_init_ramxx(struct drm_device *dev)
(dev_priv->ramht_offset >> 8));
nv_wr32(dev, NV03_PFIFO_RAMRO, dev_priv->ramro_offset>>8);
- if (dev_priv->card_type > NV_11) {
+ if (dev_priv->chipset < 0x17) {
nv_wr32(dev, NV03_PFIFO_RAMFC, (dev_priv->ramfc_offset >> 8) |
(1 << 16) /* 64 Bytes entry*/);
/* XXX nvidia blob set bit 18, 21,23 for nv20 & nv30 */
That strikes me as somewhat odd.
Maarten.
Xavier
2009-Dec-03 22:15 UTC
[Nouveau] strange change in commit 38c34b28f04518fec8ec474a6530d0fb37002cf5
On Thu, Dec 3, 2009 at 10:57 PM, Maarten Maathuis <madman2003 at gmail.com> wrote:> diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c > b/drivers/gpu/drm/nouveau/nv10_fifo.c > index 877f00e..ed7f466 100644 > --- a/drivers/gpu/drm/nouveau/nv10_fifo.c > +++ b/drivers/gpu/drm/nouveau/nv10_fifo.c > @@ -216,7 +216,7 @@ nv10_fifo_init_ramxx(struct drm_device *dev) > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (dev_priv->ramht_offset >> 8)); > ? ? ? ?nv_wr32(dev, NV03_PFIFO_RAMRO, dev_priv->ramro_offset>>8); > > - ? ? ? if (dev_priv->card_type > NV_11) { > + ? ? ? if (dev_priv->chipset < 0x17) { > ? ? ? ? ? ? ? ?nv_wr32(dev, NV03_PFIFO_RAMFC, (dev_priv->ramfc_offset >> 8) | > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? (1 << 16) /* 64 Bytes entry*/); > ? ? ? ? ? ? ? ?/* XXX nvidia blob set bit 18, 21,23 for nv20 & nv30 */ > > > > That strikes me as somewhat odd. >This change made my nv25 literally angry :D [ 16.303268] [drm] nouveau 0000:03:00.0: PFIFO still angry after 101 spins, halt -------------- next part -------------- A non-text attachment was scrubbed... Name: dmesg.log Type: application/octet-stream Size: 59714 bytes Desc: not available Url : http://lists.freedesktop.org/archives/nouveau/attachments/20091203/3d84d836/attachment-0001.obj
Ben Skeggs
2009-Dec-03 23:23 UTC
[Nouveau] strange change in commit 38c34b28f04518fec8ec474a6530d0fb37002cf5
On Thu, 2009-12-03 at 23:15 +0100, Xavier wrote:> On Thu, Dec 3, 2009 at 10:57 PM, Maarten Maathuis <madman2003 at gmail.com> wrote: > > diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c > > b/drivers/gpu/drm/nouveau/nv10_fifo.c > > index 877f00e..ed7f466 100644 > > --- a/drivers/gpu/drm/nouveau/nv10_fifo.c > > +++ b/drivers/gpu/drm/nouveau/nv10_fifo.c > > @@ -216,7 +216,7 @@ nv10_fifo_init_ramxx(struct drm_device *dev) > > (dev_priv->ramht_offset >> 8)); > > nv_wr32(dev, NV03_PFIFO_RAMRO, dev_priv->ramro_offset>>8); > > > > - if (dev_priv->card_type > NV_11) { > > + if (dev_priv->chipset < 0x17) { > > nv_wr32(dev, NV03_PFIFO_RAMFC, (dev_priv->ramfc_offset >> 8) | > > (1 << 16) /* 64 Bytes entry*/); > > /* XXX nvidia blob set bit 18, 21,23 for nv20 & nv30 */ > > > > > > > > That strikes me as somewhat odd. > > > > This change made my nv25 literally angry :DOops, sorry about that. Fixed in git. Ben.> > [ 16.303268] [drm] nouveau 0000:03:00.0: PFIFO still angry after 101 > spins, halt > _______________________________________________ > Nouveau mailing list > Nouveau at lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/nouveau