Commit 7d2813c4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ltc/gm204: split implementation from gm107 



Differences from GM10x:
- GM20x LTC count detection differs from GM10x
- GM20x init doesn't require large page size setting

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

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

+1 −0
Original line number Diff line number Diff line
@@ -37,4 +37,5 @@ int gf100_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **); 
int gk104_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);

int gk20a_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);

int gm107_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);

int gm204_ltc_new(struct nvkm_device *, int, struct nvkm_ltc **);

#endif

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

+3 −3
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ nv124_chipset = { 
	.i2c = gm204_i2c_new,

	.ibus = gm204_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.ltc = gm204_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,
@@ -2006,7 +2006,7 @@ nv126_chipset = { 
	.i2c = gm204_i2c_new,

	.ibus = gm204_ibus_new,

	.imem = nv50_instmem_new,

	.ltc = gm107_ltc_new,

	.ltc = gm204_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.mxm = nv50_mxm_new,
@@ -2033,7 +2033,7 @@ nv12b_chipset = { 
	.fuse = gm107_fuse_new,

	.ibus = gk20a_ibus_new,

	.imem = gk20a_instmem_new,

	.ltc = gm107_ltc_new,

	.ltc = gm204_ltc_new,

	.mc = gk20a_mc_new,

	.mmu = gf100_mmu_new,

	.timer = gk20a_timer_new,

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

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

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

nvkm-y += nvkm/subdev/ltc/gm107.o

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

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c

+5 −5
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <subdev/fb.h>

#include <subdev/timer.h>



static void

void

gm107_ltc_cbc_clear(struct nvkm_ltc *ltc, u32 start, u32 limit)

{

	struct nvkm_device *device = ltc->subdev.device;
@@ -35,7 +35,7 @@ gm107_ltc_cbc_clear(struct nvkm_ltc *ltc, u32 start, u32 limit) 
	nvkm_mask(device, 0x17e26c, 0x00000000, 0x00000004);

}



static void

void

gm107_ltc_cbc_wait(struct nvkm_ltc *ltc)

{

	struct nvkm_device *device = ltc->subdev.device;
@@ -51,7 +51,7 @@ gm107_ltc_cbc_wait(struct nvkm_ltc *ltc) 
	}

}



static void

void

gm107_ltc_zbc_clear_color(struct nvkm_ltc *ltc, int i, const u32 color[4])

{

	struct nvkm_device *device = ltc->subdev.device;
@@ -62,7 +62,7 @@ gm107_ltc_zbc_clear_color(struct nvkm_ltc *ltc, int i, const u32 color[4]) 
	nvkm_wr32(device, 0x17e348, color[3]);

}



static void

void

gm107_ltc_zbc_clear_depth(struct nvkm_ltc *ltc, int i, const u32 depth)

{

	struct nvkm_device *device = ltc->subdev.device;
@@ -84,7 +84,7 @@ gm107_ltc_lts_isr(struct nvkm_ltc *ltc, int c, int s) 
	}

}



static void

void

gm107_ltc_intr(struct nvkm_ltc *ltc)

{

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

drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm204.c

0 → 100644
+63 −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 <subdev/fb.h>

#include <subdev/timer.h>



static int

gm204_ltc_oneinit(struct nvkm_ltc *ltc)

{

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



	ltc->ltc_nr = nvkm_rd32(device, 0x12006c);

	ltc->lts_nr = nvkm_rd32(device, 0x17e280) >> 28;



	return gf100_ltc_oneinit_tag_ram(ltc);

}

static void

gm204_ltc_init(struct nvkm_ltc *ltc)

{

	nvkm_wr32(ltc->subdev.device, 0x17e278, ltc->tag_base);

}



static const struct nvkm_ltc_func

gm204_ltc = {

	.oneinit = gm204_ltc_oneinit,

	.init = gm204_ltc_init,

	.intr = gm107_ltc_intr, /*XXX: not validated */

	.cbc_clear = gm107_ltc_cbc_clear,

	.cbc_wait = gm107_ltc_cbc_wait,

	.zbc = 16,

	.zbc_clear_color = gm107_ltc_zbc_clear_color,

	.zbc_clear_depth = gm107_ltc_zbc_clear_depth,

	.invalidate = gf100_ltc_invalidate,

	.flush = gf100_ltc_flush,

};



int

gm204_ltc_new(struct nvkm_device *device, int index, struct nvkm_ltc **pltc)

{

	return nvkm_ltc_new_(&gm204_ltc, device, index, pltc);

}