diff mbox

linux-next: build failures after merge of the drm tree

Message ID 20140805130926.4e8c8fe5@canb.auug.org.au (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Rothwell Aug. 5, 2014, 3:09 a.m. UTC
Hi Dave,

After merging the drm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "drm_sysfs_connector_remove" [drivers/gpu/drm/i2c/tda998x.ko] undefined!
ERROR: "drm_sysfs_connector_add" [drivers/gpu/drm/i2c/tda998x.ko] undefined!

Caused by commit c707c3619ca8 ("drm/i2c: tda998x: add component
support") interacting with commit 34ea3d386347 ("drm: add register and
unregister functions for connectors").  Maybe it should have been fixed
up in the merge commit 920f946428b7 ("Merge branch 'tda998x-devel' of
git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next")?

I reverted commit c707c3619ca8 for today.

But then the arm multi_v7_defconfig build produced these errors:

ERROR (phandle_references): Reference to non-existent node or label "disp_pd"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/exynos5420-arndale-octa.dtb] Error 2
make[2]: *** Waiting for unfinished jobs....
ERROR (phandle_references): Reference to non-existent node or label "disp_pd"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/exynos5420-smdk5420.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "disp_pd"

ERROR: Input tree has errors, aborting (use -f to force output)
ERROR (phandle_references): Reference to non-existent node or label "disp_pd"

make[2]: *** [arch/arm/boot/dts/exynos5800-peach-pi.dtb] Error 2
ERROR: Input tree has errors, aborting (use -f to force output)

Caused by commit 5a8da524049c ("ARM: dts: exynos5420: add dsi node")
interacting with commit d51cad7df871 ("ARM: dts: remove display power
domain for exynos5420") from the arm-soc tree.

I applied this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 5 Aug 2014 13:03:01 +1000
Subject: [PATCH] ARM: dts: exynos5420: remove disp_pd

per comit d51cad7df871 ("ARM: dts: remove display power
domain for exynos5420").

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/boot/dts/exynos5420.dtsi | 1 -
 1 file changed, 1 deletion(-)

Comments

Dave Airlie Aug. 5, 2014, 4:20 a.m. UTC | #1
> Hi Dave,
> 
> After merging the drm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "drm_sysfs_connector_remove" [drivers/gpu/drm/i2c/tda998x.ko] undefined!
> ERROR: "drm_sysfs_connector_add" [drivers/gpu/drm/i2c/tda998x.ko] undefined!
> 

I've fixed this, caught it myself a few mins after push,

The other I'm not sure about, I'll hope the exynos guys know what is going 
on.

Thanks,
Dave.
YoungJun Cho Aug. 5, 2014, 6:02 a.m. UTC | #2
Hi Stephen and Dave,

On 08/05/2014 12:09 PM, Stephen Rothwell wrote:
> Hi Dave,
>
> After merging the drm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "drm_sysfs_connector_remove" [drivers/gpu/drm/i2c/tda998x.ko] undefined!
> ERROR: "drm_sysfs_connector_add" [drivers/gpu/drm/i2c/tda998x.ko] undefined!
>
> Caused by commit c707c3619ca8 ("drm/i2c: tda998x: add component
> support") interacting with commit 34ea3d386347 ("drm: add register and
> unregister functions for connectors").  Maybe it should have been fixed
> up in the merge commit 920f946428b7 ("Merge branch 'tda998x-devel' of
> git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next")?
>
> I reverted commit c707c3619ca8 for today.
>
> But then the arm multi_v7_defconfig build produced these errors:
>
> ERROR (phandle_references): Reference to non-existent node or label "disp_pd"
>
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [arch/arm/boot/dts/exynos5420-arndale-octa.dtb] Error 2
> make[2]: *** Waiting for unfinished jobs....
> ERROR (phandle_references): Reference to non-existent node or label "disp_pd"
>
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [arch/arm/boot/dts/exynos5420-smdk5420.dtb] Error 2
> ERROR (phandle_references): Reference to non-existent node or label "disp_pd"
>
> ERROR: Input tree has errors, aborting (use -f to force output)
> ERROR (phandle_references): Reference to non-existent node or label "disp_pd"
>
> make[2]: *** [arch/arm/boot/dts/exynos5800-peach-pi.dtb] Error 2
> ERROR: Input tree has errors, aborting (use -f to force output)
>
> Caused by commit 5a8da524049c ("ARM: dts: exynos5420: add dsi node")
> interacting with commit d51cad7df871 ("ARM: dts: remove display power
> domain for exynos5420") from the arm-soc tree.
>

I missed the patch "ARM: dts: remove display power domain for 
exynos5420" in linux-samsung-soc mail thread.

In my test without power domain property, the exynos5420 dsi master 
driver works well.

> I applied this merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 5 Aug 2014 13:03:01 +1000
> Subject: [PATCH] ARM: dts: exynos5420: remove disp_pd
>
> per comit d51cad7df871 ("ARM: dts: remove display power
> domain for exynos5420").
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   arch/arm/boot/dts/exynos5420.dtsi | 1 -
>   1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
> index 95ec37dff3e8..bfe056d9148c 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -525,7 +525,6 @@
>   		compatible = "samsung,exynos5410-mipi-dsi";
>   		reg = <0x14500000 0x10000>;
>   		interrupts = <0 82 0>;
> -		samsung,power-domain = <&disp_pd>;
>   		phys = <&mipi_phy 1>;
>   		phy-names = "dsim";
>   		clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;
>

Tested-by: YoungJun Cho <yj44.cho@samsung.com>

Thank you.
Best regards YJ
Olof Johansson Aug. 8, 2014, 9:40 p.m. UTC | #3
On Mon, Aug 4, 2014 at 11:02 PM, YoungJun Cho <yj44.cho@samsung.com> wrote:
> Hi Stephen and Dave,
>
>
> On 08/05/2014 12:09 PM, Stephen Rothwell wrote:
>>
>> Hi Dave,
>>
>> After merging the drm tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> ERROR: "drm_sysfs_connector_remove" [drivers/gpu/drm/i2c/tda998x.ko]
>> undefined!
>> ERROR: "drm_sysfs_connector_add" [drivers/gpu/drm/i2c/tda998x.ko]
>> undefined!
>>
>> Caused by commit c707c3619ca8 ("drm/i2c: tda998x: add component
>> support") interacting with commit 34ea3d386347 ("drm: add register and
>> unregister functions for connectors").  Maybe it should have been fixed
>> up in the merge commit 920f946428b7 ("Merge branch 'tda998x-devel' of
>> git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next")?
>>
>> I reverted commit c707c3619ca8 for today.
>>
>> But then the arm multi_v7_defconfig build produced these errors:
>>
>> ERROR (phandle_references): Reference to non-existent node or label
>> "disp_pd"
>>
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> make[2]: *** [arch/arm/boot/dts/exynos5420-arndale-octa.dtb] Error 2
>> make[2]: *** Waiting for unfinished jobs....
>> ERROR (phandle_references): Reference to non-existent node or label
>> "disp_pd"
>>
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> make[2]: *** [arch/arm/boot/dts/exynos5420-smdk5420.dtb] Error 2
>> ERROR (phandle_references): Reference to non-existent node or label
>> "disp_pd"
>>
>> ERROR: Input tree has errors, aborting (use -f to force output)
>> ERROR (phandle_references): Reference to non-existent node or label
>> "disp_pd"
>>
>> make[2]: *** [arch/arm/boot/dts/exynos5800-peach-pi.dtb] Error 2
>> ERROR: Input tree has errors, aborting (use -f to force output)
>>
>> Caused by commit 5a8da524049c ("ARM: dts: exynos5420: add dsi node")
>> interacting with commit d51cad7df871 ("ARM: dts: remove display power
>> domain for exynos5420") from the arm-soc tree.
>>
>
> I missed the patch "ARM: dts: remove display power domain for exynos5420" in
> linux-samsung-soc mail thread.
>
> In my test without power domain property, the exynos5420 dsi master driver
> works well.
>
>
>> I applied this merge fix patch:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 5 Aug 2014 13:03:01 +1000
>> Subject: [PATCH] ARM: dts: exynos5420: remove disp_pd
>>
>> per comit d51cad7df871 ("ARM: dts: remove display power
>> domain for exynos5420").
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>>   arch/arm/boot/dts/exynos5420.dtsi | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/exynos5420.dtsi
>> b/arch/arm/boot/dts/exynos5420.dtsi
>> index 95ec37dff3e8..bfe056d9148c 100644
>> --- a/arch/arm/boot/dts/exynos5420.dtsi
>> +++ b/arch/arm/boot/dts/exynos5420.dtsi
>> @@ -525,7 +525,6 @@
>>                 compatible = "samsung,exynos5410-mipi-dsi";
>>                 reg = <0x14500000 0x10000>;
>>                 interrupts = <0 82 0>;
>> -               samsung,power-domain = <&disp_pd>;
>>                 phys = <&mipi_phy 1>;
>>                 phy-names = "dsim";
>>                 clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;
>>
>
> Tested-by: YoungJun Cho <yj44.cho@samsung.com>

Sigh, now Linus' tree is broken because of this because nobody picked it up.

Dave, can you revert the original change, please? (5a8da524049c).

DTS changes like these shouldn't go through driver trees in the first place. :(


-Olof
Olof Johansson Aug. 9, 2014, 3:27 p.m. UTC | #4
On Fri, Aug 8, 2014 at 2:40 PM, Olof Johansson <olof@lixom.net> wrote:
> On Mon, Aug 4, 2014 at 11:02 PM, YoungJun Cho <yj44.cho@samsung.com> wrote:
>> Hi Stephen and Dave,
>>
>>
>> On 08/05/2014 12:09 PM, Stephen Rothwell wrote:
>>>
>>> Hi Dave,
>>>
>>> After merging the drm tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> ERROR: "drm_sysfs_connector_remove" [drivers/gpu/drm/i2c/tda998x.ko]
>>> undefined!
>>> ERROR: "drm_sysfs_connector_add" [drivers/gpu/drm/i2c/tda998x.ko]
>>> undefined!
>>>
>>> Caused by commit c707c3619ca8 ("drm/i2c: tda998x: add component
>>> support") interacting with commit 34ea3d386347 ("drm: add register and
>>> unregister functions for connectors").  Maybe it should have been fixed
>>> up in the merge commit 920f946428b7 ("Merge branch 'tda998x-devel' of
>>> git://ftp.arm.linux.org.uk/~rmk/linux-cubox into drm-next")?
>>>
>>> I reverted commit c707c3619ca8 for today.
>>>
>>> But then the arm multi_v7_defconfig build produced these errors:
>>>
>>> ERROR (phandle_references): Reference to non-existent node or label
>>> "disp_pd"
>>>
>>> ERROR: Input tree has errors, aborting (use -f to force output)
>>> make[2]: *** [arch/arm/boot/dts/exynos5420-arndale-octa.dtb] Error 2
>>> make[2]: *** Waiting for unfinished jobs....
>>> ERROR (phandle_references): Reference to non-existent node or label
>>> "disp_pd"
>>>
>>> ERROR: Input tree has errors, aborting (use -f to force output)
>>> make[2]: *** [arch/arm/boot/dts/exynos5420-smdk5420.dtb] Error 2
>>> ERROR (phandle_references): Reference to non-existent node or label
>>> "disp_pd"
>>>
>>> ERROR: Input tree has errors, aborting (use -f to force output)
>>> ERROR (phandle_references): Reference to non-existent node or label
>>> "disp_pd"
>>>
>>> make[2]: *** [arch/arm/boot/dts/exynos5800-peach-pi.dtb] Error 2
>>> ERROR: Input tree has errors, aborting (use -f to force output)
>>>
>>> Caused by commit 5a8da524049c ("ARM: dts: exynos5420: add dsi node")
>>> interacting with commit d51cad7df871 ("ARM: dts: remove display power
>>> domain for exynos5420") from the arm-soc tree.
>>>
>>
>> I missed the patch "ARM: dts: remove display power domain for exynos5420" in
>> linux-samsung-soc mail thread.
>>
>> In my test without power domain property, the exynos5420 dsi master driver
>> works well.
>>
>>
>>> I applied this merge fix patch:
>>>
>>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>>> Date: Tue, 5 Aug 2014 13:03:01 +1000
>>> Subject: [PATCH] ARM: dts: exynos5420: remove disp_pd
>>>
>>> per comit d51cad7df871 ("ARM: dts: remove display power
>>> domain for exynos5420").
>>>
>>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>>> ---
>>>   arch/arm/boot/dts/exynos5420.dtsi | 1 -
>>>   1 file changed, 1 deletion(-)
>>>
>>> diff --git a/arch/arm/boot/dts/exynos5420.dtsi
>>> b/arch/arm/boot/dts/exynos5420.dtsi
>>> index 95ec37dff3e8..bfe056d9148c 100644
>>> --- a/arch/arm/boot/dts/exynos5420.dtsi
>>> +++ b/arch/arm/boot/dts/exynos5420.dtsi
>>> @@ -525,7 +525,6 @@
>>>                 compatible = "samsung,exynos5410-mipi-dsi";
>>>                 reg = <0x14500000 0x10000>;
>>>                 interrupts = <0 82 0>;
>>> -               samsung,power-domain = <&disp_pd>;
>>>                 phys = <&mipi_phy 1>;
>>>                 phy-names = "dsim";
>>>                 clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;
>>>
>>
>> Tested-by: YoungJun Cho <yj44.cho@samsung.com>
>
> Sigh, now Linus' tree is broken because of this because nobody picked it up.
>
> Dave, can you revert the original change, please? (5a8da524049c).
>
> DTS changes like these shouldn't go through driver trees in the first place. :(

Still no reply? I'm including the above patch in my current set of fixes.


-Olof
Dave Airlie Aug. 10, 2014, 7:58 a.m. UTC | #5
> 

Been on holidays, but ack for anything DT related,

Look I wishI knew how DT worked, and what tree is canonical for changes to 
it, I'm not sure its well defined enough or sub maintaniers know enough, 
so I do just trust the exynos guys with this.

Dave.
Sachin Kamat Aug. 11, 2014, 3:56 a.m. UTC | #6
On Sun, Aug 10, 2014 at 1:28 PM, Dave Airlie <airlied@linux.ie> wrote:
>>
>
> Been on holidays, but ack for anything DT related,
>
> Look I wishI knew how DT worked, and what tree is canonical for changes to
> it, I'm not sure its well defined enough or sub maintaniers know enough,
> so I do just trust the exynos guys with this.
>

Inki,

Can you please get your tree included in linux-next so that these kind of issues
could be detected much earlier (even before they hit Dave's tree)?
Russell King - ARM Linux Aug. 11, 2014, 10 a.m. UTC | #7
On Mon, Aug 11, 2014 at 09:26:00AM +0530, Sachin Kamat wrote:
> On Sun, Aug 10, 2014 at 1:28 PM, Dave Airlie <airlied@linux.ie> wrote:
> >>
> >
> > Been on holidays, but ack for anything DT related,
> >
> > Look I wishI knew how DT worked, and what tree is canonical for changes to
> > it, I'm not sure its well defined enough or sub maintaniers know enough,
> > so I do just trust the exynos guys with this.
> >
> 
> Inki,
> 
> Can you please get your tree included in linux-next so that these kind of
> issues could be detected much earlier (even before they hit Dave's tree)?

The answer is not always "stuff your tree into linux-next", but it can
be "learn what's required of maintaining a git tree and/or patch sets".

arm-soc people have asked for a long time that DT updates should go via
themselves rather than through subsystem trees because conflicts there
are rather horrid to deal with, and it's very easy for things to end up
getting out of hand.

Moreover, stuffing a tree into linux-next can cause more harm than good
if the tree owner does not respect the kernel development cycle.  For
example, I notice today that we have new breakage which has appeared in
linux-next which seems to be a change which was never even _compile
tested_ before it was became visible to linux-next, because builds
complain about misplaced ";" and "}".

linux-next is not a build-testing tree; it is an integration tree - it's
there to help tree maintainers find /conflicts/ between their development
trees and resolve those conflicts.  It is not a subsitute for proper
compile testing, it is also not a subsitute for talking to your fellow
developers, and it certainly is not a subsitute for knowing where in the
kernel development cycle things are and knowing what the implications of
that mean for linux-next (and if your tree is part of linux-next, what
it will also mean for /your/ tree.)
diff mbox

Patch

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 95ec37dff3e8..bfe056d9148c 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -525,7 +525,6 @@ 
 		compatible = "samsung,exynos5410-mipi-dsi";
 		reg = <0x14500000 0x10000>;
 		interrupts = <0 82 0>;
-		samsung,power-domain = <&disp_pd>;
 		phys = <&mipi_phy 1>;
 		phy-names = "dsim";
 		clocks = <&clock CLK_DSIM1>, <&clock CLK_SCLK_MIPI1>;