diff options
| author | Prashant Malani <pmalani@nvidia.com> | 2012-05-15 13:01:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 01:24:41 -0700 |
| commit | 57acd4afd6005154659edd92ebb3edf05dc61e35 (patch) | |
| tree | f84a75fcb4eb935aa1c458088906d98058ce8a5f /drivers/video/tegra/dc/dc_config.c | |
| parent | 7b69996fe36f7649ea0922e6fb7f642cd60d319a (diff) | |
video: tegra: dc: Use pre-existing feature table
change t114 feature table to use one defined for
t30. Prevents build break.
Change-Id: I6c1ed54b5cae8016a7e2ef37113418293ec13b56
Signed-off-by: Prashant Malani <pmalani@nvidia.com>
Reviewed-on: http://git-master/r/102641
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Kevin Huang (Eng-SW) <kevinh@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R5782f75b7776359dc2b1f77db48ba4891209ee9c
Diffstat (limited to 'drivers/video/tegra/dc/dc_config.c')
| -rw-r--r-- | drivers/video/tegra/dc/dc_config.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/dc_config.c b/drivers/video/tegra/dc/dc_config.c index 55ab537e4252..2cce9ba11b91 100644 --- a/drivers/video/tegra/dc/dc_config.c +++ b/drivers/video/tegra/dc/dc_config.c @@ -254,6 +254,16 @@ void tegra_dc_feature_register(struct tegra_dc *dc) dc->feature = &t30_feature_table_a; else dc->feature = &t30_feature_table_b; +#elif defined(CONFIG_ARCH_TEGRA_11x_SOC) + if (!dc->ndev->id) + dc->feature = &t30_feature_table_a; + else + dc->feature = &t30_feature_table_b; +#elif defined(CONFIG_ARCH_TEGRA_14x_SOC) + if (!dc->ndev->id) + dc->feature = &t30_feature_table_a; + else + dc->feature = &t30_feature_table_b; #endif /* Count the number of windows using gen1 blender. */ dc->gen1_blend_num = 0; |