mbox series

[0/3] Revert panel fixes and original buggy patch

Message ID 20231128-revert-panel-fix-v1-0-69bb05048dae@linaro.org
Headers
Series Revert panel fixes and original buggy patch |

Message

Linus Walleij Nov. 27, 2023, 11:10 p.m. UTC 
  This series reverts the attempts to fix the bug that went
into v6.7-rc1 in commit 199cf07ebd2b
"drm/bridge: panel: Add a device link between drm device and panel device"
and then it reverts that patch as well.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Linus Walleij (3):
      Revert "driver core: Export device_is_dependent() to modules"
      Revert "drm/bridge: panel: Check device dependency before managing device link"
      Revert "drm/bridge: panel: Add a device link between drm device and panel device"

 drivers/base/core.c            |  1 -
 drivers/gpu/drm/bridge/panel.c | 26 --------------------------
 2 files changed, 27 deletions(-)
---
base-commit: 95ba893c9f4feb836ddce627efd0bb6af6667031
change-id: 20231127-revert-panel-fix-e4da3e11e7a4

Best regards,

Comments

Laurent Pinchart Nov. 27, 2023, 11:25 p.m. UTC | #1 
Hi Linus,

On Tue, Nov 28, 2023 at 12:10:18AM +0100, Linus Walleij wrote:
> This series reverts the attempts to fix the bug that went
> into v6.7-rc1 in commit 199cf07ebd2b
> "drm/bridge: panel: Add a device link between drm device and panel device"
> and then it reverts that patch as well.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Linus Walleij (3):
>       Revert "driver core: Export device_is_dependent() to modules"
>       Revert "drm/bridge: panel: Check device dependency before managing device link"
>       Revert "drm/bridge: panel: Add a device link between drm device and panel device"

To preserve bisectability, you should revert in the opposite order.

> 
>  drivers/base/core.c            |  1 -
>  drivers/gpu/drm/bridge/panel.c | 26 --------------------------
>  2 files changed, 27 deletions(-)
> ---
> base-commit: 95ba893c9f4feb836ddce627efd0bb6af6667031
> change-id: 20231127-revert-panel-fix-e4da3e11e7a4
Linus Walleij Nov. 27, 2023, 11:36 p.m. UTC | #2 
On Tue, Nov 28, 2023 at 12:25 AM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Tue, Nov 28, 2023 at 12:10:18AM +0100, Linus Walleij wrote:
> > This series reverts the attempts to fix the bug that went
> > into v6.7-rc1 in commit 199cf07ebd2b
> > "drm/bridge: panel: Add a device link between drm device and panel device"
> > and then it reverts that patch as well.
> >
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > ---
> > Linus Walleij (3):
> >       Revert "driver core: Export device_is_dependent() to modules"
> >       Revert "drm/bridge: panel: Check device dependency before managing device link"
> >       Revert "drm/bridge: panel: Add a device link between drm device and panel device"
>
> To preserve bisectability, you should revert in the opposite order.

You mean apply patch 2, then 1, then 3 so the kernel builds after each
revert?

Yeah that's a good idea, I don't know if I should apply these though, better
someone else do it since I screwed up too much.

Another option is to just squash the reverts into one, that bisects too :/

Yours,
Linus Walleij
Laurent Pinchart Nov. 27, 2023, 11:52 p.m. UTC | #3 
On Tue, Nov 28, 2023 at 12:36:15AM +0100, Linus Walleij wrote:
> On Tue, Nov 28, 2023 at 12:25 AM Laurent Pinchart wrote:
> > On Tue, Nov 28, 2023 at 12:10:18AM +0100, Linus Walleij wrote:
> > > This series reverts the attempts to fix the bug that went
> > > into v6.7-rc1 in commit 199cf07ebd2b
> > > "drm/bridge: panel: Add a device link between drm device and panel device"
> > > and then it reverts that patch as well.
> > >
> > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > > ---
> > > Linus Walleij (3):
> > >       Revert "driver core: Export device_is_dependent() to modules"
> > >       Revert "drm/bridge: panel: Check device dependency before managing device link"
> > >       Revert "drm/bridge: panel: Add a device link between drm device and panel device"
> >
> > To preserve bisectability, you should revert in the opposite order.
> 
> You mean apply patch 2, then 1, then 3 so the kernel builds after each
> revert?
> 
> Yeah that's a good idea, I don't know if I should apply these though, better
> someone else do it since I screwed up too much.
> 
> Another option is to just squash the reverts into one, that bisects too :/

