Commit b9a995de authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/mc: add GP10B support 



GP10B's MC is compatible with GP100's, but engines need to be explicitly
put out of ELPG during init.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent fdde00ed

drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h

+1 −0
Original line number Diff line number Diff line
@@ -29,4 +29,5 @@ int gf100_mc_new(struct nvkm_device *, int, struct nvkm_mc **); 
int gk104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gk20a_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gp100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gp10b_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

#endif

drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ nvkm-y += nvkm/subdev/mc/gf100.o 
nvkm-y += nvkm/subdev/mc/gk104.o

nvkm-y += nvkm/subdev/mc/gk20a.o

nvkm-y += nvkm/subdev/mc/gp100.o

nvkm-y += nvkm/subdev/mc/gp10b.o

drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c

+12 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ gp100_mc_intr_update(struct gp100_mc *mc) 
	}

}



static void

void

gp100_mc_intr_unarm(struct nvkm_mc *base)

{

	struct gp100_mc *mc = gp100_mc(base);
@@ -53,7 +53,7 @@ gp100_mc_intr_unarm(struct nvkm_mc *base) 
	spin_unlock_irqrestore(&mc->lock, flags);

}



static void

void

gp100_mc_intr_rearm(struct nvkm_mc *base)

{

	struct gp100_mc *mc = gp100_mc(base);
@@ -64,7 +64,7 @@ gp100_mc_intr_rearm(struct nvkm_mc *base) 
	spin_unlock_irqrestore(&mc->lock, flags);

}



static void

void

gp100_mc_intr_mask(struct nvkm_mc *base, u32 mask, u32 intr)

{

	struct gp100_mc *mc = gp100_mc(base);
@@ -87,13 +87,14 @@ gp100_mc = { 
};



int

gp100_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)

gp100_mc_new_(const struct nvkm_mc_func *func, struct nvkm_device *device,

	      int index, struct nvkm_mc **pmc)

{

	struct gp100_mc *mc;



	if (!(mc = kzalloc(sizeof(*mc), GFP_KERNEL)))

		return -ENOMEM;

	nvkm_mc_ctor(&gp100_mc, device, index, &mc->base);

	nvkm_mc_ctor(func, device, index, &mc->base);

	*pmc = &mc->base;



	spin_lock_init(&mc->lock);
@@ -101,3 +102,9 @@ gp100_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc) 
	mc->mask = 0x7fffffff;

	return 0;

}



int

gp100_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)

{

	return gp100_mc_new_(&gp100_mc, device, index, pmc);

}

drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c

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

 * Copyright (c) 2017, NVIDIA CORPORATION. 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 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.

 *

 */



#include "priv.h"



void

gp10b_mc_init(struct nvkm_mc *mc)

{

	struct nvkm_device *device = mc->subdev.device;

	nvkm_wr32(device, 0x000200, 0xffffffff); /* everything on */

	nvkm_wr32(device, 0x00020c, 0xffffffff); /* everything out of ELPG */

}



static const struct nvkm_mc_func

gp10b_mc = {

	.init = gp10b_mc_init,

	.intr = gk104_mc_intr,

	.intr_unarm = gp100_mc_intr_unarm,

	.intr_rearm = gp100_mc_intr_rearm,

	.intr_mask = gp100_mc_intr_mask,

	.intr_stat = gf100_mc_intr_stat,

	.reset = gk104_mc_reset,

};



int

gp10b_mc_new(struct nvkm_device *device, int index, struct nvkm_mc **pmc)

{

	return gp100_mc_new_(&gp10b_mc, device, index, pmc);

}

drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h

+6 −0
Original line number Diff line number Diff line
@@ -41,12 +41,18 @@ extern const struct nvkm_mc_map nv17_mc_reset[]; 
void nv44_mc_init(struct nvkm_mc *);



void nv50_mc_init(struct nvkm_mc *);

void gk104_mc_init(struct nvkm_mc *);



void gf100_mc_intr_unarm(struct nvkm_mc *);

void gf100_mc_intr_rearm(struct nvkm_mc *);

void gf100_mc_intr_mask(struct nvkm_mc *, u32, u32);

u32 gf100_mc_intr_stat(struct nvkm_mc *);

void gf100_mc_unk260(struct nvkm_mc *, u32);

void gp100_mc_intr_unarm(struct nvkm_mc *);

void gp100_mc_intr_rearm(struct nvkm_mc *);

void gp100_mc_intr_mask(struct nvkm_mc *, u32, u32);

int gp100_mc_new_(const struct nvkm_mc_func *, struct nvkm_device *, int,

		  struct nvkm_mc **);



extern const struct nvkm_mc_map gk104_mc_intr[];

extern const struct nvkm_mc_map gk104_mc_reset[];