mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
drm/nv30/fb: enable z compression
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
2f1cb96d65
commit
d7da62845b
@ -69,6 +69,7 @@ nouveau-y += core/subdev/fb/nv20.o
|
||||
nouveau-y += core/subdev/fb/nv25.o
|
||||
nouveau-y += core/subdev/fb/nv30.o
|
||||
nouveau-y += core/subdev/fb/nv35.o
|
||||
nouveau-y += core/subdev/fb/nv36.o
|
||||
nouveau-y += core/subdev/fb/nv40.o
|
||||
nouveau-y += core/subdev/fb/nv41.o
|
||||
nouveau-y += core/subdev/fb/nv44.o
|
||||
|
@ -121,6 +121,7 @@ extern struct nouveau_oclass nv20_fb_oclass;
|
||||
extern struct nouveau_oclass nv25_fb_oclass;
|
||||
extern struct nouveau_oclass nv30_fb_oclass;
|
||||
extern struct nouveau_oclass nv35_fb_oclass;
|
||||
extern struct nouveau_oclass nv36_fb_oclass;
|
||||
extern struct nouveau_oclass nv40_fb_oclass;
|
||||
extern struct nouveau_oclass nv41_fb_oclass;
|
||||
extern struct nouveau_oclass nv44_fb_oclass;
|
||||
|
@ -109,7 +109,7 @@ nv30_identify(struct nouveau_device *device)
|
||||
device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv20_devinit_oclass;
|
||||
device->oclass[NVDEV_SUBDEV_MC ] = &nv04_mc_oclass;
|
||||
device->oclass[NVDEV_SUBDEV_TIMER ] = &nv04_timer_oclass;
|
||||
device->oclass[NVDEV_SUBDEV_FB ] = &nv35_fb_oclass;
|
||||
device->oclass[NVDEV_SUBDEV_FB ] = &nv36_fb_oclass;
|
||||
device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv04_instmem_oclass;
|
||||
device->oclass[NVDEV_SUBDEV_VM ] = &nv04_vmmgr_oclass;
|
||||
device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nv04_dmaeng_oclass;
|
||||
|
@ -53,7 +53,17 @@ static void
|
||||
nv30_fb_tile_comp(struct nouveau_fb *pfb, int i, u32 size, u32 flags,
|
||||
struct nouveau_fb_tile *tile)
|
||||
{
|
||||
tile->zcomp = 0x00000000;
|
||||
u32 tiles = DIV_ROUND_UP(size, 0x40);
|
||||
u32 tags = round_up(tiles / pfb->ram.parts, 0x40);
|
||||
if (!nouveau_mm_head(&pfb->tags, 1, tags, tags, 1, &tile->tag)) {
|
||||
if (flags & 2) tile->zcomp |= 0x01000000; /* Z16 */
|
||||
else tile->zcomp |= 0x02000000; /* Z24S8 */
|
||||
tile->zcomp |= ((tile->tag->offset ) >> 6);
|
||||
tile->zcomp |= ((tile->tag->offset + tags - 1) >> 6) << 12;
|
||||
#ifdef __BIG_ENDIAN
|
||||
tile->zcomp |= 0x10000000;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -34,7 +34,17 @@ static void
|
||||
nv35_fb_tile_comp(struct nouveau_fb *pfb, int i, u32 size, u32 flags,
|
||||
struct nouveau_fb_tile *tile)
|
||||
{
|
||||
tile->zcomp = 0x00000000;
|
||||
u32 tiles = DIV_ROUND_UP(size, 0x40);
|
||||
u32 tags = round_up(tiles / pfb->ram.parts, 0x40);
|
||||
if (!nouveau_mm_head(&pfb->tags, 1, tags, tags, 1, &tile->tag)) {
|
||||
if (flags & 2) tile->zcomp |= 0x04000000; /* Z16 */
|
||||
else tile->zcomp |= 0x08000000; /* Z24S8 */
|
||||
tile->zcomp |= ((tile->tag->offset ) >> 6);
|
||||
tile->zcomp |= ((tile->tag->offset + tags - 1) >> 6) << 13;
|
||||
#ifdef __BIG_ENDIAN
|
||||
tile->zcomp |= 0x40000000;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
|
82
drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c
Normal file
82
drivers/gpu/drm/nouveau/core/subdev/fb/nv36.c
Normal file
@ -0,0 +1,82 @@
|
||||
/*
|
||||
* Copyright (C) 2010 Francisco Jerez.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial
|
||||
* portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
* IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <subdev/fb.h>
|
||||
|
||||
struct nv36_fb_priv {
|
||||
struct nouveau_fb base;
|
||||
};
|
||||
|
||||
static void
|
||||
nv36_fb_tile_comp(struct nouveau_fb *pfb, int i, u32 size, u32 flags,
|
||||
struct nouveau_fb_tile *tile)
|
||||
{
|
||||
u32 tiles = DIV_ROUND_UP(size, 0x40);
|
||||
u32 tags = round_up(tiles / pfb->ram.parts, 0x40);
|
||||
if (!nouveau_mm_head(&pfb->tags, 1, tags, tags, 1, &tile->tag)) {
|
||||
if (flags & 2) tile->zcomp |= 0x10000000; /* Z16 */
|
||||
else tile->zcomp |= 0x20000000; /* Z24S8 */
|
||||
tile->zcomp |= ((tile->tag->offset ) >> 6);
|
||||
tile->zcomp |= ((tile->tag->offset + tags - 1) >> 6) << 14;
|
||||
#ifdef __BIG_ENDIAN
|
||||
tile->zcomp |= 0x80000000;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
nv36_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
|
||||
struct nouveau_oclass *oclass, void *data, u32 size,
|
||||
struct nouveau_object **pobject)
|
||||
{
|
||||
struct nv36_fb_priv *priv;
|
||||
int ret;
|
||||
|
||||
ret = nouveau_fb_create(parent, engine, oclass, &priv);
|
||||
*pobject = nv_object(priv);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
priv->base.memtype_valid = nv04_fb_memtype_valid;
|
||||
priv->base.ram.init = nv20_fb_vram_init;
|
||||
priv->base.tile.regions = 8;
|
||||
priv->base.tile.init = nv30_fb_tile_init;
|
||||
priv->base.tile.comp = nv36_fb_tile_comp;
|
||||
priv->base.tile.fini = nv20_fb_tile_fini;
|
||||
priv->base.tile.prog = nv20_fb_tile_prog;
|
||||
return nouveau_fb_preinit(&priv->base);
|
||||
}
|
||||
|
||||
struct nouveau_oclass
|
||||
nv36_fb_oclass = {
|
||||
.handle = NV_SUBDEV(FB, 0x36),
|
||||
.ofuncs = &(struct nouveau_ofuncs) {
|
||||
.ctor = nv36_fb_ctor,
|
||||
.dtor = _nouveau_fb_dtor,
|
||||
.init = nv30_fb_init,
|
||||
.fini = _nouveau_fb_fini,
|
||||
},
|
||||
};
|
Loading…
Reference in New Issue
Block a user