I thought the commits have been applied to drm-misc in a bisectable
order in the first place, but that doesn't seem to be the case :-(
Reverting "driver core: Export device_is_dependent() to modules" last
seems to be the best option in this case. I wouldn't squash them.
Greg KH Nov. 28, 2023, 8:28 a.m. UTC | #4 
On Tue, Nov 28, 2023 at 01:52:44AM +0200, Laurent Pinchart wrote:
> On Tue, Nov 28, 2023 at 12:36:15AM +0100, Linus Walleij wrote:
> > On Tue, Nov 28, 2023 at 12:25 AM Laurent Pinchart wrote:
> > > On Tue, Nov 28, 2023 at 12:10:18AM +0100, Linus Walleij wrote:
> > > > This series reverts the attempts to fix the bug that went
> > > > into v6.7-rc1 in commit 199cf07ebd2b
> > > > "drm/bridge: panel: Add a device link between drm device and panel device"
> > > > and then it reverts that patch as well.
> > > >
> > > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> > > > ---
> > > > Linus Walleij (3):
> > > >       Revert "driver core: Export device_is_dependent() to modules"
> > > >       Revert "drm/bridge: panel: Check device dependency before managing device link"
> > > >       Revert "drm/bridge: panel: Add a device link between drm device and panel device"
> > >
> > > To preserve bisectability, you should revert in the opposite order.
> > 
> > You mean apply patch 2, then 1, then 3 so the kernel builds after each
> > revert?
> > 
> > Yeah that's a good idea, I don't know if I should apply these though, better
> > someone else do it since I screwed up too much.
> > 
> > Another option is to just squash the reverts into one, that bisects too :/
> 
> I thought the commits have been applied to drm-misc in a bisectable
> order in the first place, but that doesn't seem to be the case :-(
> Reverting "driver core: Export device_is_dependent() to modules" last
> seems to be the best option in this case. I wouldn't squash them.

Agreed, don't squash, just revert in the opposite order they were
applied in originally, that way the tree can always build.

thanks,

greg k-h
Neil Armstrong Nov. 28, 2023, 8:30 a.m. UTC | #5 
Hi Linus,

On 28/11/2023 00:36, Linus Walleij wrote:
> On Tue, Nov 28, 2023 at 12:25 AM Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
>> On Tue, Nov 28, 2023 at 12:10:18AM +0100, Linus Walleij wrote:
>>> This series reverts the attempts to fix the bug that went
>>> into v6.7-rc1 in commit 199cf07ebd2b
>>> "drm/bridge: panel: Add a device link between drm device and panel device"
>>> and then it reverts that patch as well.
>>>
>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>>> ---
>>> Linus Walleij (3):
>>>        Revert "driver core: Export device_is_dependent() to modules"
>>>        Revert "drm/bridge: panel: Check device dependency before managing device link"
>>>        Revert "drm/bridge: panel: Add a device link between drm device and panel device"
>>
>> To preserve bisectability, you should revert in the opposite order.
> 
> You mean apply patch 2, then 1, then 3 so the kernel builds after each
> revert?
> 
> Yeah that's a good idea, I don't know if I should apply these though, better
> someone else do it since I screwed up too much.
> 
> Another option is to just squash the reverts into one, that bisects too :/

You can apply them now, or tell me if you want me to apply them.

Neil

> 
> Yours,
> Linus Walleij
Linus Walleij Nov. 28, 2023, 9:34 a.m. UTC | #6 
On Tue, Nov 28, 2023 at 9:30 AM Neil Armstrong
<neil.armstrong@linaro.org> wrote:

> You can apply them now, or tell me if you want me to apply them.

Please apply them Neil (to drm-misc-fixes) order 2, 1, 3 for bisectability.

Yours,
Linus Walleij
Neil Armstrong Nov. 28, 2023, 10:04 a.m. UTC | #7 
On 28/11/2023 10:34, Linus Walleij wrote:
> On Tue, Nov 28, 2023 at 9:30 AM Neil Armstrong
> <neil.armstrong@linaro.org> wrote:
> 
>> You can apply them now, or tell me if you want me to apply them.
> 
> Please apply them Neil (to drm-misc-fixes) order 2, 1, 3 for bisectability.

