drm/nv30/fb: start bashing zcomp registers with 'disabled' (for now)

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
index e8d0d73db51cc9ebe2c846ae88fc53e7d230afcd..3108f19ef505e8ed5dfb4ea840f67a7021335e8a 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
@@ -132,8 +132,6 @@ int  nouveau_fb_bios_memtype(struct nouveau_bios *);
 
 bool nv04_fb_memtype_valid(struct nouveau_fb *, u32 memtype);
 
-void nv10_fb_tile_prog(struct nouveau_fb *, int, struct nouveau_fb_tile *);
-
 void nv20_fb_tile_init(struct nouveau_fb *, int i, u32 addr, u32 size,
                       u32 pitch, u32 flags, struct nouveau_fb_tile *);
 void nv20_fb_tile_fini(struct nouveau_fb *, int i, struct nouveau_fb_tile *);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c
index 1ecd7033514e661a6f0cb2b595678989796fe5ba..12193d9dd2a63110cc5be7f0a14d34c7b87ddd88 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c
@@ -48,7 +48,7 @@ nv10_fb_tile_fini(struct nouveau_fb *pfb, int i, struct nouveau_fb_tile *tile)
        tile->zcomp = 0;
 }
 
-void
+static void
 nv10_fb_tile_prog(struct nouveau_fb *pfb, int i, struct nouveau_fb_tile *tile)
 {
        nv_wr32(pfb, 0x100244 + (i * 0x10), tile->limit);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c
index 83e3a88c41fb16a761c44d66575834599e8f1cf5..d6ed18cc8e8403a2c32448dfe043a466f080059f 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c
@@ -44,6 +44,13 @@ nv30_fb_tile_init(struct nouveau_fb *pfb, int i, u32 addr, u32 size, u32 pitch,
        tile->pitch = pitch;
 }
 
+static void
+nv30_fb_tile_comp(struct nouveau_fb *pfb, int i, u32 size, u32 flags,
+                 struct nouveau_fb_tile *tile)
+{
+       tile->zcomp = 0x00000000;
+}
+
 void
 nv30_fb_tile_fini(struct nouveau_fb *pfb, int i, struct nouveau_fb_tile *tile)
 {
@@ -136,8 +143,9 @@ nv30_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        priv->base.memtype_valid = nv04_fb_memtype_valid;
        priv->base.tile.regions = 8;
        priv->base.tile.init = nv30_fb_tile_init;
+       priv->base.tile.comp = nv30_fb_tile_comp;
        priv->base.tile.fini = nv30_fb_tile_fini;
-       priv->base.tile.prog = nv10_fb_tile_prog;
+       priv->base.tile.prog = nv20_fb_tile_prog;
        return nouveau_fb_created(&priv->base);
 }
 

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c b/drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c
index 49787022ff11251890fcd118c04541ac1f2ac5f0..1c313db8a5606ad56e6f86b849503e2ecc10f8e3 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c
@@ -30,6 +30,13 @@ struct nv35_fb_priv {
        struct nouveau_fb base;
 };
 
+static void
+nv35_fb_tile_comp(struct nouveau_fb *pfb, int i, u32 size, u32 flags,
+                 struct nouveau_fb_tile *tile)
+{
+       tile->zcomp = 0x00000000;
+}
+
 static int
 nv35_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
             struct nouveau_oclass *oclass, void *data, u32 size,
@@ -56,8 +63,9 @@ nv35_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        priv->base.memtype_valid = nv04_fb_memtype_valid;
        priv->base.tile.regions = 8;
        priv->base.tile.init = nv30_fb_tile_init;
+       priv->base.tile.comp = nv35_fb_tile_comp;
        priv->base.tile.fini = nv30_fb_tile_fini;
-       priv->base.tile.prog = nv10_fb_tile_prog;
+       priv->base.tile.prog = nv20_fb_tile_prog;
        return nouveau_fb_created(&priv->base);
 }