All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Walle <mwalle@kernel.org>
To: Dave Airlie <airlied@gmail.com>,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Neil Armstrong <neil.armstrong@linaro.org>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Robert Foss <rfoss@kernel.org>,
	DRI mailing list <dri-devel@lists.freedesktop.org>,
	Jonas Karlman <jonas@kwiboo.se>,
	Alexander Stein <alexander.stein@ew.tq-group.com>,
	Tim Harvey <tharvey@gateworks.com>,
	linux-kernel@vger.kernel.org,
	Frieder Schrempf <frieder.schrempf@kontron.de>,
	Michael Trimarchi <michael@amarulasolutions.com>,
	Jagan Teki <jagan@amarulasolutions.com>,
	Andrzej Hajda <andrzej.hajda@intel.com>,
	Inki Dae <daeinki@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Subject: Re: [PATCH] drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE
Date: Mon, 29 Jan 2024 17:06:22 +0100	[thread overview]
Message-ID: <31e1a38a1d012a32d6f7bc8372b6360e@kernel.org> (raw)
In-Reply-To: <b18d88302acfca001a6693d78909bc2a@kernel.org>

>> Just FYI this conflictted pretty heavily with drm-misc-next changes in
>> the same area, someone should check drm-tip has the correct
>> resolution, I'm not really sure what is definitely should be.
> 
> FWIW, this looks rather messy now. The drm-tip doesn't build.
> 
> There was a new call to samsung_dsim_set_stop_state() introduced
> in commit b2fe2292624ac (drm: bridge: samsung-dsim: enter display
> mode in the enable() callback).

I had a closer look at the latest linux-next (where somehow my patch
made it into) and tried to apply commit b2fe2292624ac (drm: bridge:
samsung-dsim: enter display mode in the enable() callback). It looks
like only the following hunk is still needed from that patch. Everything
else is covered by this fixes patch.

Dario, could you rebase your commit onto this patch? I had a quick test
with this change and it seems to work fine for our case.

--snip--
diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c 
b/drivers/gpu/drm/bridge/samsung-dsim.c
index 63a1a0c88be4..92755c90e7d2 100644
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -1498,6 +1498,8 @@ static void samsung_dsim_atomic_disable(struct 
drm_bridge *bridge,
         if (!(dsi->state & DSIM_STATE_ENABLED))
                 return;

+       samsung_dsim_set_display_enable(dsi, false);
+
         dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE;
  }

