Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 260009
b: refs/heads/master
c: 9fce362
h: refs/heads/master
i:
  260007: a668533
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 8, 2011
1 parent 10f4449 commit fc793f1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e913972423fc6ec0eee33469f691f9cce3a47680
refs/heads/master: 9fce3623856d5998e01807ee7aa8991665ebf652
10 changes: 4 additions & 6 deletions trunk/drivers/staging/gma500/mid_bios.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,19 +237,17 @@ static void mid_get_vbt_data(struct drm_psb_private *dev_priv)
dev_err(dev->dev, "Unknown revision of GCT!\n");
vbt->size = 0;
}
if (IS_MFLD(dev_priv->dev)){
if (IS_MFLD(dev_priv->dev)) {
if (panel_id == GCT_DETECT) {
if (dev_priv->gct_data.bpi == 2) {
dev_info(dev->dev, "[GFX] PYR Panel Detected\n");
dev_priv->panel_id = PYR_CMD;
panel_id = PYR_CMD;
}
else if(dev_priv->gct_data.bpi == 0) {
} else if (dev_priv->gct_data.bpi == 0) {
dev_info(dev->dev, "[GFX] TMD Panel Detected.\n");
dev_priv->panel_id = TMD_VID;
panel_id = TMD_VID;
}
else {
} else {
dev_info(dev->dev, "[GFX] Default Panel (TPO)\n");
dev_priv->panel_id = TPO_CMD;
panel_id = TPO_CMD;
Expand All @@ -268,4 +266,4 @@ int mid_chip_setup(struct drm_device *dev)
mid_get_vbt_data(dev_priv);
mid_get_pci_revID(dev_priv);
return 0;
}
}

0 comments on commit fc793f1

Please sign in to comment.