Commit 5b9c0307 authored by Ben Skeggs's avatar Ben Skeggs Committed by Lyude Paul
Browse files

drm/nouveau/disp: add output lvds config method 



- was previously part of acquire()

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-25-lyude@redhat.com
parent 2274ce7e

drivers/gpu/drm/nouveau/dispnv50/disp.c

+1 −1
Original line number Diff line number Diff line
@@ -1665,7 +1665,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta 
				lvds_8bpc = true;

		}



		nvif_outp_acquire_lvds(&nv_encoder->outp, lvds_dual, lvds_8bpc);

		nvif_outp_lvds(&nv_encoder->outp, lvds_dual, lvds_8bpc);

		break;

	case DCB_OUTPUT_DP:

		nvif_outp_acquire_dp(&nv_encoder->outp, nv_encoder->dp.dpcd, 0, 0, hda, false);

drivers/gpu/drm/nouveau/include/nvif/if0012.h

+10 −6
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ union nvif_outp_args { 
#define NVIF_OUTP_V0_BL_GET        0x30

#define NVIF_OUTP_V0_BL_SET        0x31



#define NVIF_OUTP_V0_LVDS          0x40



#define NVIF_OUTP_V0_HDMI          0x50



#define NVIF_OUTP_V0_INFOFRAME     0x60
@@ -67,7 +69,6 @@ union nvif_outp_acquire_args { 
#define NVIF_OUTP_ACQUIRE_V0_DAC  0x00

#define NVIF_OUTP_ACQUIRE_V0_SOR  0x01

#define NVIF_OUTP_ACQUIRE_V0_PIOR 0x02

#define NVIF_OUTP_ACQUIRE_V0_LVDS    0x03

#define NVIF_OUTP_ACQUIRE_V0_DP      0x04

		__u8 type;

		__u8 or;
@@ -77,11 +78,6 @@ union nvif_outp_acquire_args { 
			struct {

				__u8 hda;

			} sor;

			struct {

				__u8 dual;

				__u8 bpc8;

				__u8 pad02[6];

			} lvds;

			struct {

				__u8 link_nr; /* 0 = highest possible. */

				__u8 link_bw; /* 0 = highest possible, DP BW code otherwise. */
@@ -135,6 +131,14 @@ union nvif_outp_bl_set_args { 
	} v0;

};



union nvif_outp_lvds_args {

	struct nvif_outp_lvds_v0 {

		__u8  version;

		__u8  dual;

		__u8  bpc8;

	} v0;

};



union nvif_outp_hdmi_args {

	struct nvif_outp_hdmi_v0 {

		__u8 version;

drivers/gpu/drm/nouveau/include/nvif/outp.h

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ int nvif_outp_load_detect(struct nvif_outp *, u32 loadval); 
int nvif_outp_acquire_dac(struct nvif_outp *);

int nvif_outp_acquire_sor(struct nvif_outp *, bool hda);

int nvif_outp_acquire_pior(struct nvif_outp *);

int nvif_outp_acquire_lvds(struct nvif_outp *, bool dual, bool bpc8);

int nvif_outp_acquire_dp(struct nvif_outp *outp, u8 dpcd[DP_RECEIVER_CAP_SIZE],

			 int link_nr, int link_bw, bool hda, bool mst);

int nvif_outp_inherit_rgb_crt(struct nvif_outp *outp, u8 *proto_out);
@@ -50,6 +49,8 @@ nvif_outp_acquired(struct nvif_outp *outp) 
int nvif_outp_bl_get(struct nvif_outp *);

int nvif_outp_bl_set(struct nvif_outp *, int level);



int nvif_outp_lvds(struct nvif_outp *, bool dual, bool bpc8);



int nvif_outp_hdmi(struct nvif_outp *, int head, bool enable, u8 max_ac_packet, u8 rekey, u32 khz,

		   bool scdc, bool scdc_scrambling, bool scdc_low_rates);

drivers/gpu/drm/nouveau/nvif/outp.c

+7 −8
Original line number Diff line number Diff line
@@ -150,18 +150,17 @@ nvif_outp_hdmi(struct nvif_outp *outp, int head, bool enable, u8 max_ac_packet, 
}



int

nvif_outp_acquire_lvds(struct nvif_outp *outp, bool dual, bool bpc8)

nvif_outp_lvds(struct nvif_outp *outp, bool dual, bool bpc8)

{

	struct nvif_outp_acquire_v0 args;

	struct nvif_outp_lvds_v0 args;

	int ret;



	args.lvds.dual = dual;

	args.lvds.bpc8 = bpc8;

	args.version = 0;

	args.dual = dual;

	args.bpc8 = bpc8;



	ret = nvif_outp_acquire(outp, NVIF_OUTP_ACQUIRE_V0_LVDS, &args);

	NVIF_ERRON(ret, &outp->object,

		   "[ACQUIRE proto:LVDS dual:%d 8bpc:%d] or:%d link:%d",

		   args.lvds.dual, args.lvds.bpc8, args.or, args.link);

	ret = nvif_mthd(&outp->object, NVIF_OUTP_V0_LVDS, &args, sizeof(args));

	NVIF_ERRON(ret, &outp->object, "[LVDS dual:%d 8bpc:%d]", args.dual, args.bpc8);

	return ret;

}

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

+8 −6
Original line number Diff line number Diff line
@@ -171,13 +171,17 @@ nvkm_uoutp_mthd_hdmi(struct nvkm_outp *outp, void *argv, u32 argc) 
}



static int

nvkm_uoutp_mthd_acquire_lvds(struct nvkm_outp *outp, bool dual, bool bpc8)

nvkm_uoutp_mthd_lvds(struct nvkm_outp *outp, void *argv, u32 argc)

{

	union nvif_outp_lvds_args *args = argv;



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

		return -ENOSYS;

	if (outp->info.type != DCB_OUTPUT_LVDS)

		return -EINVAL;



	outp->lvds.dual = dual;

	outp->lvds.bpc8 = bpc8;

	outp->lvds.dual = !!args->v0.dual;

	outp->lvds.bpc8 = !!args->v0.bpc8;

	return 0;

}
@@ -253,9 +257,6 @@ nvkm_uoutp_mthd_acquire(struct nvkm_outp *outp, void *argv, u32 argc) 
	case NVIF_OUTP_ACQUIRE_V0_SOR:

		ret = nvkm_outp_acquire_or(outp, NVKM_OUTP_USER, args->v0.sor.hda);

		break;

	case NVIF_OUTP_ACQUIRE_V0_LVDS:

		ret = nvkm_uoutp_mthd_acquire_lvds(outp, args->v0.lvds.dual, args->v0.lvds.bpc8);

		break;

	case NVIF_OUTP_ACQUIRE_V0_DP:

		ret = nvkm_uoutp_mthd_acquire_dp(outp, args->v0.dp.dpcd,

						       args->v0.dp.link_nr,
@@ -406,6 +407,7 @@ nvkm_uoutp_mthd_acquired(struct nvkm_outp *outp, u32 mthd, void *argv, u32 argc) 
{

	switch (mthd) {

	case NVIF_OUTP_V0_RELEASE      : return nvkm_uoutp_mthd_release      (outp, argv, argc);

	case NVIF_OUTP_V0_LVDS         : return nvkm_uoutp_mthd_lvds         (outp, argv, argc);

	case NVIF_OUTP_V0_HDMI         : return nvkm_uoutp_mthd_hdmi         (outp, argv, argc);

	case NVIF_OUTP_V0_INFOFRAME    : return nvkm_uoutp_mthd_infoframe    (outp, argv, argc);

	case NVIF_OUTP_V0_HDA_ELD      : return nvkm_uoutp_mthd_hda_eld      (outp, argv, argc);