drm/nouveau/disp/nv50-: simplify definition of base channels (3ceeef9c) · Commits · jan.koester / Linux

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -73,11 +73,7 @@ nvkm-y += nvkm/engine/disp/dmacgp102.o

		nvkm-y += nvkm/engine/disp/basenv50.o
		nvkm-y += nvkm/engine/disp/baseg84.o
		nvkm-y += nvkm/engine/disp/basegt200.o
		nvkm-y += nvkm/engine/disp/basegt215.o
		nvkm-y += nvkm/engine/disp/basegf119.o
		nvkm-y += nvkm/engine/disp/basegk104.o
		nvkm-y += nvkm/engine/disp/basegk110.o
		nvkm-y += nvkm/engine/disp/basegp102.o

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

+9 −15

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@
		* Authors: Ben Skeggs
		*/
		#include "dmacnv50.h"
		#include "rootnv50.h"

		#include <nvif/class.h>

		static const struct nv50_disp_mthd_list
		g84_disp_base_mthd_base = {
		@@ -56,8 +53,8 @@ g84_disp_base_mthd_base = {
		}
		};

		const struct nv50_disp_chan_mthd
		g84_disp_base_chan_mthd = {
		static const struct nv50_disp_chan_mthd
		g84_disp_base_mthd = {
		.name = "Base",
		.addr = 0x000540,
		.prev = 0x000004,
		@@ -68,13 +65,10 @@ g84_disp_base_chan_mthd = {
		}
		};

		const struct nv50_disp_dmac_oclass
		g84_disp_base_oclass = {
		.base.oclass = G82_DISP_BASE_CHANNEL_DMA,
		.base.minver = 0,
		.base.maxver = 0,
		.ctor = nv50_disp_base_new,
		.func = &nv50_disp_dmac_func,
		.mthd = &g84_disp_base_chan_mthd,
		.chid = 1,
		};
		int
		g84_disp_base_new(const struct nvkm_oclass oclass, void argv, u32 argc,
		struct nv50_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);
		}

+8 −14

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@
		* Authors: Ben Skeggs
		*/
		#include "dmacnv50.h"
		#include "rootnv50.h"

		#include <nvif/class.h>

		static const struct nv50_disp_mthd_list
		gf119_disp_base_mthd_base = {
		@@ -91,7 +88,7 @@ gf119_disp_base_mthd_image = {
		};

		const struct nv50_disp_chan_mthd
		gf119_disp_base_chan_mthd = {
		gf119_disp_base_mthd = {
		.name = "Base",
		.addr = 0x001000,
		.prev = -0x020000,
		@@ -102,13 +99,10 @@ gf119_disp_base_chan_mthd = {
		}
		};

		const struct nv50_disp_dmac_oclass
		gf119_disp_base_oclass = {
		.base.oclass = GF110_DISP_BASE_CHANNEL_DMA,
		.base.minver = 0,
		.base.maxver = 0,
		.ctor = nv50_disp_base_new,
		.func = &gf119_disp_dmac_func,
		.mthd = &gf119_disp_base_chan_mthd,
		.chid = 1,
		};
		int
		gf119_disp_base_new(const struct nvkm_oclass oclass, void argv, u32 argc,
		struct nv50_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);
		}

deleted100644 → 0

+0 −38

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 "dmacnv50.h"
		#include "rootnv50.h"

		#include <nvif/class.h>

		const struct nv50_disp_dmac_oclass
		gk104_disp_base_oclass = {
		.base.oclass = GK104_DISP_BASE_CHANNEL_DMA,
		.base.minver = 0,
		.base.maxver = 0,
		.ctor = nv50_disp_base_new,
		.func = &gf119_disp_dmac_func,
		.mthd = &gf119_disp_base_chan_mthd,
		.chid = 1,
		};

deleted100644 → 0

+0 −38

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 "dmacnv50.h"
		#include "rootnv50.h"

		#include <nvif/class.h>

		const struct nv50_disp_dmac_oclass
		gk110_disp_base_oclass = {
		.base.oclass = GK110_DISP_BASE_CHANNEL_DMA,
		.base.minver = 0,
		.base.maxver = 0,
		.ctor = nv50_disp_base_new,
		.func = &gf119_disp_dmac_func,
		.mthd = &gf119_disp_base_chan_mthd,
		.chid = 1,
		};