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

Commit 1b45dbe0 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/dp: use alternate lane mask for nvaf 



Naturally...  Because Macs can't just be the same as everything else
now can they?

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

drivers/gpu/drm/nouveau/nouveau_dp.c

+10 −1
Original line number Diff line number Diff line
@@ -342,16 +342,25 @@ dp_set_training_pattern(struct drm_device *dev, struct dp_state *dp, u8 tp) 
	auxch_tx(dev, dp->auxch, 8, DP_TRAINING_PATTERN_SET, &tp, 1);

}



static const u8 nv50_lane_map[] = { 16, 8, 0, 24 };

static const u8 nvaf_lane_map[] = { 24, 16, 8, 0 };



static int

dp_link_train_commit(struct drm_device *dev, struct dp_state *dp)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;

	u32 mask = 0, drv = 0, pre = 0, unk = 0;

	u8  shifts[4] = { 16, 8, 0, 24 };

	u8  *bios, *last, headerlen;

	const u8 *shifts;

	int link = dp->link;

	int or = dp->or;

	int i;



	if (dev_priv->chipset != 0xaf)

		shifts = nv50_lane_map;

	else

		shifts = nvaf_lane_map;



	bios = nouveau_bios_dp_table(dev, dp->dcb, &headerlen);

	last = bios + headerlen + (bios[4] * 5);

	for (i = 0; i < dp->link_nr; i++) {