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

drm/nouveau/ce/r535: initial support 



Adds support for allocating DMA_COPY classes from RM.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-40-skeggsb@gmail.com
parent 2a77d015

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

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct nvkm_chan *nvkm_chan_get_chid(struct nvkm_engine *, int id, unsigned long 
struct nvkm_chan *nvkm_chan_get_inst(struct nvkm_engine *, u64 inst, unsigned long *irqflags);

void nvkm_chan_put(struct nvkm_chan **, unsigned long irqflags);



struct nvkm_chan *nvkm_uchan_chan(struct nvkm_object *);



struct nvkm_fifo {

	const struct nvkm_fifo_func *func;

	struct nvkm_engine engine;

drivers/gpu/drm/nouveau/include/nvrm/535.54.03/common/sdk/nvidia/inc/class/clc0b5sw.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
#ifndef __src_common_sdk_nvidia_inc_class_clc0b5sw_h__

#define __src_common_sdk_nvidia_inc_class_clc0b5sw_h__



/* Excerpt of RM headers from https://github.com/NVIDIA/open-gpu-kernel-modules/tree/535.54.03 */



/*

 * SPDX-FileCopyrightText: Copyright (c) 2014-2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.

 * SPDX-License-Identifier: MIT

 *

 * 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 AUTHORS OR COPYRIGHT HOLDERS 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.

 */



typedef struct NVC0B5_ALLOCATION_PARAMETERS {

    NvU32 version;

    NvU32 engineType;

} NVC0B5_ALLOCATION_PARAMETERS;



#endif

drivers/gpu/drm/nouveau/include/nvrm/535.54.03/nvidia/inc/kernel/gpu/intr/engine_idx.h

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ 


#define MC_ENGINE_IDX_DISP                          2



#define MC_ENGINE_IDX_CE0                           15



#define MC_ENGINE_IDX_CE9                           24



#define MC_ENGINE_IDX_GSP                           49



#endif

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

+2 −0
Original line number Diff line number Diff line
@@ -10,3 +10,5 @@ nvkm-y += nvkm/engine/ce/gv100.o 
nvkm-y += nvkm/engine/ce/tu102.o

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

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



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

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

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ ga100_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, 
	     struct nvkm_engine **pengine)

{

	if (nvkm_gsp_rm(device->gsp))

		return -ENODEV;

		return r535_ce_new(&ga100_ce, device, type, inst, pengine);



	return nvkm_engine_new_(&ga100_ce, device, type, inst, true, pengine);

}