Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11bac407 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv30/fb: split implementation into nv34(nv10)/nv30/nv35 pieces 



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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ nouveau-y += core/subdev/fb/nv10.o 
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/nv40.o

nouveau-y += core/subdev/fb/nv50.o

nouveau-y += core/subdev/fb/nvc0.o

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

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ extern struct nouveau_oclass nv10_fb_oclass; 
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 nv40_fb_oclass;

extern struct nouveau_oclass nv50_fb_oclass;

extern struct nouveau_oclass nvc0_fb_oclass;
@@ -132,6 +133,7 @@ void nv20_fb_tile_init(struct nouveau_fb *, int i, u32 addr, u32 size, 
void nv20_fb_tile_fini(struct nouveau_fb *, int i, struct nouveau_fb_tile *);

void nv20_fb_tile_prog(struct nouveau_fb *, int, struct nouveau_fb_tile *);



int  nv30_fb_init(struct nouveau_object *);

void nv30_fb_tile_init(struct nouveau_fb *, int i, u32 addr, u32 size,

		       u32 pitch, u32 flags, struct nouveau_fb_tile *);

void nv30_fb_tile_fini(struct nouveau_fb *, int i, struct nouveau_fb_tile *);

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

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,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     ] = &nv30_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] = &nv35_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;
@@ -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     ] = &nv30_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] = &nv35_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;
@@ -128,7 +128,7 @@ nv30_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_DEVINIT] = &nv10_devinit_oclass;

		device->oclass[NVDEV_SUBDEV_MC     ] = &nv04_mc_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &nv04_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] = &nv30_fb_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] = &nv10_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;

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ calc_ref(struct nv30_fb_priv *priv, int l, int k, int i) 
	return x;

}



static int

int

nv30_fb_init(struct nouveau_object *object)

{

	struct nouveau_device *device = nv_device(object);

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

0 → 100644
+73 −0
Original line number Diff line number Diff line 
/*

 * 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 nv35_fb_priv {

	struct nouveau_fb base;

};



static int

nv35_fb_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

	     struct nouveau_oclass *oclass, void *data, u32 size,

	     struct nouveau_object **pobject)

{

	struct nv35_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;



	priv->base.memtype_valid = nv04_fb_memtype_valid;

	priv->base.tile.regions = 8;

	priv->base.tile.init = nv30_fb_tile_init;

	priv->base.tile.fini = nv30_fb_tile_fini;

	priv->base.tile.prog = nv10_fb_tile_prog;

	return nouveau_fb_created(&priv->base);

}



struct nouveau_oclass

nv35_fb_oclass = {

	.handle = NV_SUBDEV(FB, 0x35),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv35_fb_ctor,

		.dtor = _nouveau_fb_dtor,

		.init = nv30_fb_init,

		.fini = _nouveau_fb_fini,

	},

};