diff options
Diffstat (limited to 'drivers/video/tegra')
| -rw-r--r-- | drivers/video/tegra/dc/dc_config.c | 4 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/dc_config.h | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dc_config.c b/drivers/video/tegra/dc/dc_config.c index 3eebab6f66a8..828240575da8 100644 --- a/drivers/video/tegra/dc/dc_config.c +++ b/drivers/video/tegra/dc/dc_config.c @@ -29,6 +29,7 @@ static struct tegra_dc_feature_entry t20_feature_entries_a[] = { { 0, TEGRA_DC_FEATURE_INVERT_TYPE, {1, 1, 0,} }, { 1, TEGRA_DC_FEATURE_FORMATS, {TEGRA_WIN_FMT_WIN_B,} }, + { 1, TEGRA_DC_FEATURE_PREFERRED_FORMATS, {TEGRA_WIN_PREF_FMT_WIN_B,} }, { 1, TEGRA_DC_FEATURE_BLEND_TYPE, {1,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SIZE, {4095, 16, 4095, 16,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SCALE, {2, 2, 2, 2,} }, @@ -55,6 +56,7 @@ static struct tegra_dc_feature_entry t20_feature_entries_b[] = { { 0, TEGRA_DC_FEATURE_INVERT_TYPE, {1, 1, 0,} }, { 1, TEGRA_DC_FEATURE_FORMATS, {TEGRA_WIN_FMT_WIN_B,} }, + { 1, TEGRA_DC_FEATURE_PREFERRED_FORMATS, {TEGRA_WIN_PREF_FMT_WIN_B,} }, { 1, TEGRA_DC_FEATURE_BLEND_TYPE, {1,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SIZE, {4095, 16, 4095, 16,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SCALE, {2, 2, 2, 2,} }, @@ -89,6 +91,7 @@ static struct tegra_dc_feature_entry t30_feature_entries_a[] = { { 0, TEGRA_DC_FEATURE_INVERT_TYPE, {1, 1, 0,} }, { 1, TEGRA_DC_FEATURE_FORMATS, {TEGRA_WIN_FMT_WIN_B,} }, + { 1, TEGRA_DC_FEATURE_PREFERRED_FORMATS, {TEGRA_WIN_PREF_FMT_WIN_B,} }, { 1, TEGRA_DC_FEATURE_BLEND_TYPE, {1,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SIZE, {4095, 16, 4095, 16,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SCALE, {2, 2, 2, 2,} }, @@ -115,6 +118,7 @@ static struct tegra_dc_feature_entry t30_feature_entries_b[] = { { 0, TEGRA_DC_FEATURE_INVERT_TYPE, {1, 1, 0,} }, { 1, TEGRA_DC_FEATURE_FORMATS, {TEGRA_WIN_FMT_WIN_B,} }, + { 1, TEGRA_DC_FEATURE_PREFERRED_FORMATS, {TEGRA_WIN_PREF_FMT_WIN_B,} }, { 1, TEGRA_DC_FEATURE_BLEND_TYPE, {1,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SIZE, {4095, 16, 4095, 16,} }, { 1, TEGRA_DC_FEATURE_MAXIMUM_SCALE, {2, 2, 2, 2,} }, diff --git a/drivers/video/tegra/dc/dc_config.h b/drivers/video/tegra/dc/dc_config.h index a0670d1d9f20..55df5ef956a0 100644 --- a/drivers/video/tegra/dc/dc_config.h +++ b/drivers/video/tegra/dc/dc_config.h @@ -62,12 +62,15 @@ (1 << TEGRA_WIN_FMT_B6x2G6x2R6x2A8) | \ (1 << TEGRA_WIN_FMT_R6x2G6x2B6x2A8)) -#define TEGRA_WIN_FMT_WIN_B (TEGRA_WIN_FMT_BASE & \ - ~(1 << TEGRA_WIN_FMT_B8G8R8A8) & \ - ~(1 << TEGRA_WIN_FMT_R8G8B8A8)) +#define TEGRA_WIN_FMT_WIN_B TEGRA_WIN_FMT_BASE #define TEGRA_WIN_FMT_WIN_C TEGRA_WIN_FMT_BASE +/* preferred formats do not include 32-bpp formats */ +#define TEGRA_WIN_PREF_FMT_WIN_B (TEGRA_WIN_FMT_BASE & \ + ~(1 << TEGRA_WIN_FMT_B8G8R8A8) & \ + ~(1 << TEGRA_WIN_FMT_R8G8B8A8)) + #define UNDEFINED -1 #define MAX_WIDTH 0 #define MIN_WIDTH 1 @@ -93,6 +96,7 @@ enum tegra_dc_feature_option { TEGRA_DC_FEATURE_FILTER_TYPE, TEGRA_DC_FEATURE_LAYOUT_TYPE, TEGRA_DC_FEATURE_INVERT_TYPE, + TEGRA_DC_FEATURE_PREFERRED_FORMATS, }; struct tegra_dc_feature_entry { |