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

Commit 44ab8cc5 authored by Xi Wang's avatar Xi Wang Committed by Ben Skeggs
Browse files

drm/nouveau/dp: fix bad comparison in dp_link_train_commit() 



The comparison (lpre == DP_TRAIN_PRE_EMPHASIS_9_5) is always false:
lpre is initialized as (lane & 0x0c) >> 2, which is at most 3, while
DP_TRAIN_PRE_EMPHASIS_9_5 is defined as (3 << 3).

Signed-off-by: default avatarXi Wang <xi.wang@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 84ddfda6

drivers/gpu/drm/nouveau/nouveau_dp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -432,7 +432,7 @@ dp_link_train_commit(struct drm_device *dev, struct dp_state *dp) 
		dp->conf[i] = (lpre << 3) | lvsw;

		dp->conf[i] = (lpre << 3) | lvsw;

		if (lvsw == DP_TRAIN_VOLTAGE_SWING_1200)

		if (lvsw == DP_TRAIN_VOLTAGE_SWING_1200)

			dp->conf[i] |= DP_TRAIN_MAX_SWING_REACHED;

			dp->conf[i] |= DP_TRAIN_MAX_SWING_REACHED;

		if (lpre == DP_TRAIN_PRE_EMPHASIS_9_5)

		if ((lpre << 3) == DP_TRAIN_PRE_EMPHASIS_9_5)

			dp->conf[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;

			dp->conf[i] |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;





		NV_DEBUG_KMS(dev, "config lane %d %02x\n", i, dp->conf[i]);

		NV_DEBUG_KMS(dev, "config lane %d %02x\n", i, dp->conf[i]);