Commit acbe9ecf authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/disp: merge head/outp/ior code into chipset files 



No changes to code at all here, just shuffling it around and removing
a bunch of (now unnecessary) forward-declarations from headers.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 168c0299

drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct nvkm_disp { 
	struct nvkm_gpuobj *inst;

	struct nvkm_ramht *ramht;



	struct nv50_disp_chan *chan[81];

	struct nvkm_disp_chan *chan[81];



	struct {

		spinlock_t lock;

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+9 −90
Original line number Diff line number Diff line 
# SPDX-License-Identifier: MIT

nvkm-y += nvkm/engine/disp/base.o

nvkm-y += nvkm/engine/disp/chan.o

nvkm-y += nvkm/engine/disp/conn.o

nvkm-y += nvkm/engine/disp/dp.o

nvkm-y += nvkm/engine/disp/hdmi.o

nvkm-y += nvkm/engine/disp/head.o

nvkm-y += nvkm/engine/disp/ior.o

nvkm-y += nvkm/engine/disp/outp.o

nvkm-y += nvkm/engine/disp/vga.o



nvkm-y += nvkm/engine/disp/nv04.o

nvkm-y += nvkm/engine/disp/nv50.o

nvkm-y += nvkm/engine/disp/g84.o
@@ -18,98 +27,8 @@ nvkm-y += nvkm/engine/disp/gp102.o 
nvkm-y += nvkm/engine/disp/gv100.o

nvkm-y += nvkm/engine/disp/tu102.o

nvkm-y += nvkm/engine/disp/ga102.o

nvkm-y += nvkm/engine/disp/vga.o



nvkm-y += nvkm/engine/disp/head.o

nvkm-y += nvkm/engine/disp/headnv04.o

nvkm-y += nvkm/engine/disp/headnv50.o

nvkm-y += nvkm/engine/disp/headgf119.o

nvkm-y += nvkm/engine/disp/headgv100.o



nvkm-y += nvkm/engine/disp/ior.o

nvkm-y += nvkm/engine/disp/dacnv50.o

nvkm-y += nvkm/engine/disp/dacgf119.o

nvkm-y += nvkm/engine/disp/piornv50.o

nvkm-y += nvkm/engine/disp/sornv50.o

nvkm-y += nvkm/engine/disp/sorg84.o

nvkm-y += nvkm/engine/disp/sorg94.o

nvkm-y += nvkm/engine/disp/sormcp77.o

nvkm-y += nvkm/engine/disp/sorgt215.o

nvkm-y += nvkm/engine/disp/sormcp89.o

nvkm-y += nvkm/engine/disp/sorgf119.o

nvkm-y += nvkm/engine/disp/sorgk104.o

nvkm-y += nvkm/engine/disp/sorgm107.o

nvkm-y += nvkm/engine/disp/sorgm200.o

nvkm-y += nvkm/engine/disp/sorgp100.o

nvkm-y += nvkm/engine/disp/sorgv100.o

nvkm-y += nvkm/engine/disp/sortu102.o

nvkm-y += nvkm/engine/disp/sorga102.o



nvkm-y += nvkm/engine/disp/outp.o

nvkm-y += nvkm/engine/disp/dp.o



nvkm-y += nvkm/engine/disp/hdagt215.o

nvkm-y += nvkm/engine/disp/hdagf119.o

nvkm-y += nvkm/engine/disp/hdagv100.o



nvkm-y += nvkm/engine/disp/hdmi.o

nvkm-y += nvkm/engine/disp/hdmig84.o

nvkm-y += nvkm/engine/disp/hdmigt215.o

nvkm-y += nvkm/engine/disp/hdmigf119.o

nvkm-y += nvkm/engine/disp/hdmigk104.o

nvkm-y += nvkm/engine/disp/hdmigm200.o

nvkm-y += nvkm/engine/disp/hdmigv100.o



nvkm-y += nvkm/engine/disp/conn.o



nvkm-y += nvkm/engine/disp/rootnv04.o

nvkm-y += nvkm/engine/disp/rootnv50.o



nvkm-y += nvkm/engine/disp/capsgv100.o



nvkm-y += nvkm/engine/disp/channv50.o

nvkm-y += nvkm/engine/disp/changf119.o

nvkm-y += nvkm/engine/disp/changv100.o



nvkm-y += nvkm/engine/disp/dmacnv50.o

nvkm-y += nvkm/engine/disp/dmacgf119.o

nvkm-y += nvkm/engine/disp/dmacgp102.o

nvkm-y += nvkm/engine/disp/dmacgv100.o



nvkm-y += nvkm/engine/disp/basenv50.o

nvkm-y += nvkm/engine/disp/baseg84.o

nvkm-y += nvkm/engine/disp/basegf119.o

nvkm-y += nvkm/engine/disp/basegp102.o



nvkm-y += nvkm/engine/disp/corenv50.o

nvkm-y += nvkm/engine/disp/coreg84.o

nvkm-y += nvkm/engine/disp/coreg94.o

nvkm-y += nvkm/engine/disp/coregf119.o

nvkm-y += nvkm/engine/disp/coregk104.o

nvkm-y += nvkm/engine/disp/coregp102.o

nvkm-y += nvkm/engine/disp/coregv100.o



nvkm-y += nvkm/engine/disp/ovlynv50.o

nvkm-y += nvkm/engine/disp/ovlyg84.o

nvkm-y += nvkm/engine/disp/ovlygt200.o

nvkm-y += nvkm/engine/disp/ovlygf119.o

nvkm-y += nvkm/engine/disp/ovlygk104.o

nvkm-y += nvkm/engine/disp/ovlygp102.o



nvkm-y += nvkm/engine/disp/wimmgv100.o



nvkm-y += nvkm/engine/disp/wndwgv100.o



nvkm-y += nvkm/engine/disp/piocnv50.o

nvkm-y += nvkm/engine/disp/piocgf119.o



nvkm-y += nvkm/engine/disp/cursnv50.o

nvkm-y += nvkm/engine/disp/cursgf119.o

nvkm-y += nvkm/engine/disp/cursgp102.o

nvkm-y += nvkm/engine/disp/cursgv100.o



nvkm-y += nvkm/engine/disp/oimmnv50.o

nvkm-y += nvkm/engine/disp/oimmgf119.o

nvkm-y += nvkm/engine/disp/oimmgp102.o



nvkm-y += nvkm/engine/disp/udisp.o

drivers/gpu/drm/nouveau/nvkm/engine/disp/baseg84.c

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
/*

 * Copyright 2012 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

 */

#include "channv50.h"



static const struct nv50_disp_mthd_list

g84_disp_base_mthd_base = {

	.mthd = 0x0000,

	.addr = 0x000000,

	.data = {

		{ 0x0080, 0x000000 },

		{ 0x0084, 0x0008c4 },

		{ 0x0088, 0x0008d0 },

		{ 0x008c, 0x0008dc },

		{ 0x0090, 0x0008e4 },

		{ 0x0094, 0x610884 },

		{ 0x00a0, 0x6108a0 },

		{ 0x00a4, 0x610878 },

		{ 0x00c0, 0x61086c },

		{ 0x00c4, 0x610800 },

		{ 0x00c8, 0x61080c },

		{ 0x00cc, 0x610818 },

		{ 0x00e0, 0x610858 },

		{ 0x00e4, 0x610860 },

		{ 0x00e8, 0x6108ac },

		{ 0x00ec, 0x6108b4 },

		{ 0x00fc, 0x610824 },

		{ 0x0100, 0x610894 },

		{ 0x0104, 0x61082c },

		{ 0x0110, 0x6108bc },

		{ 0x0114, 0x61088c },

		{}

	}

};



static const struct nv50_disp_chan_mthd

g84_disp_base_mthd = {

	.name = "Base",

	.addr = 0x000540,

	.prev = 0x000004,

	.data = {

		{ "Global", 1, &g84_disp_base_mthd_base },

		{  "Image", 2, &nv50_disp_base_mthd_image },

		{}

	}

};



int

g84_disp_base_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,

		  struct nvkm_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_base_new_(&nv50_disp_dmac_func, &g84_disp_base_mthd,

				   disp, 1, oclass, argv, argc, pobject);

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/basegf119.c

deleted100644 → 0
+0 −108
Original line number Diff line number Diff line 
/*

 * Copyright 2012 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

 */

#include "channv50.h"



static const struct nv50_disp_mthd_list

gf119_disp_base_mthd_base = {

	.mthd = 0x0000,

	.addr = 0x000000,

	.data = {

		{ 0x0080, 0x661080 },

		{ 0x0084, 0x661084 },

		{ 0x0088, 0x661088 },

		{ 0x008c, 0x66108c },

		{ 0x0090, 0x661090 },

		{ 0x0094, 0x661094 },

		{ 0x00a0, 0x6610a0 },

		{ 0x00a4, 0x6610a4 },

		{ 0x00c0, 0x6610c0 },

		{ 0x00c4, 0x6610c4 },

		{ 0x00c8, 0x6610c8 },

		{ 0x00cc, 0x6610cc },

		{ 0x00e0, 0x6610e0 },

		{ 0x00e4, 0x6610e4 },

		{ 0x00e8, 0x6610e8 },

		{ 0x00ec, 0x6610ec },

		{ 0x00fc, 0x6610fc },

		{ 0x0100, 0x661100 },

		{ 0x0104, 0x661104 },

		{ 0x0108, 0x661108 },

		{ 0x010c, 0x66110c },

		{ 0x0110, 0x661110 },

		{ 0x0114, 0x661114 },

		{ 0x0118, 0x661118 },

		{ 0x011c, 0x66111c },

		{ 0x0130, 0x661130 },

		{ 0x0134, 0x661134 },

		{ 0x0138, 0x661138 },

		{ 0x013c, 0x66113c },

		{ 0x0140, 0x661140 },

		{ 0x0144, 0x661144 },

		{ 0x0148, 0x661148 },

		{ 0x014c, 0x66114c },

		{ 0x0150, 0x661150 },

		{ 0x0154, 0x661154 },

		{ 0x0158, 0x661158 },

		{ 0x015c, 0x66115c },

		{ 0x0160, 0x661160 },

		{ 0x0164, 0x661164 },

		{ 0x0168, 0x661168 },

		{ 0x016c, 0x66116c },

		{}

	}

};



static const struct nv50_disp_mthd_list

gf119_disp_base_mthd_image = {

	.mthd = 0x0020,

	.addr = 0x000020,

	.data = {

		{ 0x0400, 0x661400 },

		{ 0x0404, 0x661404 },

		{ 0x0408, 0x661408 },

		{ 0x040c, 0x66140c },

		{ 0x0410, 0x661410 },

		{}

	}

};



const struct nv50_disp_chan_mthd

gf119_disp_base_mthd = {

	.name = "Base",

	.addr = 0x001000,

	.prev = -0x020000,

	.data = {

		{ "Global", 1, &gf119_disp_base_mthd_base },

		{  "Image", 2, &gf119_disp_base_mthd_image },

		{}

	}

};



int

gf119_disp_base_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,

		    struct nvkm_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_base_new_(&gf119_disp_dmac_func, &gf119_disp_base_mthd,

				   disp, 1, oclass, argv, argc, pobject);

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/basegp102.c

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright 2016 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 "channv50.h"



int

gp102_disp_base_new(const struct nvkm_oclass *oclass, void *argv, u32 argc,

		    struct nvkm_disp *disp, struct nvkm_object **pobject)

{

	return nv50_disp_base_new_(&gp102_disp_dmac_func, &gf119_disp_base_mthd,

				   disp, 1, oclass, argv, argc, pobject);

}