Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a002fece authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/dp: pass in required datarate to link training 



Not used currently, but it will be used in preference to pre-determined
lane/bandwidth numbers at a later point.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a8e415d3

drivers/gpu/drm/nouveau/nouveau_dp.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ nouveau_dp_link_train_commit(struct drm_encoder *encoder, uint8_t *config) 
}



bool

nouveau_dp_link_train(struct drm_encoder *encoder)

nouveau_dp_link_train(struct drm_encoder *encoder, u32 datarate)

{

	struct drm_device *dev = encoder->dev;

	struct drm_nouveau_private *dev_priv = dev->dev_private;

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ int nouveau_ttm_mmap(struct file *, struct vm_area_struct *); 
int nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr,

		     uint8_t *data, int data_nr);

bool nouveau_dp_detect(struct drm_encoder *);

bool nouveau_dp_link_train(struct drm_encoder *);

bool nouveau_dp_link_train(struct drm_encoder *, u32 datarate);

void nouveau_dp_tu_update(struct drm_device *, int, int, u32, u32);



/* nv04_fb.c */

drivers/gpu/drm/nouveau/nouveau_encoder.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct nouveau_encoder { 
			int link_nr;

			int link_bw;

			bool enhanced_frame;

			u32 datarate;

		} dp;

	};

};

drivers/gpu/drm/nouveau/nv50_sor.c

+8 −5
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode) 
		if (mode == DRM_MODE_DPMS_ON) {

			u8 status = DP_SET_POWER_D0;

			nouveau_dp_auxch(auxch, 8, DP_SET_POWER, &status, 1);

			nouveau_dp_link_train(encoder);

			nouveau_dp_link_train(encoder, nv_encoder->dp.datarate);

		} else {

			u8 status = DP_SET_POWER_D3;

			nouveau_dp_auxch(auxch, 8, DP_SET_POWER, &status, 1);
@@ -194,8 +194,6 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
	NV_DEBUG_KMS(dev, "or %d type %d -> crtc %d\n",

		     nv_encoder->or, nv_encoder->dcb->type, crtc->index);



	nv50_sor_dpms(encoder, DRM_MODE_DPMS_ON);



	switch (nv_encoder->dcb->type) {

	case OUTPUT_TMDS:

		if (nv_encoder->dcb->sorconf.link & 1) {
@@ -208,10 +206,13 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
		break;

	case OUTPUT_DP:

		nv_connector = nouveau_encoder_connector_get(nv_encoder);

		if (nv_connector && nv_connector->base.display_info.bpc == 6)

		if (nv_connector && nv_connector->base.display_info.bpc == 6) {

			nv_encoder->dp.datarate = crtc->mode->clock * 18 / 8;

			mode_ctl |= 0x00020000;

		else

		} else {

			nv_encoder->dp.datarate = crtc->mode->clock * 24 / 8;

			mode_ctl |= 0x00050000;

		}



		if (nv_encoder->dcb->sorconf.link & 1)

			mode_ctl |= 0x00000800;
@@ -233,6 +234,8 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
	if (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC)

		mode_ctl |= NV50_EVO_SOR_MODE_CTRL_NVSYNC;



	nv50_sor_dpms(encoder, DRM_MODE_DPMS_ON);



	ret = RING_SPACE(evo, 2);

	if (ret) {

		NV_ERROR(dev, "no space while connecting SOR\n");