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

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



555.42.02 has incompatible changes to NV0073_CTRL_CMD_SYSTEM_GET_ACTIVE.

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 bfbae411

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

+5 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ r535_outp_acquire(struct nvkm_outp *outp, bool hda) 
}



static int

r535_disp_head_displayid(struct nvkm_disp *disp, int head, u32 *displayid)

r535_disp_get_active(struct nvkm_disp *disp, unsigned head, u32 *displayid)

{

	NV0073_CTRL_SYSTEM_GET_ACTIVE_PARAMS *ctrl;

	int ret;
@@ -757,7 +757,9 @@ r535_outp_inherit(struct nvkm_outp *outp) 
	int ret;



	list_for_each_entry(head, &disp->heads, head) {

		ret = r535_disp_head_displayid(disp, head->id, &displayid);

		const struct nvkm_rm_api *rmapi = disp->rm.objcom.client->gsp->rm->api;



		ret = rmapi->disp->get_active(disp, head->id, &displayid);

		if (WARN_ON(ret))

			return NULL;
@@ -1758,6 +1760,7 @@ r535_disp = { 
	.get_static_info = r535_disp_get_static_info,

	.get_supported = r535_disp_get_supported,

	.get_connect_state = r535_disp_get_connect_state,

	.get_active = r535_disp_get_active,

	.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

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct nvkm_rm_api { 
		int (*get_static_info)(struct nvkm_disp *);

		int (*get_supported)(struct nvkm_disp *, unsigned long *display_mask);

		int (*get_connect_state)(struct nvkm_disp *, unsigned display_id);

		int (*get_active)(struct nvkm_disp *, unsigned head, u32 *display_id);



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