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

drm/nouveau/gsp: add usermode class id to gpu hal 



Use usermode class ID from nvkm_rm_gpu, instead of copying it from the
non-GSP HALs.

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 0fac5141

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

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ ad10x_gpu = { 
		.wimm = GA102_DISP_WINDOW_IMM_CHANNEL_DMA,

		.curs = GA102_DISP_CURSOR,

	},



	.usermode.class = AMPERE_USERMODE_A,

};

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

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 
 */

#include "gpu.h"



#include <nvif/class.h>



const struct nvkm_rm_gpu

ga100_gpu = {

	.usermode.class = AMPERE_USERMODE_A,

};

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

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ ga1xx_gpu = { 
		.wimm = GA102_DISP_WINDOW_IMM_CHANNEL_DMA,

		.curs = GA102_DISP_CURSOR,

	},



	.usermode.class = AMPERE_USERMODE_A,

};

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ struct nvkm_rm_gpu { 
			u32 curs;

		} class;

	} disp;



	struct {

		u32 class;

	} usermode;

};



extern const struct nvkm_rm_gpu tu1xx_gpu;

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

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ tu1xx_gpu = { 
		.wimm = TU102_DISP_WINDOW_IMM_CHANNEL_DMA,

		.curs = TU102_DISP_CURSOR,

	},



	.usermode.class = TURING_USERMODE_A,

};