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

drm/nouveau/gsp: add hal for disp.get_static_info() 



550.40.07 has incompatible changes to
NV2080_CTRL_CMD_INTERNAL_DISPLAY_GET_STATIC_INFO.

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 a3f32329

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

+24 −13
Original line number Diff line number Diff line
@@ -1440,11 +1440,31 @@ r535_disp_init(struct nvkm_disp *disp) 
	return 0;

}



static int

r535_disp_get_static_info(struct nvkm_disp *disp)

{

	NV2080_CTRL_INTERNAL_DISPLAY_GET_STATIC_INFO_PARAMS *ctrl;

	struct nvkm_gsp *gsp = disp->rm.objcom.client->gsp;



	ctrl = nvkm_gsp_rm_ctrl_rd(&gsp->internal.device.subdevice,

				   NV2080_CTRL_CMD_INTERNAL_DISPLAY_GET_STATIC_INFO,

				   sizeof(*ctrl));

	if (IS_ERR(ctrl))

		return PTR_ERR(ctrl);



	disp->wndw.mask = ctrl->windowPresentMask;

	disp->wndw.nr = fls(disp->wndw.mask);



	nvkm_gsp_rm_ctrl_done(&gsp->internal.device.subdevice, ctrl);

	return 0;

}



static int

r535_disp_oneinit(struct nvkm_disp *disp)

{

	struct nvkm_device *device = disp->engine.subdev.device;

	struct nvkm_gsp *gsp = device->gsp;

	const struct nvkm_rm_api *rmapi = gsp->rm->api;

	NV2080_CTRL_INTERNAL_DISPLAY_WRITE_INST_MEM_PARAMS *ctrl;

	int ret, i;
@@ -1481,19 +1501,9 @@ r535_disp_oneinit(struct nvkm_disp *disp) 
	if (ret)

		return ret;



	{

		NV2080_CTRL_INTERNAL_DISPLAY_GET_STATIC_INFO_PARAMS *ctrl;



		ctrl = nvkm_gsp_rm_ctrl_rd(&gsp->internal.device.subdevice,

					   NV2080_CTRL_CMD_INTERNAL_DISPLAY_GET_STATIC_INFO,

					   sizeof(*ctrl));

		if (IS_ERR(ctrl))

			return PTR_ERR(ctrl);



		disp->wndw.mask = ctrl->windowPresentMask;

		disp->wndw.nr = fls(disp->wndw.mask);

		nvkm_gsp_rm_ctrl_done(&gsp->internal.device.subdevice, ctrl);

	}

	ret = rmapi->disp->get_static_info(disp);

	if (ret)

		return ret;



	/* */

	{
@@ -1733,6 +1743,7 @@ r535_disp_new(const struct nvkm_disp_func *hw, struct nvkm_device *device, 


const struct nvkm_rm_api_disp

r535_disp = {

	.get_static_info = r535_disp_get_static_info,

	.bl_ctrl = r535_bl_ctrl,

	.dp = {

		.set_indexed_link_rates = r535_dp_set_indexed_link_rates,

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

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ struct nvkm_rm_api { 
	} *device;



	const struct nvkm_rm_api_disp {

		int (*get_static_info)(struct nvkm_disp *);



		int (*bl_ctrl)(struct nvkm_disp *, unsigned display_id, bool set, int *val);



		struct {