Skip to content

Commit 273a50f

Browse files
rydbergairlied
authored andcommitted
nouveau: Set special lane map for the right chipset
The refactoring of the nv50 logic, introduced in 8663bc7, modified the test for the special lane map used on some Apple computers with Nvidia chipsets. The tested MBA3,1 would still boot, but resume from suspend stopped working. This patch restores the old test, which fixes the problem. Signed-off-by: Henrik Rydberg <[email protected]> Acked-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
1 parent a09d431 commit 273a50f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/nouveau/nv50_sor.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ nv50_sor_dp_lane_map(struct drm_device *dev, struct dcb_entry *dcb, u8 lane)
4242
struct drm_nouveau_private *dev_priv = dev->dev_private;
4343
static const u8 nvaf[] = { 24, 16, 8, 0 }; /* thanks, apple.. */
4444
static const u8 nv50[] = { 16, 8, 0, 24 };
45-
if (dev_priv->card_type == 0xaf)
45+
if (dev_priv->chipset == 0xaf)
4646
return nvaf[lane];
4747
return nv50[lane];
4848
}

0 commit comments

Comments
 (0)