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

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



545.23.06 has incompatible changes to
NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_PARAMS.

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 e95bb6b6

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

+31 −26
Original line number Diff line number Diff line
@@ -252,47 +252,47 @@ r535_core = { 
};



static int

r535_sor_bl_set(struct nvkm_ior *sor, int lvl)

r535_bl_ctrl(struct nvkm_disp *disp, unsigned display_id, bool set, int *pval)

{

	struct nvkm_disp *disp = sor->disp;

	u32 cmd = set ? NV0073_CTRL_CMD_SPECIFIC_SET_BACKLIGHT_BRIGHTNESS :

			NV0073_CTRL_CMD_SPECIFIC_GET_BACKLIGHT_BRIGHTNESS;

	NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_PARAMS *ctrl;

	int ret;



	ctrl = nvkm_gsp_rm_ctrl_get(&disp->rm.objcom,

				    NV0073_CTRL_CMD_SPECIFIC_SET_BACKLIGHT_BRIGHTNESS,

				    sizeof(*ctrl));

	ctrl = nvkm_gsp_rm_ctrl_get(&disp->rm.objcom, cmd, sizeof(*ctrl));

	if (IS_ERR(ctrl))

		return PTR_ERR(ctrl);



	ctrl->displayId = BIT(sor->asy.outp->index);

	ctrl->brightness = lvl;

	ctrl->displayId = BIT(display_id);

	ctrl->brightness = *pval;



	return nvkm_gsp_rm_ctrl_wr(&disp->rm.objcom, ctrl);

	ret = nvkm_gsp_rm_ctrl_push(&disp->rm.objcom, &ctrl, sizeof(*ctrl));

	if (ret)

		return ret;



	*pval = ctrl->brightness;



	nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl);

	return 0;

}



static int

r535_sor_bl_get(struct nvkm_ior *sor)

r535_sor_bl_set(struct nvkm_ior *sor, int lvl)

{

	struct nvkm_disp *disp = sor->disp;

	NV0073_CTRL_SPECIFIC_BACKLIGHT_BRIGHTNESS_PARAMS *ctrl;

	int ret, lvl;



	ctrl = nvkm_gsp_rm_ctrl_get(&disp->rm.objcom,

				    NV0073_CTRL_CMD_SPECIFIC_GET_BACKLIGHT_BRIGHTNESS,

				    sizeof(*ctrl));

	if (IS_ERR(ctrl))

		return PTR_ERR(ctrl);

	const struct nvkm_rm_api *rmapi = disp->engine.subdev.device->gsp->rm->api;



	ctrl->displayId = BIT(sor->asy.outp->index);



	ret = nvkm_gsp_rm_ctrl_push(&disp->rm.objcom, &ctrl, sizeof(*ctrl));

	if (ret) {

		nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl);

		return ret;

	return rmapi->disp->bl_ctrl(disp, sor->asy.outp->index, true, &lvl);

}



	lvl = ctrl->brightness;

	nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl);

	return lvl;

static int

r535_sor_bl_get(struct nvkm_ior *sor)

{

	struct nvkm_disp *disp = sor->disp;

	const struct nvkm_rm_api *rmapi = disp->engine.subdev.device->gsp->rm->api;

	int lvl, ret = rmapi->disp->bl_ctrl(disp, sor->asy.outp->index, false, &lvl);



	return (ret == 0) ? lvl : ret;

}



static const struct nvkm_ior_func_bl
@@ -1722,3 +1722,8 @@ r535_disp_new(const struct nvkm_disp_func *hw, struct nvkm_device *device, 
	mutex_init(&(*pdisp)->super.mutex); //XXX

	return ret;

}



const struct nvkm_rm_api_disp

r535_disp = {

	.bl_ctrl = r535_bl_ctrl,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ r535_api = { 
	.alloc = &r535_alloc,

	.client = &r535_client,

	.device = &r535_device,

	.disp = &r535_disp,

	.ce = &r535_ce,

	.nvdec = &r535_nvdec,

	.nvenc = &r535_nvenc,

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

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ struct nvkm_rm_api { 
		} event;

	} *device;



	const struct nvkm_rm_api_disp {

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

	} *disp;



	const struct nvkm_rm_api_engine {

		int (*alloc)(struct nvkm_gsp_object *chan, u32 handle, u32 class, int inst,

			     struct nvkm_gsp_object *);
@@ -84,6 +88,7 @@ extern const struct nvkm_rm_api_ctrl r535_ctrl; 
extern const struct nvkm_rm_api_alloc r535_alloc;

extern const struct nvkm_rm_api_client r535_client;

extern const struct nvkm_rm_api_device r535_device;

extern const struct nvkm_rm_api_disp r535_disp;

extern const struct nvkm_rm_api_engine r535_ce;

void *r535_gr_dtor(struct nvkm_gr *);

int r535_gr_oneinit(struct nvkm_gr *);