Commit 268d5a30 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7e0f992b

drivers/gpu/drm/nouveau/core/include/subdev/fb.h

+0 −2
Original line number Diff line number Diff line
@@ -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 *);

drivers/gpu/drm/nouveau/core/subdev/fb/nv10.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/nouveau/core/subdev/fb/nv30.c

+9 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/nouveau/core/subdev/fb/nv35.c

+9 −1
Original line number Diff line number Diff line
@@ -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);

}