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

drm/nouveau/gsp: split client handling out on its own 



Split NV01_ROOT handling out into its own module.

Aside from moving the function pointers, no code change is intended.

Signed-off-by: default avatarBen Skeggs <bskeggs@nvidia.com>
Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Reviewed-by: default avatarTimur Tabi <ttabi@nvidia.com>
Tested-by: default avatarTimur Tabi <ttabi@nvidia.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent be33f499

drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h

+2 −5
Original line number Diff line number Diff line
@@ -212,9 +212,6 @@ struct nvkm_gsp { 
	const struct nvkm_gsp_rm {

		const struct nvkm_rm_api *api;



		int (*client_ctor)(struct nvkm_gsp *, struct nvkm_gsp_client *);

		void (*client_dtor)(struct nvkm_gsp_client *);



		int (*device_ctor)(struct nvkm_gsp_client *, struct nvkm_gsp_device *);

		void (*device_dtor)(struct nvkm_gsp_device *);
@@ -425,14 +422,14 @@ nvkm_gsp_client_ctor(struct nvkm_gsp *gsp, struct nvkm_gsp_client *client) 
	if (WARN_ON(!gsp->rm))

		return -ENOSYS;



	return gsp->rm->client_ctor(gsp, client);

	return gsp->rm->api->client->ctor(gsp, client);

}



static inline void

nvkm_gsp_client_dtor(struct nvkm_gsp_client *client)

{

	if (client->gsp)

		client->gsp->rm->client_dtor(client);

		client->gsp->rm->api->client->dtor(client);

}



static inline int

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

+0 −53
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <nvfw/fw.h>



#include <nvrm/nvtypes.h>

#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h>

#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0005.h>

#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0080.h>

#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl2080.h>
@@ -177,62 +176,10 @@ r535_gsp_device_ctor(struct nvkm_gsp_client *client, struct nvkm_gsp_device *dev 
	return ret;

}



static void

r535_gsp_client_dtor(struct nvkm_gsp_client *client)

{

	struct nvkm_gsp *gsp = client->gsp;



	nvkm_gsp_rm_free(&client->object);



	mutex_lock(&gsp->client_id.mutex);

	idr_remove(&gsp->client_id.idr, client->object.handle & 0xffff);

	mutex_unlock(&gsp->client_id.mutex);



	client->gsp = NULL;

}



static int

r535_gsp_client_ctor(struct nvkm_gsp *gsp, struct nvkm_gsp_client *client)

{

	NV0000_ALLOC_PARAMETERS *args;

	int ret;



	mutex_lock(&gsp->client_id.mutex);

	ret = idr_alloc(&gsp->client_id.idr, client, 0, 0xffff + 1, GFP_KERNEL);

	mutex_unlock(&gsp->client_id.mutex);

	if (ret < 0)

		return ret;



	client->gsp = gsp;

	client->object.client = client;

	INIT_LIST_HEAD(&client->events);



	args = nvkm_gsp_rm_alloc_get(&client->object, 0xc1d00000 | ret, NV01_ROOT, sizeof(*args),

				     &client->object);

	if (IS_ERR(args)) {

		r535_gsp_client_dtor(client);

		return ret;

	}



	args->hClient = client->object.handle;

	args->processID = ~0;



	ret = nvkm_gsp_rm_alloc_wr(&client->object, args);

	if (ret) {

		r535_gsp_client_dtor(client);

		return ret;

	}



	return 0;

}



const struct nvkm_gsp_rm

r535_gsp_rm = {

	.api = &r535_rm,



	.client_ctor = r535_gsp_client_ctor,

	.client_dtor = r535_gsp_client_dtor,



	.device_ctor = r535_gsp_device_ctor,

	.device_dtor = r535_gsp_device_dtor,

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ nvkm-y += nvkm/subdev/gsp/rm/r535/rm.o 
nvkm-y += nvkm/subdev/gsp/rm/r535/rpc.o

nvkm-y += nvkm/subdev/gsp/rm/r535/ctrl.o

nvkm-y += nvkm/subdev/gsp/rm/r535/alloc.o

nvkm-y += nvkm/subdev/gsp/rm/r535/client.o

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/client.c

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 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.

 */

#include <rm/rm.h>



#include <nvrm/nvtypes.h>

#include <nvrm/535.113.01/common/sdk/nvidia/inc/class/cl0000.h>



static void

r535_gsp_client_dtor(struct nvkm_gsp_client *client)

{

	struct nvkm_gsp *gsp = client->gsp;



	nvkm_gsp_rm_free(&client->object);



	mutex_lock(&gsp->client_id.mutex);

	idr_remove(&gsp->client_id.idr, client->object.handle & 0xffff);

	mutex_unlock(&gsp->client_id.mutex);



	client->gsp = NULL;

}



static int

r535_gsp_client_ctor(struct nvkm_gsp *gsp, struct nvkm_gsp_client *client)

{

	NV0000_ALLOC_PARAMETERS *args;

	int ret;



	mutex_lock(&gsp->client_id.mutex);

	ret = idr_alloc(&gsp->client_id.idr, client, 0, 0xffff + 1, GFP_KERNEL);

	mutex_unlock(&gsp->client_id.mutex);

	if (ret < 0)

		return ret;



	client->gsp = gsp;

	client->object.client = client;

	INIT_LIST_HEAD(&client->events);



	args = nvkm_gsp_rm_alloc_get(&client->object, 0xc1d00000 | ret, NV01_ROOT, sizeof(*args),

				     &client->object);

	if (IS_ERR(args)) {

		r535_gsp_client_dtor(client);

		return ret;

	}



	args->hClient = client->object.handle;

	args->processID = ~0;



	ret = nvkm_gsp_rm_alloc_wr(&client->object, args);

	if (ret) {

		r535_gsp_client_dtor(client);

		return ret;

	}



	return 0;

}



const struct nvkm_rm_api_client

r535_client = {

	.ctor = r535_gsp_client_ctor,

	.dtor = r535_gsp_client_dtor,

};

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rm.c

+1 −0
Original line number Diff line number Diff line
@@ -9,4 +9,5 @@ r535_rm = { 
	.rpc = &r535_rpc,

	.ctrl = &r535_ctrl,

	.alloc = &r535_alloc,

	.client = &r535_client,

};