t12x: video: tegra: dc: fix broken build
Bibek Basu [Mon, 1 Apr 2013 10:58:22 +0000 (15:58 +0530)]
Blender gen2 features are not available
for T148.

Change-Id: I84e28cd19d4f8647d715c020f5775997901ffbc5
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/215029
Reviewed-by: Kiran Adduri <kadduri@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Chao Xu <cxu@nvidia.com>

drivers/video/tegra/Kconfig
drivers/video/tegra/dc/dc.c

index 4687882..245d23b 100644 (file)
@@ -67,7 +67,7 @@ config TEGRA_DC_SCAN_COLUMN
 
 config TEGRA_DC_BLENDER_GEN2
     bool
-    default n if ARCH_TEGRA_2x_SOC || ARCH_TEGRA_3x_SOC || ARCH_TEGRA_11x_SOC
+    default n if ARCH_TEGRA_2x_SOC || ARCH_TEGRA_3x_SOC || ARCH_TEGRA_11x_SOC || ARCH_TEGRA_14x_SOC
     default y
 
 config TEGRA_DC_BLOCK_LINEAR
index 1cb1e6f..9bad09d 100644 (file)
@@ -633,7 +633,7 @@ static void _dump_regs(struct tegra_dc *dc, void *data,
                DUMP_REG(DC_WIN_BUF_STRIDE);
                DUMP_REG(DC_WIN_UV_BUF_STRIDE);
 #endif
-#if !defined(CONFIG_TEGRA_DC_BLENDER_GEN2) || defined(CONFIG_ARCH_TEGRA_14x_SOC)
+#if !defined(CONFIG_TEGRA_DC_BLENDER_GEN2)
                DUMP_REG(DC_WIN_BLEND_NOKEY);
                DUMP_REG(DC_WIN_BLEND_1WIN);
                DUMP_REG(DC_WIN_BLEND_2WIN_X);