Sure, doing it right now.

Neil

> 
> Yours,
> Linus Walleij
Neil Armstrong Nov. 28, 2023, 10:12 a.m. UTC | #8 
Hi,

On Tue, 28 Nov 2023 00:10:18 +0100, Linus Walleij wrote:
> This series reverts the attempts to fix the bug that went
> into v6.7-rc1 in commit 199cf07ebd2b
> "drm/bridge: panel: Add a device link between drm device and panel device"
> and then it reverts that patch as well.
> 
> 

Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)

[3/3] Revert "drm/bridge: panel: Add a device link between drm device and panel device"
      https://cgit.freedesktop.org/drm/drm-misc/commit/?id=9b6a59e5db87c2c6b3ca0391176ed4358623d5e4
Neil Armstrong Nov. 28, 2023, 10:13 a.m. UTC | #9 
On 28/11/2023 11:12, Neil Armstrong wrote:
> Hi,
> 
> On Tue, 28 Nov 2023 00:10:18 +0100, Linus Walleij wrote:
>> This series reverts the attempts to fix the bug that went
>> into v6.7-rc1 in commit 199cf07ebd2b
>> "drm/bridge: panel: Add a device link between drm device and panel device"
>> and then it reverts that patch as well.
>>
>>
> 
> Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
> 
> [3/3] Revert "drm/bridge: panel: Add a device link between drm device and panel device"
>        https://cgit.freedesktop.org/drm/drm-misc/commit/?id=9b6a59e5db87c2c6b3ca0391176ed4358623d5e4
> 

b4 got really confused that I picked the patches in the wrong order, but I applied
the 3 patched in the 2, 1, 3 order.

Neil
Linus Walleij Nov. 28, 2023, 10:16 a.m. UTC | #10 
On Tue, Nov 28, 2023 at 11:13 AM Neil Armstrong
<neil.armstrong@linaro.org> wrote:
> On 28/11/2023 11:12, Neil Armstrong wrote:
> > Hi,
> >
> > On Tue, 28 Nov 2023 00:10:18 +0100, Linus Walleij wrote:
> >> This series reverts the attempts to fix the bug that went
> >> into v6.7-rc1 in commit 199cf07ebd2b
> >> "drm/bridge: panel: Add a device link between drm device and panel device"
> >> and then it reverts that patch as well.
> >>
> >>
> >
> > Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
> >
> > [3/3] Revert "drm/bridge: panel: Add a device link between drm device and panel device"
> >        https://cgit.freedesktop.org/drm/drm-misc/commit/?id=9b6a59e5db87c2c6b3ca0391176ed4358623d5e4
> >
>
> b4 got really confused that I picked the patches in the wrong order, but I applied
> the 3 patched in the 2, 1, 3 order.

Special mistakes requires special fixes, sorry for the mess :(

Thanks a lot Neil!

Yours,
Linus Walleij
Maxime Ripard Nov. 28, 2023, 12:27 p.m. UTC | #11 
On Tue, Nov 28, 2023 at 11:16:23AM +0100, Linus Walleij wrote:
> On Tue, Nov 28, 2023 at 11:13 AM Neil Armstrong
> <neil.armstrong@linaro.org> wrote:
> > On 28/11/2023 11:12, Neil Armstrong wrote:
> > > Hi,
> > >
> > > On Tue, 28 Nov 2023 00:10:18 +0100, Linus Walleij wrote:
> > >> This series reverts the attempts to fix the bug that went
> > >> into v6.7-rc1 in commit 199cf07ebd2b
> > >> "drm/bridge: panel: Add a device link between drm device and panel device"
> > >> and then it reverts that patch as well.
> > >>
> > >>
> > >
> > > Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
> > >
> > > [3/3] Revert "drm/bridge: panel: Add a device link between drm device and panel device"
> > >        https://cgit.freedesktop.org/drm/drm-misc/commit/?id=9b6a59e5db87c2c6b3ca0391176ed4358623d5e4
> > >
> >
> > b4 got really confused that I picked the patches in the wrong order, but I applied
> > the 3 patched in the 2, 1, 3 order.
> 
> Special mistakes requires special fixes, sorry for the mess :(
>
> Thanks a lot Neil!

Thanks to both of you for the quick handling :)

Maxime