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

Commit 4bf23ead authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/gm107/devinit: initial implementation 



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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ nouveau-y += core/subdev/devinit/nv98.o 
nouveau-y += core/subdev/devinit/nva3.o

nouveau-y += core/subdev/devinit/nvaf.o

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

nouveau-y += core/subdev/devinit/gm107.o

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

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

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

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

+1 −0
Original line number Diff line number Diff line
@@ -28,5 +28,6 @@ extern struct nouveau_oclass *nv98_devinit_oclass; 
extern struct nouveau_oclass *nva3_devinit_oclass;

extern struct nouveau_oclass *nvaf_devinit_oclass;

extern struct nouveau_oclass *nvc0_devinit_oclass;

extern struct nouveau_oclass *gm107_devinit_oclass;



#endif

drivers/gpu/drm/nouveau/core/subdev/devinit/gm107.c

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

 * Copyright 2013 Red Hat Inc.

 *

 * 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 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 HOLDER(S) OR AUTHOR(S) 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.

 *

 * Authors: Ben Skeggs

 */



#include "nv50.h"



static u64

gm107_devinit_disable(struct nouveau_devinit *devinit)

{

	struct nv50_devinit_priv *priv = (void *)devinit;

	u32 r021c00 = nv_rd32(priv, 0x021c00);

	u32 r021c04 = nv_rd32(priv, 0x021c04);

	u64 disable = 0ULL;



	if (r021c00 & 0x00000001)

		disable |= (1ULL << NVDEV_ENGINE_COPY0);

	if (r021c00 & 0x00000004)

		disable |= (1ULL << NVDEV_ENGINE_COPY2);

	if (r021c04 & 0x00000001)

		disable |= (1ULL << NVDEV_ENGINE_DISP);



	return disable;

}



struct nouveau_oclass *

gm107_devinit_oclass = &(struct nouveau_devinit_impl) {

	.base.handle = NV_SUBDEV(DEVINIT, 0x07),

	.base.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nv50_devinit_ctor,

		.dtor = _nouveau_devinit_dtor,

		.init = nv50_devinit_init,

		.fini = _nouveau_devinit_fini,

	},

	.pll_set = nvc0_devinit_pll_set,

	.disable = gm107_devinit_disable,

}.base;

drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.h

+2 −0
Original line number Diff line number Diff line
@@ -15,4 +15,6 @@ int nv50_devinit_pll_set(struct nouveau_devinit *, u32, u32); 


int  nva3_devinit_pll_set(struct nouveau_devinit *, u32, u32);



int  nvc0_devinit_pll_set(struct nouveau_devinit *, u32, u32);



#endif

drivers/gpu/drm/nouveau/core/subdev/devinit/nvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include "nv50.h"



static int

int

nvc0_devinit_pll_set(struct nouveau_devinit *devinit, u32 type, u32 freq)

{

	struct nv50_devinit_priv *priv = (void *)devinit;