Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2024-02-06 Thread Dario Binacchi 
Hi Michael,

On Tue, Feb 6, 2024 at 12:29 PM Michael Walle  wrote:
>
> Hi Stephen and all,
>
> >> Today's linux-next merge of the drm-misc tree got a conflict in:
> >>
> >>   drivers/gpu/drm/bridge/samsung-dsim.c
> >>
> >> between commit:
> >>
> >>   ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't use
> >> FORCE_STOP_STATE")
> >>
> >> from Linus' tree and commit:
> >>
> >>   b2fe2292624a ("drm: bridge: samsung-dsim: enter display mode in the
> >> enable() callback")
> >>
> >> from the drm-misc tree.
> >>
> >> I fixed it up (see below, please check) and can carry the fix as
> >> necessary. This is now fixed as far as linux-next is concerned, but
> >> any
> >> non trivial conflicts should be mentioned to your upstream maintainer
> >> when your tree is submitted for merging.  You may also want to
> >> consider
> >> cooperating with the maintainer of the conflicting tree to minimise
> >> any
> >> particularly complex conflicts.
> >
> > I changed my mind and just used the latter version of this file.
>
> Bug wise, this is the wrong solution. Because it will reintroduce the
> faulty FORCE_STOP_STATE. Also keep in mind, my fixes commit is/was
> already
> backported to the stable series.
>
> See also the discussion at [1]. Unfortunately, there was no conculusion
> yet.
> I think [2] is the proper resolution, at least for the commit
> b2fe2292624a
> ("drm: bridge: samsung-dsim: enter display mode in the enable()
> callback")
> I'm not sure in what state the drm-misc tree is.
>
> -michael
>
> [1]
> https://lore.kernel.org/dri-devel/CAPM=9tytMB9frxNeD08hu1qsusY=wee3bjofmuga1rspabw...@mail.gmail.com/
> [2]
> https://lore.kernel.org/dri-devel/31e1a38a1d012a32d6f7bc8372b63...@kernel.org/


Unfortunately, in this recent period, I have been very busy and have
not been able to run tests on this matter.
As soon as I am able to do so, I will.

Thanks and regards,
Dario

-- 

Dario Binacchi

Senior Embedded Linux Developer

dario.binac...@amarulasolutions.com

__


Amarula Solutions SRL

Via Le Canevare 30, 31100 Treviso, Veneto, IT

T. +39 042 243 5310
i...@amarulasolutions.com

www.amarulasolutions.com

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2024-02-06 Thread Michael Walle 

Hi Stephen and all,


Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/bridge/samsung-dsim.c

between commit:

  ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't use 
FORCE_STOP_STATE")


from Linus' tree and commit:

  b2fe2292624a ("drm: bridge: samsung-dsim: enter display mode in the 
enable() callback")


from the drm-misc tree.

I fixed it up (see below, please check) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but 
any

non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to 
consider
cooperating with the maintainer of the conflicting tree to minimise 
any

particularly complex conflicts.


I changed my mind and just used the latter version of this file.


Bug wise, this is the wrong solution. Because it will reintroduce the
faulty FORCE_STOP_STATE. Also keep in mind, my fixes commit is/was 
already

backported to the stable series.

See also the discussion at [1]. Unfortunately, there was no conculusion 
yet.
I think [2] is the proper resolution, at least for the commit 
b2fe2292624a
("drm: bridge: samsung-dsim: enter display mode in the enable() 
callback")

I'm not sure in what state the drm-misc tree is.

-michael

[1] 
https://lore.kernel.org/dri-devel/CAPM=9tytMB9frxNeD08hu1qsusY=wee3bjofmuga1rspabw...@mail.gmail.com/
[2] 
https://lore.kernel.org/dri-devel/31e1a38a1d012a32d6f7bc8372b63...@kernel.org/

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2024-02-05 Thread Stephen Rothwell 
Hi all,

On Tue, 6 Feb 2024 11:59:56 +1100 Stephen Rothwell  
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/bridge/samsung-dsim.c
> 
> between commit:
> 
>   ff3d5d04db07 ("drm: bridge: samsung-dsim: Don't use FORCE_STOP_STATE")
> 
> from Linus' tree and commit:
> 
>   b2fe2292624a ("drm: bridge: samsung-dsim: enter display mode in the 
> enable() callback")
> 
> from the drm-misc tree.
> 
> I fixed it up (see below, please check) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

I changed my mind and just used the latter version of this file.
-- 
Cheers,
Stephen Rothwell


pgpQ4uREN7GHJ.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2023-09-13 Thread Uwe Kleine-König 
On Wed, Sep 13, 2023 at 11:09:39AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/mediatek/mtk_dpi.c
> 
> between commits:
> 
>   47d4bb6bbcdb ("drm/mediatek: mtk_dpi: Simplify with devm_drm_bridge_add()")
>   90c95c3892dd ("drm/mediatek: mtk_dpi: Switch to .remove_new() void 
> callback")
> 
> from Linus' tree and commit:
> 
>   c04ca6bbb7ea ("drm/mediatek: Convert to platform remove callback returning 
> void")
> 
> from the drm-misc tree.
> 
> I fixed it up (the latter is the same as 90c95c3892dd)

That's not entirely true:

uwe@taurus:~/gsrc/linux$ git show --oneline --stat 90c95c3892dd
90c95c3892dd drm/mediatek: mtk_dpi: Switch to .remove_new() void callback
 drivers/gpu/drm/mediatek/mtk_dpi.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
uwe@taurus:~/gsrc/linux$ git show --oneline --stat c04ca6bbb7ea
c04ca6bbb7ea drm/mediatek: Convert to platform remove callback returning void
 drivers/gpu/drm/mediatek/mtk_disp_aal.c   | 6 ++
 drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 6 ++
 drivers/gpu/drm/mediatek/mtk_disp_color.c | 6 ++
 drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 6 ++
 drivers/gpu/drm/mediatek/mtk_disp_merge.c | 6 ++
 drivers/gpu/drm/mediatek/mtk_disp_ovl.c   | 6 ++
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c  | 6 ++
 drivers/gpu/drm/mediatek/mtk_dp.c | 6 ++
 drivers/gpu/drm/mediatek/mtk_dpi.c| 6 ++
 drivers/gpu/drm/mediatek/mtk_drm_drv.c| 6 ++
 drivers/gpu/drm/mediatek/mtk_dsi.c| 6 ++
 drivers/gpu/drm/mediatek/mtk_hdmi.c   | 5 ++---
 drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c   | 6 ++
 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c   | 5 ++---
 14 files changed, 28 insertions(+), 54 deletions(-)

But yes, restricted to drivers/gpu/drm/mediatek/mtk_dpi.c the patches do
the same (but have a different base, so there is some fuzz):

$ diff -u <(git show c04ca6bbb7ea drivers/gpu/drm/mediatek/mtk_dpi.c ) <(git 
show 90c95c3892dd)
--- /dev/fd/63  2023-09-13 10:22:37.368055450 +0200
+++ /dev/fd/62  2023-09-13 10:22:37.372055516 +0200
@@ -1,46 +1,36 @@
-commit c04ca6bbb7ea6ea7cba9ba8d3d4d4c767008d189
-Author: Uwe Kleine-König 
-Date:   Sun May 7 18:25:52 2023 +0200
+commit 90c95c3892dde019182ceac984d4ca1f3c85844b
+Author: AngeloGioacchino Del Regno 
+Date:   Wed Jul 26 10:22:43 2023 +0200

[...]

 diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c 
b/drivers/gpu/drm/mediatek/mtk_dpi.c
-index 28bdb1f427ff..0ef722c24150 100644
+index e9c5a0f44537..3a140498c98a 100644
 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
 +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
-@@ -1101,14 +1101,12 @@ static int mtk_dpi_probe(struct platform_device *pdev)
+@@ -1087,11 +1087,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)
return 0;
  }

 -static int mtk_dpi_remove(struct platform_device *pdev)
 +static void mtk_dpi_remove(struct platform_device *pdev)
  {
-   struct mtk_dpi *dpi = platform_get_drvdata(pdev);
-
component_del(>dev, _dpi_component_ops);
-   drm_bridge_remove(>bridge);
 -
 -  return 0;
  }

  static const struct of_device_id mtk_dpi_of_ids[] = {
-@@ -1139,7 +1137,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);
+@@ -1122,7 +1120,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);

  struct platform_driver mtk_dpi_driver = {
.probe = mtk_dpi_probe,


e44dd16393896b2545a6d57b2c11381fe7628aa0 looks right.

Best regards and thanks,
Uwe

-- 
Pengutronix e.K.   | Uwe Kleine-König|
Industrial Linux Solutions | https://www.pengutronix.de/ |


signature.asc
Description: PGP signature

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2020-09-01 Thread Stephen Rothwell 
Hi all,

On Wed, 26 Aug 2020 10:01:13 +1000 Stephen Rothwell  
wrote:
>
> Hi all,
> 
> Today's linux-next merge of the drm-misc tree got conflicts in:
> 
>   drivers/video/fbdev/arcfb.c
>   drivers/video/fbdev/atmel_lcdfb.c
>   drivers/video/fbdev/savage/savagefb_driver.c
> 
> between commit:
> 
>   df561f6688fe ("treewide: Use fallthrough pseudo-keyword")
> 
> from Linus' tree and commit:
> 
>   ad04fae0de07 ("fbdev: Use fallthrough pseudo-keyword")
> 
> from the drm-misc tree.
> 
> I fixed it up (they are much the same, I just used the version from Linus'
> tree) and can carry the fix as necessary. This is now fixed as far as
> linux-next is concerned, but any non trivial conflicts should be mentioned
> to your upstream maintainer when your tree is submitted for merging.
> You may also want to consider cooperating with the maintainer of the
> conflicting tree to minimise any particularly complex conflicts.

These conflicts now appear in the merge between the drm tree and Linus'
tree.

-- 
Cheers,
Stephen Rothwell


pgp3Pc3XKh5bX.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-24 Thread Maxime Ripard 
On Thu, May 23, 2019 at 11:10:39AM -0500, Rob Herring wrote:
> On Thu, May 23, 2019 at 6:54 AM Maxime Ripard  
> wrote:
> >
> > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the drm-misc tree got a conflict in:
> > >
> > >   Documentation/devicetree/bindings/vendor-prefixes.txt
> > >
> > > between commit:
> > >
> > >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> > >
> > > from Linus' tree and commits:
> > >
> > >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> > >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> > > S9700RTWV43TR-01B")
> > >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision 
> > > Electronics")
> > >
> > > from the drm-misc tree.
> > >
> > > I fixed it up (I deleted the file and added the patch below) and can
> > > carry the fix as necessary. This is now fixed as far as linux-next is
> > > concerned, but any non trivial conflicts should be mentioned to your
> > > upstream maintainer when your tree is submitted for merging.  You may
> > > also want to consider cooperating with the maintainer of the conflicting
> > > tree to minimise any particularly complex conflicts.
> >
> > I just took your patch and pushed a temp branch there:
> > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
> >
> > Rob, Stephen, are you ok with the change? If so, I'll push it.
>
> The 'tfc' line is missing a ':' on the end.

That's on me, sorry.

> Does the file pass dt_binding_check like that?

No, it didn't but I overlooked it somehow. I've pushed that patch with
the extra semi-column.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


signature.asc
Description: PGP signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Rob Herring 
On Thu, May 23, 2019 at 6:54 AM Maxime Ripard  wrote:
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> >
> > from Linus' tree and commits:
> >
> >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> > S9700RTWV43TR-01B")
> >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> >
> > from the drm-misc tree.
> >
> > I fixed it up (I deleted the file and added the patch below) and can
> > carry the fix as necessary. This is now fixed as far as linux-next is
> > concerned, but any non trivial conflicts should be mentioned to your
> > upstream maintainer when your tree is submitted for merging.  You may
> > also want to consider cooperating with the maintainer of the conflicting
> > tree to minimise any particularly complex conflicts.
>
> I just took your patch and pushed a temp branch there:
> https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
>
> Rob, Stephen, are you ok with the change? If so, I'll push it.

The 'tfc' line is missing a ':' on the end. Does the file pass
dt_binding_check like that?

Rob

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Stephen Rothwell 
Hi Daniel,

On Thu, 23 May 2019 15:11:15 +0200 Daniel Vetter  wrote:
>
> That commit is on top of drm-misc, and somehow the .txt version has
> been resurrect in drm-misc-next (so needs to be re-deleted too).

My mistake, the conflict went away (due to the back merge) so my
scripts assumed the file no longer needed deleting.  I didn't actually
check to see if it was still there.

-- 
Cheers,
Stephen Rothwell


pgpkEY83ZjdIJ.pgp
Description: OpenPGP digital signature

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Daniel Vetter 
On Thu, May 23, 2019 at 3:04 PM Stephen Rothwell  wrote:
>
> Hi Maxime,
>
> On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard  
> wrote:
> >
> > On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > >
> > > Today's linux-next merge of the drm-misc tree got a conflict in:
> > >
> > >   Documentation/devicetree/bindings/vendor-prefixes.txt
> > >
> > > between commit:
> > >
> > >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> > >
> > > from Linus' tree and commits:
> > >
> > >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> > >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> > > S9700RTWV43TR-01B")
> > >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision 
> > > Electronics")
> > >
> > > from the drm-misc tree.
> >
> > I just took your patch and pushed a temp branch there:
> > https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
> >
> > Rob, Stephen, are you ok with the change? If so, I'll push it.
>
> All that needs to be done is for my patch (slightly corrected) needs to
> be applied to the drm-misc tree.  That tree already has the back merge
> of Linus' tree and the txt file has been removed (my patch should have
> been applied as part of the merge resolution but doing it later is fine).

That commit is on top of drm-misc, and somehow the .txt version has
been resurrect in drm-misc-next (so needs to be re-deleted too).
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Stephen Rothwell 
Hi Maxime,

On Thu, 23 May 2019 13:53:55 +0200 Maxime Ripard  
wrote:
>
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> >
> > from Linus' tree and commits:
> >
> >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> > S9700RTWV43TR-01B")
> >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> >
> > from the drm-misc tree.
> 
> I just took your patch and pushed a temp branch there:
> https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90
> 
> Rob, Stephen, are you ok with the change? If so, I'll push it.

All that needs to be done is for my patch (slightly corrected) needs to
be applied to the drm-misc tree.  That tree already has the back merge
of Linus' tree and the txt file has been removed (my patch should have
been applied as part of the merge resolution but doing it later is fine).

-- 
Cheers,
Stephen Rothwell


pgpvak0h66Fo7.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Maxime Ripard 
On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
>   Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
>   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
>
> from Linus' tree and commits:
>
>   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
>   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> S9700RTWV43TR-01B")
>   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
>
> from the drm-misc tree.
>
> I fixed it up (I deleted the file and added the patch below) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

I just took your patch and pushed a temp branch there:
https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git/commit/?h=drm-misc-next=3832f2cad5307ebcedeead13fbd8d3cf06ba5e90

Rob, Stephen, are you ok with the change? If so, I'll push it.

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


signature.asc
Description: PGP signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Stephen Rothwell 
Hi Maxime,

On Thu, 23 May 2019 10:10:22 +0200 Maxime Ripard  
wrote:
>
> Hi Stephen,
> 
> On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the drm-misc tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/vendor-prefixes.txt
> >
> > between commit:
> >
> >   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> >
> > from Linus' tree and commits:
> >
> >   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
> >   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> > S9700RTWV43TR-01B")
> >   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> >
> > from the drm-misc tree.
> >
> > I fixed it up (I deleted the file and added the patch below) and can
> > carry the fix as necessary. This is now fixed as far as linux-next is
> > concerned, but any non trivial conflicts should be mentioned to your
> > upstream maintainer when your tree is submitted for merging.  You may
> > also want to consider cooperating with the maintainer of the conflicting
> > tree to minimise any particularly complex conflicts.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > From: Stephen Rothwell 
> > Date: Tue, 21 May 2019 10:48:36 +1000
> > Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion
> >
> > Signed-off-by: Stephen Rothwell 
> > ---
> >  Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml 
> > b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > index 83ca4816a78b..749e3c3843d0 100644
> > --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> > @@ -287,6 +287,8 @@ patternProperties:
> >  description: Everest Semiconductor Co. Ltd.
> >"^everspin,.*":
> >  description: Everspin Technologies, Inc.
> > +  "^evervision,.*":
> > +description: Evervision Electronics Co. Ltd.
> >"^exar,.*":
> >  description: Exar Corporation
> >"^excito,.*":
> > @@ -851,6 +853,8 @@ patternProperties:
> >  description: Shenzhen Techstar Electronics Co., Ltd.
> >"^terasic,.*":
> >  description: Terasic Inc.
> > +  "^tfc,.*":
> > +description: Three Five Corp
> >"^thine,.*":
> >  description: THine Electronics, Inc.
> >"^ti,.*":
> > @@ -925,6 +929,8 @@ patternProperties:
> >  description: Voipac Technologies s.r.o.
> >"^vot,.*":
> >  description: Vision Optical Technology Co., Ltd.
> > +  "^vxt,.*"
> > +description: VXT Ltd  
> 
> I'm not sure whether or not you can change it, but this breaks the
> users of that file.
> 
> What you want is:
> 
> - "^vxt,.*"
> + "^vxt,.*:"

I have fixed my version (but I put the ':' after the '"' like the
others).

Thanks for letting me know.
-- 
Cheers,
Stephen Rothwell


pgp4z66cZ0pdv.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-23 Thread Maxime Ripard 
Hi Stephen,

On Tue, May 21, 2019 at 10:51:51AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
>   Documentation/devicetree/bindings/vendor-prefixes.txt
>
> between commit:
>
>   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
>
> from Linus' tree and commits:
>
>   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
>   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> S9700RTWV43TR-01B")
>   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
>
> from the drm-misc tree.
>
> I fixed it up (I deleted the file and added the patch below) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> From: Stephen Rothwell 
> Date: Tue, 21 May 2019 10:48:36 +1000
> Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion
>
> Signed-off-by: Stephen Rothwell 
> ---
>  Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++
>  1 file changed, 6 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml 
> b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 83ca4816a78b..749e3c3843d0 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -287,6 +287,8 @@ patternProperties:
>  description: Everest Semiconductor Co. Ltd.
>"^everspin,.*":
>  description: Everspin Technologies, Inc.
> +  "^evervision,.*":
> +description: Evervision Electronics Co. Ltd.
>"^exar,.*":
>  description: Exar Corporation
>"^excito,.*":
> @@ -851,6 +853,8 @@ patternProperties:
>  description: Shenzhen Techstar Electronics Co., Ltd.
>"^terasic,.*":
>  description: Terasic Inc.
> +  "^tfc,.*":
> +description: Three Five Corp
>"^thine,.*":
>  description: THine Electronics, Inc.
>"^ti,.*":
> @@ -925,6 +929,8 @@ patternProperties:
>  description: Voipac Technologies s.r.o.
>"^vot,.*":
>  description: Vision Optical Technology Co., Ltd.
> +  "^vxt,.*"
> +description: VXT Ltd

I'm not sure whether or not you can change it, but this breaks the
users of that file.

What you want is:

- "^vxt,.*"
+ "^vxt,.*:"

Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com


signature.asc
Description: PGP signature

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2019-05-22 Thread Stephen Rothwell 
Hi Sean,

On Tue, 21 May 2019 10:51:51 +1000 Stephen Rothwell  
wrote:
> 
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   Documentation/devicetree/bindings/vendor-prefixes.txt
> 
> between commit:
> 
>   8122de54602e ("dt-bindings: Convert vendor prefixes to json-schema")
> 
> from Linus' tree and commits:
> 
>   b4a2c0055a4f ("dt-bindings: Add vendor prefix for VXT Ltd")
>   b1b0d36bdb15 ("dt-bindings: drm/panel: simple: Add binding for TFC 
> S9700RTWV43TR-01B")
>   fbd8b69ab616 ("dt-bindings: Add vendor prefix for Evervision Electronics")
> 
> from the drm-misc tree.
> 
> I fixed it up (I deleted the file and added the patch below) and can
> carry the fix as necessary. This is now fixed as far as linux-next is
> concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> From: Stephen Rothwell 
> Date: Tue, 21 May 2019 10:48:36 +1000
> Subject: [PATCH] dt-bindings: fix up for vendor prefixes file conversion
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 ++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml 
> b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 83ca4816a78b..749e3c3843d0 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -287,6 +287,8 @@ patternProperties:
>  description: Everest Semiconductor Co. Ltd.
>"^everspin,.*":
>  description: Everspin Technologies, Inc.
> +  "^evervision,.*":
> +description: Evervision Electronics Co. Ltd.
>"^exar,.*":
>  description: Exar Corporation
>"^excito,.*":
> @@ -851,6 +853,8 @@ patternProperties:
>  description: Shenzhen Techstar Electronics Co., Ltd.
>"^terasic,.*":
>  description: Terasic Inc.
> +  "^tfc,.*":
> +description: Three Five Corp
>"^thine,.*":
>  description: THine Electronics, Inc.
>"^ti,.*":
> @@ -925,6 +929,8 @@ patternProperties:
>  description: Voipac Technologies s.r.o.
>"^vot,.*":
>  description: Vision Optical Technology Co., Ltd.
> +  "^vxt,.*"
> +description: VXT Ltd
>"^wd,.*":
>  description: Western Digital Corp.
>"^wetek,.*":
> -- 
> 2.20.1

In doing a back merge of Linus' tree into the drm-misc tree, you seem
to have missed the above merge fixup and so lost some of the changes
from the above commits.

-- 
Cheers,
Stephen Rothwell


pgpz8b3Dzr4Fa.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2018-03-22 Thread Stephen Rothwell 
Hi all,

On Thu, 15 Mar 2018 14:14:25 +1100 Stephen Rothwell  
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   sound/pci/hda/hda_intel.c
> 
> between commits:
> 
>   1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist")
>   40088dc4e1ea ("ALSA: hda - Revert power_save option default value")
> 
> from Linus' tree and commit:
> 
>   07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller")
> 
> from the drm-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc sound/pci/hda/hda_intel.c
> index d5017adf9feb,ec4e6b829ee2..
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@@ -2219,8 -2201,8 +2223,9 @@@ static int azx_probe_continue(struct az
>   struct hda_intel *hda = container_of(chip, struct hda_intel, chip);
>   struct hdac_bus *bus = azx_bus(chip);
>   struct pci_dev *pci = chip->pci;
> + struct hda_codec *codec;
>   int dev = chip->dev_index;
>  +int val;
>   int err;
>   
>   hda->probe_continued = 1;
> @@@ -2302,21 -2284,16 +2307,30 @@@
>   chip->running = 1;
>   azx_add_card_list(chip);
>   
>  +val = power_save;
>  +#ifdef CONFIG_PM
>  +if (pm_blacklist) {
>  +const struct snd_pci_quirk *q;
>  +
>  +q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist);
>  +if (q && val) {
>  +dev_info(chip->card->dev, "device %04x:%04x is on the 
> power_save blacklist, forcing power_save to 0\n",
>  + q->subvendor, q->subdevice);
>  +val = 0;
>  +}
>  +}
>  +#endif /* CONFIG_PM */
> ++
> + /*
> +  * The discrete GPU cannot power down unless the HDA controller runtime
> +  * suspends, so activate runtime PM on codecs even if power_save == 0.
> +  */
> + if (use_vga_switcheroo(hda))
> + list_for_each_codec(codec, >bus)
> + codec->auto_runtime_pm = 1;
> + 
>  -snd_hda_set_power_save(>bus, power_save * 1000);
>  +snd_hda_set_power_save(>bus, val * 1000);
> - if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo)
> + if (azx_has_pm_runtime(chip))
>   pm_runtime_put_autosuspend(>dev);
>   
>   out_free:

This is now a conflict between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell


pgpVwyFC7Hh8N.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2018-03-22 Thread Stephen Rothwell 
Hi all,

On Tue, 20 Mar 2018 12:08:41 +1100 Stephen Rothwell  
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/sun4i/sun4i_tcon.h
> 
> between commit:
> 
>   e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit")
> 
> from Linus' tree and commit:
> 
>   6664e9dc5383 ("drm/sun4i: Add support for A80 TCONs")
> 
> from the drm-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/gpu/drm/sun4i/sun4i_tcon.h
> index abdc6ad6b384,d3a945b7bb60..
> --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h
> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
> @@@ -176,7 -176,7 +176,8 @@@ struct sun4i_tcon_quirks 
>   boolhas_channel_1;  /* a33 does not have channel 1 */
>   boolhas_lvds_alt;   /* Does the LVDS clock have a parent other than 
> the TCON clock? */
>   boolneeds_de_be_mux; /* sun6i needs mux to select backend */
>  +boolsupports_lvds;   /* Does the TCON support an LVDS output? */
> + boolneeds_edp_reset; /* a80 edp reset needed for tcon0 access */
>   
>   /* callback to handle tcon muxing options */
>   int (*set_mux)(struct sun4i_tcon *, const struct drm_encoder *);

This is now a conflict between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell


pgpXJr4p50Ivt.pgp
Description: OpenPGP digital signature
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: manual merge of the drm-misc tree with Linus' tree

2017-08-09 Thread Stephen Rothwell 
Hi Dave,

On Wed, 2 Aug 2017 12:23:06 +1000 Stephen Rothwell  
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
> 
>   drivers/gpu/drm/nouveau/nv50_display.c
> 
> between commit:
> 
>   4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to 
> modeset actions")
> 
> from Linus' tree and commit:
> 
>   3c847d6cdadb ("drm/nouveau: Convert nouveau to use new iterator macros, 
> v2.")
> 
> from the drm-misc tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non
> trivial conflicts should be mentioned to your upstream maintainer when
> your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/gpu/drm/nouveau/nv50_display.c
> index 9d40b2a8be4d,bd1199b67eb4..
> --- a/drivers/gpu/drm/nouveau/nv50_display.c
> +++ b/drivers/gpu/drm/nouveau/nv50_display.c
> @@@ -3941,8 -3933,6 +3942,8 @@@ nv50_disp_atomic_commit_tail(struct drm
>   
>   NV_ATOMIC(drm, "%s: clr %04x (set %04x)\n", crtc->name,
> asyh->clr.mask, asyh->set.mask);
> - if (crtc_state->active && !asyh->state.active)
> ++if (new_crtc_state->active && !asyh->state.active)
>  +drm_crtc_vblank_off(crtc);
>   
>   if (asyh->clr.mask) {
>   nv50_head_flush_clr(head, asyh, atom->flush_disable);
> @@@ -4028,13 -4018,11 +4029,13 @@@
>   nv50_head_flush_set(head, asyh);
>   interlock_core = 1;
>   }
>  -}
>   
>  -for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
>  -if (new_crtc_state->event)
>  -drm_crtc_vblank_get(crtc);
>  +if (asyh->state.active) {
> - if (!crtc_state->active)
> ++if (!new_crtc_state->active)
>  +drm_crtc_vblank_on(crtc);
>  +if (asyh->state.event)
>  +drm_crtc_vblank_get(crtc);
>  +}
>   }
>   
>   /* Update plane(s). */
> @@@ -4077,18 -4065,16 +4078,18 @@@
>   NV_ERROR(drm, "%s: timeout\n", plane->name);
>   }
>   
> - for_each_crtc_in_state(state, crtc, crtc_state, i) {
> - if (crtc->state->event) {
> + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) {
> + if (new_crtc_state->event) {
>   unsigned long flags;
>   /* Get correct count/ts if racing with vblank irq */
>  -drm_crtc_accurate_vblank_count(crtc);
>  +if (crtc->state->active)
>  +drm_crtc_accurate_vblank_count(crtc);
>   spin_lock_irqsave(>dev->event_lock, flags);
> - drm_crtc_send_vblank_event(crtc, crtc->state->event);
> + drm_crtc_send_vblank_event(crtc, new_crtc_state->event);
>   spin_unlock_irqrestore(>dev->event_lock, flags);
> - crtc->state->event = NULL;
> + new_crtc_state->event = NULL;
>  -drm_crtc_vblank_put(crtc);
>  +if (crtc->state->active)
>  +drm_crtc_vblank_put(crtc);
>   }
>   }
>   

This conflict is now between the drm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel