drm/tegra: dc: Enable plane scaling filters

Currently resized plane produces a "pixelated" image which doesn't look
nice, especially in a case of a video overlay. Enable scaling filters that
significantly improve image quality of a scaled overlay.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 3e7ec3937346852bdd35836e8c2da868bd85416a..a4dd866fc8be735e312c11f6c313d4c74835e89e 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -224,6 +224,39 @@ static void tegra_plane_setup_blending(struct tegra_plane *plane,
        tegra_plane_writel(plane, value, DC_WIN_BLEND_LAYER_CONTROL);
 }
 
+static bool
+tegra_plane_use_horizontal_filtering(struct tegra_plane *plane,
+                                    const struct tegra_dc_window *window)
+{
+       struct tegra_dc *dc = plane->dc;
+
+       if (window->src.w == window->dst.w)
+               return false;
+
+       if (plane->index == 0 && dc->soc->has_win_a_without_filters)
+               return false;
+
+       return true;
+}
+
+static bool
+tegra_plane_use_vertical_filtering(struct tegra_plane *plane,
+                                  const struct tegra_dc_window *window)
+{
+       struct tegra_dc *dc = plane->dc;
+
+       if (window->src.h == window->dst.h)
+               return false;
+
+       if (plane->index == 0 && dc->soc->has_win_a_without_filters)
+               return false;
+
+       if (plane->index == 2 && dc->soc->has_win_c_without_vert_filter)
+               return false;
+
+       return true;
+}
+
 static void tegra_dc_setup_window(struct tegra_plane *plane,
                                  const struct tegra_dc_window *window)
 {
@@ -361,6 +394,44 @@ static void tegra_dc_setup_window(struct tegra_plane *plane,
        if (window->bottom_up)
                value |= V_DIRECTION;
 
+       if (tegra_plane_use_horizontal_filtering(plane, window)) {
+               /*
+                * Enable horizontal 6-tap filter and set filtering
+                * coefficients to the default values defined in TRM.
+                */
+               tegra_plane_writel(plane, 0x00008000, DC_WIN_H_FILTER_P(0));
+               tegra_plane_writel(plane, 0x3e087ce1, DC_WIN_H_FILTER_P(1));
+               tegra_plane_writel(plane, 0x3b117ac1, DC_WIN_H_FILTER_P(2));
+               tegra_plane_writel(plane, 0x591b73aa, DC_WIN_H_FILTER_P(3));
+               tegra_plane_writel(plane, 0x57256d9a, DC_WIN_H_FILTER_P(4));
+               tegra_plane_writel(plane, 0x552f668b, DC_WIN_H_FILTER_P(5));
+               tegra_plane_writel(plane, 0x73385e8b, DC_WIN_H_FILTER_P(6));
+               tegra_plane_writel(plane, 0x72435583, DC_WIN_H_FILTER_P(7));
+               tegra_plane_writel(plane, 0x714c4c8b, DC_WIN_H_FILTER_P(8));
+               tegra_plane_writel(plane, 0x70554393, DC_WIN_H_FILTER_P(9));
+               tegra_plane_writel(plane, 0x715e389b, DC_WIN_H_FILTER_P(10));
+               tegra_plane_writel(plane, 0x71662faa, DC_WIN_H_FILTER_P(11));
+               tegra_plane_writel(plane, 0x536d25ba, DC_WIN_H_FILTER_P(12));
+               tegra_plane_writel(plane, 0x55731bca, DC_WIN_H_FILTER_P(13));
+               tegra_plane_writel(plane, 0x387a11d9, DC_WIN_H_FILTER_P(14));
+               tegra_plane_writel(plane, 0x3c7c08f1, DC_WIN_H_FILTER_P(15));
+
+               value |= H_FILTER;
+       }
+
+       if (tegra_plane_use_vertical_filtering(plane, window)) {
+               unsigned int i, k;
+
+               /*
+                * Enable vertical 2-tap filter and set filtering
+                * coefficients to the default values defined in TRM.
+                */
+               for (i = 0, k = 128; i < 16; i++, k -= 8)
+                       tegra_plane_writel(plane, k, DC_WIN_V_FILTER_P(i));
+
+               value |= V_FILTER;
+       }
+
        tegra_plane_writel(plane, value, DC_WIN_WIN_OPTIONS);
 
        if (dc->soc->supports_blending)
@@ -1951,6 +2022,8 @@ static const struct tegra_dc_soc_info tegra20_dc_soc_info = {
        .num_overlay_formats = ARRAY_SIZE(tegra20_overlay_formats),
        .overlay_formats = tegra20_overlay_formats,
        .modifiers = tegra20_modifiers,
+       .has_win_a_without_filters = true,
+       .has_win_c_without_vert_filter = true,
 };
 
 static const struct tegra_dc_soc_info tegra30_dc_soc_info = {
@@ -1968,6 +2041,8 @@ static const struct tegra_dc_soc_info tegra30_dc_soc_info = {
        .num_overlay_formats = ARRAY_SIZE(tegra20_overlay_formats),
        .overlay_formats = tegra20_overlay_formats,
        .modifiers = tegra20_modifiers,
+       .has_win_a_without_filters = false,
+       .has_win_c_without_vert_filter = false,
 };
 
 static const struct tegra_dc_soc_info tegra114_dc_soc_info = {
@@ -1985,6 +2060,8 @@ static const struct tegra_dc_soc_info tegra114_dc_soc_info = {
        .num_overlay_formats = ARRAY_SIZE(tegra114_overlay_formats),
        .overlay_formats = tegra114_overlay_formats,
        .modifiers = tegra20_modifiers,
+       .has_win_a_without_filters = false,
+       .has_win_c_without_vert_filter = false,
 };
 
 static const struct tegra_dc_soc_info tegra124_dc_soc_info = {
@@ -2002,6 +2079,8 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = {
        .num_overlay_formats = ARRAY_SIZE(tegra124_overlay_formats),
        .overlay_formats = tegra124_overlay_formats,
        .modifiers = tegra124_modifiers,
+       .has_win_a_without_filters = false,
+       .has_win_c_without_vert_filter = false,
 };
 
 static const struct tegra_dc_soc_info tegra210_dc_soc_info = {
@@ -2019,6 +2098,8 @@ static const struct tegra_dc_soc_info tegra210_dc_soc_info = {
        .num_overlay_formats = ARRAY_SIZE(tegra114_overlay_formats),
        .overlay_formats = tegra114_overlay_formats,
        .modifiers = tegra124_modifiers,
+       .has_win_a_without_filters = false,
+       .has_win_c_without_vert_filter = false,
 };
 
 static const struct tegra_windowgroup_soc tegra186_dc_wgrps[] = {

diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h
index 7be786febb17bb87cf063f5aa7084a2c7a82af21..556321fde9d2830b281cb1321d65f9719b517a1b 100644 (file)
--- a/drivers/gpu/drm/tegra/dc.h
+++ b/drivers/gpu/drm/tegra/dc.h
@@ -67,6 +67,8 @@ struct tegra_dc_soc_info {
        const u32 *overlay_formats;
        unsigned int num_overlay_formats;
        const u64 *modifiers;
+       bool has_win_a_without_filters;
+       bool has_win_c_without_vert_filter;
 };
 
 struct tegra_dc {
@@ -553,6 +555,9 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc);
 #define  THREAD_NUM(x) (((x) & 0x1f) << 1)
 #define  THREAD_GROUP_ENABLE (1 << 0)
 
+#define DC_WIN_H_FILTER_P(p)                   (0x601 + (p))
+#define DC_WIN_V_FILTER_P(p)                   (0x619 + (p))
+
 #define DC_WIN_CSC_YOF                         0x611
 #define DC_WIN_CSC_KYRGB                       0x612
 #define DC_WIN_CSC_KUR                         0x613
@@ -566,6 +571,8 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc);
 #define H_DIRECTION  (1 <<  0)
 #define V_DIRECTION  (1 <<  2)
 #define COLOR_EXPAND (1 <<  6)
+#define H_FILTER     (1 <<  8)
+#define V_FILTER     (1 << 10)
 #define CSC_ENABLE   (1 << 18)
 #define WIN_ENABLE   (1 << 30)