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

Commit 3e55b53b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/pci/g84: split implementation from nv50 



An upcoming patch will implement functionality that we don't use on the
original NV50.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ int nv04_pci_new(struct nvkm_device *, int, struct nvkm_pci **); 
int nv40_pci_new(struct nvkm_device *, int, struct nvkm_pci **);

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

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

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

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

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -929,7 +929,7 @@ nv84_chipset = { 
	.mc = nv50_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv50_pci_new,

	.pci = g84_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -961,7 +961,7 @@ nv86_chipset = { 
	.mc = nv50_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv50_pci_new,

	.pci = g84_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,
@@ -993,7 +993,7 @@ nv92_chipset = { 
	.mc = nv50_mc_new,

	.mmu = nv50_mmu_new,

	.mxm = nv50_mxm_new,

	.pci = nv50_pci_new,

	.pci = g84_pci_new,

	.therm = g84_therm_new,

	.timer = nv41_timer_new,

	.volt = nv40_volt_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ nvkm-y += nvkm/subdev/pci/nv04.o 
nvkm-y += nvkm/subdev/pci/nv40.o

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

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

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

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

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

0 → 100644
+40 −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"



#include <core/pci.h>



static const struct nvkm_pci_func

g84_pci_func = {

	.rd32 = nv40_pci_rd32,

	.wr08 = nv40_pci_wr08,

	.wr32 = nv40_pci_wr32,

	.msi_rearm = nv50_pci_msi_rearm,

};



int

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

{

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

}

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

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 


#include <core/pci.h>



/* MSI re-arm through the PRI appears to be broken on the original G80,

/* MSI re-arm through the PRI appears to be broken on NV50/G84/G86/G92,

 * so we access it via alternate PCI config space mechanisms.

 */

static void

void

nv50_pci_msi_rearm(struct nvkm_pci *pci)

{

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