---

yaml
---
r: 185549
b: refs/heads/master
c: 0939727
h: refs/heads/master
i:
  185547: 82f4a2c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c27f87d2bde885e9bcda74c208a7aae8bef8e76
+refs/heads/master: 093972788f009cabf8f8fb726dc5267b60b3d09e

trunk/drivers/gpu/drm/radeon/radeon_atombios.c

@@ -1073,6 +1073,21 @@ static struct radeon_atom_ss *radeon_atombios_get_ss_info(struct
 	return ss;
 }
 
+static void radeon_atom_apply_lvds_quirks(struct drm_device *dev,
+					  struct radeon_encoder_atom_dig *lvds)
+{
+
+	/* Toshiba A300-1BU laptop panel doesn't like new pll divider algo */
+	if ((dev->pdev->device == 0x95c4) &&
+	    (dev->pdev->subsystem_vendor == 0x1179) &&
+	    (dev->pdev->subsystem_device == 0xff50)) {
+		if ((lvds->native_mode.hdisplay == 1280) &&
+		    (lvds->native_mode.vdisplay == 800))
+			lvds->pll_algo = PLL_ALGO_LEGACY;
+	}
+
+}
+
 union lvds_info {
 	struct _ATOM_LVDS_INFO info;
 	struct _ATOM_LVDS_INFO_V12 info_12;
@@ -1151,6 +1166,9 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct
 		} else
 			lvds->pll_algo = PLL_ALGO_LEGACY;
 
+		/* LVDS quirks */
+		radeon_atom_apply_lvds_quirks(dev, lvds);
+
 		encoder->native_mode = lvds->native_mode;
 	}
 	return lvds;