diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2012-04-13 00:37:00 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-19 16:37:53 +0100 |
| commit | 273a50fbcd2d2c0652bbda58dd1985f932ce6d75 (patch) | |
| tree | 374e749b12767ebd585730552cb7d8ccb4b244f6 /drivers | |
| parent | a09d431f344d854e4fe9cfac44f78cb8202f3eb7 (diff) | |
| download | linux-3.10-273a50fbcd2d2c0652bbda58dd1985f932ce6d75.tar.gz linux-3.10-273a50fbcd2d2c0652bbda58dd1985f932ce6d75.tar.bz2 linux-3.10-273a50fbcd2d2c0652bbda58dd1985f932ce6d75.zip | |
nouveau: Set special lane map for the right chipset
The refactoring of the nv50 logic, introduced in 8663bc7c, 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 <rydberg@euromail.se>
Acked-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_sor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index a7844ab6a50..27464021247 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c @@ -42,7 +42,7 @@ nv50_sor_dp_lane_map(struct drm_device *dev, struct dcb_entry *dcb, u8 lane) struct drm_nouveau_private *dev_priv = dev->dev_private; static const u8 nvaf[] = { 24, 16, 8, 0 }; /* thanks, apple.. */ static const u8 nv50[] = { 16, 8, 0, 24 }; - if (dev_priv->card_type == 0xaf) + if (dev_priv->chipset == 0xaf) return nvaf[lane]; return nv50[lane]; } |