On Thu, 31 Mar 2022 at 17:39, Marek Vasut marex@denx.de wrote:

Implement .atomic_get_input_bus_fmts callback, which sets up the input (scanout-engine-end) formats, so that those formats can then be used in pipeline format negotiation between this bridge and the scanout engine.

Signed-off-by: Marek Vasut marex@denx.de Cc: Dave Airlie airlied@redhat.com Cc: John Stultz john.stultz@linaro.org Cc: Maxime Ripard maxime@cerno.tech Cc: Sam Ravnborg sam@ravnborg.org Cc: Thomas Zimmermann tzimmermann@suse.de

---

drivers/gpu/drm/bridge/lontium-lt9611.c | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+)

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c index 9b3ac3794a2c..7ef8fe5abc12 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -922,6 +922,32 @@ static void lt9611_bridge_hpd_enable(struct drm_bridge *bridge) lt9611_enable_hpd_interrupts(lt9611); }

+#define MAX_INPUT_SEL_FORMATS 1

+static u32 * +lt9611_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)
  

+{

•   u32 *input_fmts;
  

•   *num_input_fmts = 0;
  

•   input_fmts = kcalloc(MAX_INPUT_SEL_FORMATS, sizeof(*input_fmts),
  

•                        GFP_KERNEL);
  

•   if (!input_fmts)
  

•           return NULL;
  

•   /* This is the DSI-end bus format */
  

•   input_fmts[0] = MEDIA_BUS_FMT_RGB888_1X24;
  

•   *num_input_fmts = 1;
  

•   return input_fmts;
  

+}

static const struct drm_bridge_funcs lt9611_bridge_funcs = { .attach = lt9611_bridge_attach, .mode_valid = lt9611_bridge_mode_valid, @@ -936,6 +962,7 @@ static const struct drm_bridge_funcs lt9611_bridge_funcs = { .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 = lt9611_atomic_get_input_bus_fmts,
  

};

static int lt9611_parse_dt(struct device *dev,

2.35.1

Reviewed-by: Robert Foss robert.foss@linaro.org

On Thu, 31 Mar 2022 at 17:43, Robert Foss robert.foss@linaro.org wrote:

On Thu, 31 Mar 2022 at 17:39, Marek Vasut marex@denx.de wrote:

...

Use the atomic version of the enable/disable operations to continue the transition to the atomic API. This will be needed to access the mode from the atomic state.

Signed-off-by: Marek Vasut marex@denx.de Cc: Dave Airlie airlied@redhat.com Cc: John Stultz john.stultz@linaro.org Cc: Maxime Ripard maxime@cerno.tech Cc: Sam Ravnborg sam@ravnborg.org Cc: Thomas Zimmermann tzimmermann@suse.de

---

drivers/gpu/drm/bridge/lontium-lt9611.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c index 63df2e8a8abc..9b3ac3794a2c 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -700,7 +700,9 @@ lt9611_connector_mode_valid(struct drm_connector *connector, }

/* bridge funcs */ -static void lt9611_bridge_enable(struct drm_bridge *bridge) +static void +lt9611_bridge_atomic_enable(struct drm_bridge *bridge,

•                       struct drm_bridge_state *old_bridge_state)
  

{ struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

@@ -721,7 +723,9 @@ static void lt9611_bridge_enable(struct drm_bridge *bridge) regmap_write(lt9611->regmap, 0x8130, 0xea); }

-static void lt9611_bridge_disable(struct drm_bridge *bridge) +static void +lt9611_bridge_atomic_disable(struct drm_bridge *bridge,

•                        struct drm_bridge_state *old_bridge_state)
  

{ struct lt9611 *lt9611 = bridge_to_lt9611(bridge); int ret; @@ -856,7 +860,9 @@ static void lt9611_bridge_pre_enable(struct drm_bridge *bridge) lt9611->sleep = false; }

-static void lt9611_bridge_post_disable(struct drm_bridge *bridge) +static void +lt9611_bridge_atomic_post_disable(struct drm_bridge *bridge,

•                             struct drm_bridge_state *old_bridge_state)
  

{ struct lt9611 *lt9611 = bridge_to_lt9611(bridge);

@@ -919,13 +925,17 @@ static void lt9611_bridge_hpd_enable(struct drm_bridge *bridge) static const struct drm_bridge_funcs lt9611_bridge_funcs = { .attach = lt9611_bridge_attach, .mode_valid = lt9611_bridge_mode_valid,

•   .enable = lt9611_bridge_enable,
  

•   .disable = lt9611_bridge_disable,
  

•   .post_disable = lt9611_bridge_post_disable,
    .mode_set = lt9611_bridge_mode_set,
    .detect = lt9611_bridge_detect,
    .get_edid = lt9611_bridge_get_edid,
    .hpd_enable = lt9611_bridge_hpd_enable,
  

•   .atomic_enable = lt9611_bridge_atomic_enable,
  

•   .atomic_disable = lt9611_bridge_atomic_disable,
  

•   .atomic_post_disable = lt9611_bridge_atomic_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,
  

};

static int lt9611_parse_dt(struct device *dev,

2.35.1

Reviewed-by: Robert Foss robert.foss@linaro.org

Applied to drm-misc-next.