Commit 0bd4e9f7 authored by Ben Skeggs's avatar Ben Skeggs Committed by Lyude Paul
Browse files

drm/nouveau/disp: move dp aux pwr method to HAL 



- preparation for GSP-RM

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Acked-by: default avatarDanilo Krummrich <me@dakr.org>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230919220442.202488-27-lyude@redhat.com
parent e9c9b5b9

drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,14 @@ 
 */

#define AMPERE_IED_HACK(disp) ((disp)->engine.subdev.device->card_type >= GA100)



static int

nvkm_dp_aux_pwr(struct nvkm_outp *outp, bool pu)

{

	outp->dp.enabled = pu;

	nvkm_dp_enable(outp, outp->dp.enabled);

	return 0;

}



struct lt_state {

	struct nvkm_outp *outp;
@@ -814,6 +822,7 @@ nvkm_dp_func = { 
	.disable = nvkm_dp_disable,

	.bl.get = nvkm_outp_bl_get,

	.bl.set = nvkm_outp_bl_set,

	.dp.aux_pwr = nvkm_dp_aux_pwr,

};



int

drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,10 @@ struct nvkm_outp_func { 
		int (*get)(struct nvkm_outp *);

		int (*set)(struct nvkm_outp *, int level);

	} bl;



	struct {

		int (*aux_pwr)(struct nvkm_outp *, bool pu);

	} dp;

};



#define OUTP_MSG(o,l,f,a...) do {                                              \

drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c

+3 −3
Original line number Diff line number Diff line
@@ -75,10 +75,10 @@ nvkm_uoutp_mthd_dp_aux_pwr(struct nvkm_outp *outp, void *argv, u32 argc) 


	if (argc != sizeof(args->v0) || args->v0.version != 0)

		return -ENOSYS;

	if (!outp->func->dp.aux_pwr)

		return -EINVAL;



	outp->dp.enabled = !!args->v0.state;

	nvkm_dp_enable(outp, outp->dp.enabled);

	return 0;

	return outp->func->dp.aux_pwr(outp, !!args->v0.state);

}



static int