Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 146cfe24 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/ce/gp104: initial support 



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

drivers/gpu/drm/nouveau/include/nvif/class.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ 
#define KEPLER_DMA_COPY_A                                            0x0000a0b5

#define MAXWELL_DMA_COPY_A                                           0x0000b0b5

#define PASCAL_DMA_COPY_A                                            0x0000c0b5

#define PASCAL_DMA_COPY_B                                            0x0000c1b5



#define FERMI_DECOMPRESS                                             0x000090b8

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

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **); 
int gm107_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

#endif

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −0
Original line number Diff line number Diff line
@@ -1104,6 +1104,8 @@ nouveau_bo_move_init(struct nouveau_drm *drm) 
			    struct ttm_mem_reg *, struct ttm_mem_reg *);

		int (*init)(struct nouveau_channel *, u32 handle);

	} _methods[] = {

		{  "COPY", 4, 0xc1b5, nve0_bo_move_copy, nve0_bo_move_init },

		{  "GRCE", 0, 0xc1b5, nve0_bo_move_copy, nvc0_bo_move_init },

		{  "COPY", 4, 0xc0b5, nve0_bo_move_copy, nve0_bo_move_init },

		{  "GRCE", 0, 0xc0b5, nve0_bo_move_copy, nvc0_bo_move_init },

		{  "COPY", 4, 0xb0b5, nve0_bo_move_copy, nve0_bo_move_init },

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

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ nvkm-y += nvkm/engine/ce/gk104.o 
nvkm-y += nvkm/engine/ce/gm107.o

nvkm-y += nvkm/engine/ce/gm200.o

nvkm-y += nvkm/engine/ce/gp100.o

nvkm-y += nvkm/engine/ce/gp104.o

drivers/gpu/drm/nouveau/nvkm/engine/ce/gp104.c

0 → 100644
+44 −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

 */

#include "priv.h"

#include <core/enum.h>



#include <nvif/class.h>



static const struct nvkm_engine_func

gp104_ce = {

	.intr = gp100_ce_intr,

	.sclass = {

		{ -1, -1, PASCAL_DMA_COPY_B },

		{ -1, -1, PASCAL_DMA_COPY_A },

		{}

	}

};



int

gp104_ce_new(struct nvkm_device *device, int index,

	     struct nvkm_engine **pengine)

{

	return nvkm_engine_new_(&gp104_ce, device, index, true, pengine);

}