From 2b7077e02ee6cd9d8326cb0ef2cb6a721bfc01a6 Mon Sep 17 00:00:00 2001 From: Christopher Freeman Date: Fri, 24 Aug 2012 14:04:29 -0700 Subject: 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 Reviewed-on: http://git-master/r/127297 Reviewed-by: Simone Willett Tested-by: Simone Willett --- drivers/video/tegra/dc/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/video/tegra/dc/dc.c') 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, -- cgit v1.2.3