Commit 45aa4d07 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pci/gp100: initial support 



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

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int g94_pci_new(struct nvkm_device *, int, struct nvkm_pci **); 
int gf100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gf106_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gk104_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

int gp100_pci_new(struct nvkm_device *, int, struct nvkm_pci **);



/* pcie functions */

int nvkm_pcie_set_link(struct nvkm_pci *, enum nvkm_pcie_speed, u8 width);

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+1 −0
Original line number Diff line number Diff line
@@ -2152,6 +2152,7 @@ static const struct nvkm_device_chip 
nv130_chipset = {

	.name = "GP100",

	.mc = gp100_mc_new,

	.pci = gp100_pci_new,

	.top = gk104_top_new,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ nvkm-y += nvkm/subdev/pci/g94.o 
nvkm-y += nvkm/subdev/pci/gf100.o

nvkm-y += nvkm/subdev/pci/gf106.o

nvkm-y += nvkm/subdev/pci/gk104.o

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

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

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

 * Copyright 2015 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 <bskeggs@redhat.com>

 */

#include "priv.h"



static void

gp100_pci_msi_rearm(struct nvkm_pci *pci)

{

	nvkm_pci_wr32(pci, 0x0704, 0x00000000);

}



static const struct nvkm_pci_func

gp100_pci_func = {

	.rd32 = nv40_pci_rd32,

	.wr08 = nv40_pci_wr08,

	.wr32 = nv40_pci_wr32,

	.msi_rearm = gp100_pci_msi_rearm,

};



int

gp100_pci_new(struct nvkm_device *device, int index, struct nvkm_pci **ppci)

{

	return nvkm_pci_new_(&gp100_pci_func, device, index, ppci);

}