@@ -1506,8 +1508,6 @@ static void 
samsung_dsim_atomic_post_disable(struct drm_bridge *bridge,
  {
         struct samsung_dsim *dsi = bridge_to_dsi(bridge);

-       samsung_dsim_set_display_enable(dsi, false);
-
         dsi->state &= ~DSIM_STATE_ENABLED;
         pm_runtime_put_sync(dsi->dev);
  }
--snip--

-michael

WARNING: multiple messages have this Message-ID (diff)
From: Michael Walle <mwalle@kernel.org>
To: Dave Airlie <airlied@gmail.com>,
	Dario Binacchi <dario.binacchi@amarulasolutions.com>,
	Dmitry Osipenko <dmitry.osipenko@collabora.com>
Cc: Inki Dae <daeinki@gmail.com>,
	Neil Armstrong <neil.armstrong@linaro.org>,
	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
	Robert Foss <rfoss@kernel.org>,
	Frieder Schrempf <frieder.schrempf@kontron.de>,
	Jagan Teki <jagan@amarulasolutions.com>,
	Andrzej Hajda <andrzej.hajda@intel.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Jonas Karlman <jonas@kwiboo.se>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Tim Harvey <tharvey@gateworks.com>,
	Alexander Stein <alexander.stein@ew.tq-group.com>,
	linux-kernel@vger.kernel.org,
	DRI mailing list <dri-devel@lists.freedesktop.org>,
	Daniel Vetter <daniel@ffwll.ch>,
	Michael Trimarchi <michael@amarulasolutions.com>
Subject: Re: [PATCH] drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE
Date: Mon, 29 Jan 2024 17:06:22 +0100	[thread overview]
Message-ID: <31e1a38a1d012a32d6f7bc8372b6360e@kernel.org> (raw)
In-Reply-To: <b18d88302acfca001a6693d78909bc2a@kernel.org>

>> Just FYI this conflictted pretty heavily with drm-misc-next changes in
>> the same area, someone should check drm-tip has the correct
>> resolution, I'm not really sure what is definitely should be.
> 
> FWIW, this looks rather messy now. The drm-tip doesn't build.
> 
> There was a new call to samsung_dsim_set_stop_state() introduced
> in commit b2fe2292624ac (drm: bridge: samsung-dsim: enter display
> mode in the enable() callback).

I had a closer look at the latest linux-next (where somehow my patch
made it into) and tried to apply commit b2fe2292624ac (drm: bridge:
samsung-dsim: enter display mode in the enable() callback). It looks
like only the following hunk is still needed from that patch. Everything
else is covered by this fixes patch.

Dario, could you rebase your commit onto this patch? I had a quick test
with this change and it seems to work fine for our case.

--snip--
diff --git a/drivers/gpu/drm/bridge/samsung-dsim.c 
b/drivers/gpu/drm/bridge/samsung-dsim.c
index 63a1a0c88be4..92755c90e7d2 100644
--- a/drivers/gpu/drm/bridge/samsung-dsim.c
+++ b/drivers/gpu/drm/bridge/samsung-dsim.c
@@ -1498,6 +1498,8 @@ static void samsung_dsim_atomic_disable(struct 
drm_bridge *bridge,
         if (!(dsi->state & DSIM_STATE_ENABLED))
                 return;

+       samsung_dsim_set_display_enable(dsi, false);
+
         dsi->state &= ~DSIM_STATE_VIDOUT_AVAILABLE;
  }

@@ -1506,8 +1508,6 @@ static void 
samsung_dsim_atomic_post_disable(struct drm_bridge *bridge,
  {
         struct samsung_dsim *dsi = bridge_to_dsi(bridge);

-       samsung_dsim_set_display_enable(dsi, false);
-
         dsi->state &= ~DSIM_STATE_ENABLED;
         pm_runtime_put_sync(dsi->dev);
  }
--snip--

-michael

  parent reply	other threads:[~2024-01-29 16:06 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-13 16:43 [PATCH] drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE Michael Walle
2023-11-13 16:43 ` Michael Walle
2023-11-14  7:15 ` Alexander Stein
2023-11-14  7:15   ` Alexander Stein
2023-11-14  8:52   ` Michael Walle
2023-11-14  8:52     ` Michael Walle
2023-11-14 14:29 ` Frieder Schrempf
2023-11-14 14:29   ` Frieder Schrempf
2023-11-14 15:53   ` Michael Walle
2023-11-14 15:53     ` Michael Walle
2023-12-01  9:04 ` Michael Walle
2023-12-01  9:04   ` Michael Walle
2023-12-18 11:24   ` Frieder Schrempf
2023-12-18 11:24     ` Frieder Schrempf
2023-12-21  4:23     ` Inki Dae
2024-01-09  8:47       ` Michael Walle
2024-01-09  8:47         ` Michael Walle
2024-01-09 12:50         ` Daniel Vetter
2024-01-09 12:50           ` Daniel Vetter
2024-01-19  6:36           ` Inki Dae
2024-01-26 18:28             ` Dave Airlie
2024-01-26 18:28               ` Dave Airlie
2024-01-29  9:20               ` Frieder Schrempf
2024-01-29  9:20                 ` Frieder Schrempf
2024-01-29 16:51                 ` Frieder Schrempf
2024-01-29 16:51                   ` Frieder Schrempf
2024-01-29 10:32               ` Michael Walle
2024-01-29 10:32                 ` Michael Walle
2024-01-29 10:39                 ` Michael Walle
2024-01-29 10:39                   ` Michael Walle
2024-01-29 16:06                 ` Michael Walle [this message]
2024-01-29 16:06                   ` Michael Walle
2024-01-30  9:11                   ` Dario Binacchi
2024-01-30  9:11                     ` Dario Binacchi
2024-01-30  9:24                     ` Michael Walle
2024-01-30  9:24                       ` Michael Walle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=31e1a38a1d012a32d6f7bc8372b6360e@kernel.org \
    --to=mwalle@kernel.org \
    --cc=Laurent.pinchart@ideasonboard.com \
    --cc=airlied@gmail.com \
    --cc=alexander.stein@ew.tq-group.com \
    --cc=andrzej.hajda@intel.com \
    --cc=daeinki@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dario.binacchi@amarulasolutions.com \
    --cc=dmitry.osipenko@collabora.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=frieder.schrempf@kontron.de \
    --cc=jagan@amarulasolutions.com \
    --cc=jernej.skrabec@gmail.com \
    --cc=jonas@kwiboo.se \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=michael@amarulasolutions.com \
    --cc=neil.armstrong@linaro.org \
    --cc=rfoss@kernel.org \
    --cc=tharvey@gateworks.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.