Commit 9793083f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp: move LVDS protocol information into acquire 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent ea6143a8

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

+10 −22
Original line number Diff line number Diff line
@@ -1635,15 +1635,6 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta 
	struct nv50_head_atom *asyh =

		nv50_head_atom(drm_atomic_get_new_crtc_state(state, &nv_crtc->base));

	struct drm_display_mode *mode = &asyh->state.adjusted_mode;

	struct {

		struct nv50_disp_mthd_v1 base;

		struct nv50_disp_sor_lvds_script_v0 lvds;

	} lvds = {

		.base.version = 1,

		.base.method  = NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT,

		.base.hasht   = nv_encoder->dcb->hasht,

		.base.hashm   = nv_encoder->dcb->hashm,

	};

	struct nv50_disp *disp = nv50_disp(encoder->dev);

	struct drm_device *dev = encoder->dev;

	struct nouveau_drm *drm = nouveau_drm(dev);
@@ -1652,7 +1643,7 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta 
	struct nouveau_backlight *backlight;

#endif

	struct nvbios *bios = &drm->vbios;

	bool hda = false;

	bool lvds_dual = false, lvds_8bpc = false, hda = false;

	u8 proto = NV507D_SOR_SET_CONTROL_PROTOCOL_CUSTOM;

	u8 depth = NV837D_SOR_SET_CONTROL_PIXEL_DEPTH_DEFAULT;
@@ -1689,33 +1680,30 @@ nv50_sor_atomic_enable(struct drm_encoder *encoder, struct drm_atomic_state *sta 
		proto = NV507D_SOR_SET_CONTROL_PROTOCOL_LVDS_CUSTOM;



		if (bios->fp_no_ddc) {

			if (bios->fp.dual_link)

				lvds.lvds.script |= 0x0100;

			if (bios->fp.if_is_24bit)

				lvds.lvds.script |= 0x0200;

			lvds_dual = bios->fp.dual_link;

			lvds_8bpc = bios->fp.if_is_24bit;

		} else {

			if (nv_connector->type == DCB_CONNECTOR_LVDS_SPWG) {

				if (((u8 *)nv_connector->edid)[121] == 2)

					lvds.lvds.script |= 0x0100;

					lvds_dual = true;

			} else

			if (mode->clock >= bios->fp.duallink_transition_clk) {

				lvds.lvds.script |= 0x0100;

				lvds_dual = true;

			}



			if (lvds.lvds.script & 0x0100) {

			if (lvds_dual) {

				if (bios->fp.strapless_is_24bit & 2)

					lvds.lvds.script |= 0x0200;

					lvds_8bpc = true;

			} else {

				if (bios->fp.strapless_is_24bit & 1)

					lvds.lvds.script |= 0x0200;

					lvds_8bpc = true;

			}



			if (asyh->or.bpc == 8)

				lvds.lvds.script |= 0x0200;

				lvds_8bpc = true;

		}



		nvif_outp_acquire_lvds(&nv_encoder->outp);

		nvif_mthd(&disp->disp->object, 0, &lvds, sizeof(lvds));

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

		break;

	case DCB_OUTPUT_DP:

		nvif_outp_acquire_dp(&nv_encoder->outp, hda);

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

+0 −8
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct nv50_disp_mthd_v1 { 
	__u8  version;

#define NV50_DISP_MTHD_V1_SOR_HDA_ELD                                      0x21

#define NV50_DISP_MTHD_V1_SOR_HDMI_PWR                                     0x22

#define NV50_DISP_MTHD_V1_SOR_LVDS_SCRIPT                                  0x23

#define NV50_DISP_MTHD_V1_SOR_DP_MST_LINK                                  0x25

#define NV50_DISP_MTHD_V1_SOR_DP_MST_VCPI                                  0x26

	__u8  method;
@@ -58,13 +57,6 @@ struct nv50_disp_sor_hdmi_pwr_v0 { 
	__u8  pad07[1];

};



struct nv50_disp_sor_lvds_script_v0 {

	__u8  version;

	__u8  pad01[1];

	__u16 script;

	__u8  pad04[4];

};



struct nv50_disp_sor_dp_mst_link_v0 {

	__u8  version;

	__u8  state;

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

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ union nvif_outp_acquire_args { 
				__u8 hda;

				__u8 pad01[7];

			} tmds;

			struct {

				__u8 dual;

				__u8 bpc8;

				__u8 pad02[6];

			} lvds;

			struct {

				__u8 hda;

				__u8 pad01[7];

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void nvif_outp_dtor(struct nvif_outp *); 
int nvif_outp_load_detect(struct nvif_outp *, u32 loadval);

int nvif_outp_acquire_rgb_crt(struct nvif_outp *);

int nvif_outp_acquire_tmds(struct nvif_outp *, bool hda);

int nvif_outp_acquire_lvds(struct nvif_outp *);

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

int nvif_outp_acquire_dp(struct nvif_outp *, bool hda);

void nvif_outp_release(struct nvif_outp *);

#endif

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

+1 −7
Original line number Diff line number Diff line
@@ -31,13 +31,7 @@ struct nvkm_disp { 
	struct {

		unsigned long mask;

		int nr;

	} wndw, head, dac;



	struct {

		unsigned long mask;

		int nr;

		u32 lvdsconf;

	} sor;

	} wndw, head, dac, sor;



	struct {

		unsigned long mask;