diff options
author | Christopher Freeman <cfreeman@nvidia.com> | 2012-08-24 14:04:29 -0700 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-08-28 18:52:35 -0700 |
commit | 2b7077e02ee6cd9d8326cb0ef2cb6a721bfc01a6 (patch) | |
tree | 2acc9f5a0cc9649d74f99d25781d957cfd0fc406 /drivers/video/tegra/dc/dc.c | |
parent | 6bc9afa39a1d2a0b2c909fb019ca49d848d96d63 (diff) |
video: tegra: cardhu: Default bpp from hardware
This patch adds:
1. A kernel config option that hints to DC driver
to use the current value of the color depth
register as the default for initializing the FB
driver.
2. Checks to see if DC is enabled before reading
off the color depth register in tegra_dc_probe.
Change-Id: I852cc1328fcf42f33052f46b86d753e691744329
Signed-off-by: Christopher Freeman <cfreeman@nvidia.com>
Reviewed-on: http://git-master/r/127297
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc/dc.c')
-rw-r--r-- | drivers/video/tegra/dc/dc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index de865e4e2da3..a3011b873aae 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1846,7 +1846,7 @@ static int tegra_dc_probe(struct nvhost_device *ndev, dev_info(&ndev->dev, "probed\n"); if (dc->pdata->fb) { - if (dc->pdata->fb->bits_per_pixel == -1) { + if (dc->enabled && dc->pdata->fb->bits_per_pixel == -1) { unsigned long fmt; tegra_dc_writel(dc, WINDOW_A_SELECT << dc->pdata->fb->win, |