]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/bridge: tc358768: Add atomic_get_input_bus_fmts() implementation
authorFrancesco Dolcini <francesco.dolcini@toradex.com>
Thu, 30 Mar 2023 09:59:41 +0000 (11:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Jul 2023 17:39:33 +0000 (19:39 +0200)
[ Upstream commit cec5ccef85bd0128cf895612de54a9d21d2015d0 ]

Add atomic_get_input_bus_fmts() implementation, tc358768 has a parallel
RGB input interface with the actual bus format depending on the amount
of parallel input data lines.

Without this change when the tc358768 is used with less than 24bit the
color mapping is completely wrong.

Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Robert Foss <rfoss@kernel.org>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230330095941.428122-7-francesco@dolcini.it
Stable-dep-of: ee18698e212b ("drm/bridge: tc358768: fix TCLK_TRAILCNT computation")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/bridge/tc358768.c

index aff400c3606622b8b7174671659e52c1c83e0995..487bfe33edc88f2f259014f26d41c29d95aa6d3e 100644 (file)
@@ -9,6 +9,7 @@
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 #include <linux/kernel.h>
+#include <linux/media-bus-format.h>
 #include <linux/module.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
@@ -918,6 +919,44 @@ static void tc358768_bridge_enable(struct drm_bridge *bridge)
        }
 }
 
+#define MAX_INPUT_SEL_FORMATS  1
+
+static u32 *
+tc358768_atomic_get_input_bus_fmts(struct drm_bridge *bridge,
+                                  struct drm_bridge_state *bridge_state,
+                                  struct drm_crtc_state *crtc_state,
+                                  struct drm_connector_state *conn_state,
+                                  u32 output_fmt,
+                                  unsigned int *num_input_fmts)
+{
+       struct tc358768_priv *priv = bridge_to_tc358768(bridge);
+       u32 *input_fmts;
+
+       *num_input_fmts = 0;
+
+       input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
+                            GFP_KERNEL);
+       if (!input_fmts)
+               return NULL;
+
+       switch (priv->pd_lines) {
+       case 16:
+               input_fmts[0] = MEDIA_BUS_FMT_RGB565_1X16;
+               break;
+       case 18:
+               input_fmts[0] = MEDIA_BUS_FMT_RGB666_1X18;
+               break;
+       default:
+       case 24:
+               input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
+               break;
+       };
+
+       *num_input_fmts = MAX_INPUT_SEL_FORMATS;
+
+       return input_fmts;
+}
+
 static const struct drm_bridge_funcs tc358768_bridge_funcs = {
        .attach = tc358768_bridge_attach,
        .mode_valid = tc358768_bridge_mode_valid,
@@ -925,6 +964,11 @@ static const struct drm_bridge_funcs tc358768_bridge_funcs = {
        .enable = tc358768_bridge_enable,
        .disable = tc358768_bridge_disable,
        .post_disable = tc358768_bridge_post_disable,
+
+       .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,
+       .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,
+       .atomic_reset = drm_atomic_helper_bridge_reset,
+       .atomic_get_input_bus_fmts = tc358768_atomic_get_input_bus_fmts,
 };
 
 static const struct drm_bridge_timings default_tc358768_timings = {