From 815bf152c2990113722c844a724e92b45700b6c7 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu, 21 Feb 2013 08:11:57 +0100
Subject: [PATCH] --- yaml --- r: 358361 b: refs/heads/master c:
 84ff6b270893cd8b054bae371a315c905ffa3ac9 h: refs/heads/master i:   358359:
 26d3a186554fac56f51b631054cd850373ad68dd v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/tegra/dc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9fd6b9ef0d91..45d3f96691cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b9e71eae5ac5ded28ad1dcded7c01ae73dd9581
+refs/heads/master: 84ff6b270893cd8b054bae371a315c905ffa3ac9
diff --git a/trunk/drivers/gpu/drm/tegra/dc.c b/trunk/drivers/gpu/drm/tegra/dc.c
index 20864002cf39..bf8095c55bd1 100644
--- a/trunk/drivers/gpu/drm/tegra/dc.c
+++ b/trunk/drivers/gpu/drm/tegra/dc.c
@@ -500,7 +500,7 @@ int tegra_dc_setup_window(struct tegra_dc *dc, unsigned int index,
 		tegra_dc_writel(dc, 0x0000, DC_WIN_CSC_KVB);
 
 		value |= CSC_ENABLE;
-	} else if (bpp < 24) {
+	} else if (window->bits_per_pixel < 24) {
 		value |= COLOR_EXPAND;
 	}