Commit e3d26d08 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ibus/gm204: split implementation from gk104 



GM20x doesn't require the priv ring timeout bumps that GK/GM10x have.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -6,4 +6,5 @@ int gf100_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **); 
int gf117_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);

int gk104_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);

int gk20a_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);

int gm204_ibus_new(struct nvkm_device *, int, struct nvkm_subdev **);

#endif

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

+2 −2
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ nv124_chipset = { 
	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gm204_i2c_new,

	.ibus = gk104_ibus_new,

	.ibus = gm204_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.mc = gk20a_mc_new,
@@ -2004,7 +2004,7 @@ nv126_chipset = { 
	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gm204_i2c_new,

	.ibus = gk104_ibus_new,

	.ibus = gm204_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.mc = gk20a_mc_new,

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

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ nvkm-y += nvkm/subdev/ibus/gf100.o 
nvkm-y += nvkm/subdev/ibus/gf117.o

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

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

nvkm-y += nvkm/subdev/ibus/gm204.o

drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *

 * Authors: Ben Skeggs

 */

#include <subdev/ibus.h>

#include "priv.h"



static void

gk104_ibus_intr_hub(struct nvkm_subdev *ibus, int i)
@@ -56,7 +56,7 @@ gk104_ibus_intr_gpc(struct nvkm_subdev *ibus, int i) 
	nvkm_mask(device, 0x128128 + (i * 0x0800), 0x00000200, 0x00000000);

}



static void

void

gk104_ibus_intr(struct nvkm_subdev *ibus)

{

	struct nvkm_device *device = ibus->device;

drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gm204.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"



static const struct nvkm_subdev_func

gm204_ibus = {

	.intr = gk104_ibus_intr,

};



int

gm204_ibus_new(struct nvkm_device *device, int index,

	       struct nvkm_subdev **pibus)

{

	struct nvkm_subdev *ibus;

	if (!(ibus = *pibus = kzalloc(sizeof(*ibus), GFP_KERNEL)))

		return -ENOMEM;

	nvkm_subdev_ctor(&gm204_ibus, device, index, 0, ibus);

	return 0;

}