-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/nv20/fb: split implementation into nv20/nv25 pieces
There's more stuff that can be shared in the constructor, will be merged together again later. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
- Loading branch information
Ben Skeggs
committed
Nov 28, 2012
1 parent
67e9e9f
commit a8749af
Showing
5 changed files
with
120 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| /* | ||
| * 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 nv25_fb_priv { | ||
| struct nouveau_fb base; | ||
| }; | ||
|
|
||
| static void | ||
| nv25_fb_tile_comp(struct nouveau_fb *pfb, int i, u32 size, u32 flags, | ||
| struct nouveau_fb_tile *tile) | ||
| { | ||
| int bpp = (flags & 2) ? 32 : 16; | ||
|
|
||
| /* Allocate some of the on-die tag memory, used to store Z | ||
| * compression meta-data (most likely just a bitmap determining | ||
| * if a given tile is compressed or not). | ||
| */ | ||
| size /= 256; | ||
|
|
||
| if (!nouveau_mm_head(&pfb->tags, 1, size, size, 1, &tile->tag)) { | ||
| /* Enable Z compression */ | ||
| tile->zcomp = tile->tag->offset; | ||
| if (bpp == 16) | ||
| tile->zcomp |= 0x00100000; | ||
| else | ||
| tile->zcomp |= 0x00200000; | ||
| } | ||
| } | ||
|
|
||
| static int | ||
| nv25_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine, | ||
| struct nouveau_oclass *oclass, void *data, u32 size, | ||
| struct nouveau_object **pobject) | ||
| { | ||
| struct nouveau_device *device = nv_device(parent); | ||
| struct nv25_fb_priv *priv; | ||
| u32 pbus1218; | ||
| int ret; | ||
|
|
||
| ret = nouveau_fb_create(parent, engine, oclass, &priv); | ||
| *pobject = nv_object(priv); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| pbus1218 = nv_rd32(priv, 0x001218); | ||
| switch (pbus1218 & 0x00000300) { | ||
| case 0x00000000: priv->base.ram.type = NV_MEM_TYPE_SDRAM; break; | ||
| case 0x00000100: priv->base.ram.type = NV_MEM_TYPE_DDR1; break; | ||
| case 0x00000200: priv->base.ram.type = NV_MEM_TYPE_GDDR3; break; | ||
| case 0x00000300: priv->base.ram.type = NV_MEM_TYPE_GDDR2; break; | ||
| } | ||
| priv->base.ram.size = nv_rd32(priv, 0x10020c) & 0xff000000; | ||
|
|
||
| if (device->chipset >= 0x25) | ||
| ret = nouveau_mm_init(&priv->base.tags, 0, 64 * 1024, 1); | ||
| else | ||
| ret = nouveau_mm_init(&priv->base.tags, 0, 32 * 1024, 1); | ||
| if (ret) | ||
| return ret; | ||
|
|
||
| priv->base.memtype_valid = nv04_fb_memtype_valid; | ||
| priv->base.tile.regions = 8; | ||
| priv->base.tile.init = nv20_fb_tile_init; | ||
| priv->base.tile.comp = nv25_fb_tile_comp; | ||
| priv->base.tile.fini = nv20_fb_tile_fini; | ||
| priv->base.tile.prog = nv20_fb_tile_prog; | ||
| return nouveau_fb_created(&priv->base); | ||
| } | ||
|
|
||
| struct nouveau_oclass | ||
| nv25_fb_oclass = { | ||
| .handle = NV_SUBDEV(FB, 0x25), | ||
| .ofuncs = &(struct nouveau_ofuncs) { | ||
| .ctor = nv25_fb_ctor, | ||
| .dtor = _nouveau_fb_dtor, | ||
| .init = _nouveau_fb_init, | ||
| .fini = _nouveau_fb_fini, | ||
| }, | ||
| }; |