drm/nve0/vp: implement initial support for engine (a7416d0d) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/gpu/drm/nouveau/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@ nouveau-y += core/engine/software/nv10.o
		nouveau-y += core/engine/software/nv50.o
		nouveau-y += core/engine/software/nvc0.o
		nouveau-y += core/engine/vp/nv84.o
		nouveau-y += core/engine/vp/nve0.o

		# drm/core
		nouveau-y += nouveau_drm.o nouveau_chan.o nouveau_dma.o nouveau_fence.o

drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,7 @@ nve0_fifo_context_attach(struct nouveau_object *parent,
		case NVDEV_ENGINE_COPY0:
		case NVDEV_ENGINE_COPY1: addr = 0x0210; break;
		case NVDEV_ENGINE_BSP : addr = 0x0270; break;
		case NVDEV_ENGINE_VP : addr = 0x0250; break;
		default:
		return -EINVAL;
		}
		@@ -174,6 +175,7 @@ nve0_fifo_context_detach(struct nouveau_object *parent, bool suspend,
		case NVDEV_ENGINE_COPY0:
		case NVDEV_ENGINE_COPY1: addr = 0x0210; break;
		case NVDEV_ENGINE_BSP : addr = 0x0270; break;
		case NVDEV_ENGINE_VP : addr = 0x0250; break;
		default:
		return -EINVAL;
		}

drivers/gpu/drm/nouveau/core/engine/vp/nve0.c

0 → 100644

+110 −0

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 <core/falcon.h>

		#include <engine/vp.h>

		struct nve0_vp_priv {
		struct nouveau_falcon base;
		};

		/*******************************************************************************
		* VP object classes
		******************************************************************************/

		static struct nouveau_oclass
		nve0_vp_sclass[] = {
		{ 0x95b2, &nouveau_object_ofuncs },
		{},
		};

		/*******************************************************************************
		* PVP context
		******************************************************************************/

		static struct nouveau_oclass
		nve0_vp_cclass = {
		.handle = NV_ENGCTX(VP, 0xe0),
		.ofuncs = &(struct nouveau_ofuncs) {
		.ctor = _nouveau_falcon_context_ctor,
		.dtor = _nouveau_falcon_context_dtor,
		.init = _nouveau_falcon_context_init,
		.fini = _nouveau_falcon_context_fini,
		.rd32 = _nouveau_falcon_context_rd32,
		.wr32 = _nouveau_falcon_context_wr32,
		},
		};

		/*******************************************************************************
		* PVP engine/subdev functions
		******************************************************************************/

		static int
		nve0_vp_init(struct nouveau_object *object)
		{
		struct nve0_vp_priv priv = (void )object;
		int ret;

		ret = nouveau_falcon_init(&priv->base);
		if (ret)
		return ret;

		nv_wr32(priv, 0x085010, 0x0000fff2);
		nv_wr32(priv, 0x08501c, 0x0000fff2);
		return 0;
		}

		static int
		nve0_vp_ctor(struct nouveau_object parent, struct nouveau_object engine,
		struct nouveau_oclass oclass, void data, u32 size,
		struct nouveau_object **pobject)
		{
		struct nve0_vp_priv *priv;
		int ret;

		ret = nouveau_falcon_create(parent, engine, oclass, 0x085000, true,
		"PVP", "vp", &priv);
		*pobject = nv_object(priv);
		if (ret)
		return ret;

		nv_subdev(priv)->unit = 0x00020000;
		nv_engine(priv)->cclass = &nve0_vp_cclass;
		nv_engine(priv)->sclass = nve0_vp_sclass;
		return 0;
		}

		struct nouveau_oclass
		nve0_vp_oclass = {
		.handle = NV_ENGINE(VP, 0xe0),
		.ofuncs = &(struct nouveau_ofuncs) {
		.ctor = nve0_vp_ctor,
		.dtor = _nouveau_falcon_dtor,
		.init = nve0_vp_init,
		.fini = _nouveau_falcon_fini,
		.rd32 = _nouveau_falcon_rd32,
		.wr32 = _nouveau_falcon_wr32,
		},
		};

drivers/gpu/drm/nouveau/core/include/engine/vp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,5 +41,6 @@ struct nouveau_vp {
		#define _nouveau_vp_fini _nouveau_engine_fini

		extern struct nouveau_oclass nv84_vp_oclass;
		extern struct nouveau_oclass nve0_vp_oclass;

		#endif

drivers/gpu/drm/nouveau/core/subdev/device/nve0.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#include <engine/disp.h>
		#include <engine/copy.h>
		#include <engine/bsp.h>
		#include <engine/vp.h>

		int
		nve0_identify(struct nouveau_device *device)
		@@ -76,6 +77,7 @@ nve0_identify(struct nouveau_device *device)
		device->oclass[NVDEV_ENGINE_COPY0 ] = &nve0_copy0_oclass;
		device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass;
		device->oclass[NVDEV_ENGINE_BSP ] = &nve0_bsp_oclass;
		device->oclass[NVDEV_ENGINE_VP ] = &nve0_vp_oclass;
		break;
		case 0xe7:
		device->cname = "GK107";
		@@ -102,6 +104,7 @@ nve0_identify(struct nouveau_device *device)
		device->oclass[NVDEV_ENGINE_COPY0 ] = &nve0_copy0_oclass;
		device->oclass[NVDEV_ENGINE_COPY1 ] = &nve0_copy1_oclass;
		device->oclass[NVDEV_ENGINE_BSP ] = &nve0_bsp_oclass;
		device->oclass[NVDEV_ENGINE_VP ] = &nve0_vp_oclass;
		break;
		default:
		nv_fatal(device, "unknown Kepler chipset\n");