Skip to contentSkip to conversation

drm-intel/for-linux-next disabled on linux-next?

DISCUSSION Rodrigo Vivi 3 participants 6 messages Dec 6, 2017 – Dec 8, 2017

lore
Share & tools
lore
#0 lore raw

Hi Stephen,

We noticed that drm-intel/for-linux-next is currently disabled on linux-next.

I wonder if it has to do with the compilation error we had yesterday night (enum plane related). Was it the case?

Our solution on drm-tip was to fix at drm-rerere side when building the branches so we don't break nor are forced to mix drm-misc-next with drm-intel-next-queued.

Solution is:

+-      enum plane plane;
++      enum i9xx_plane_id plane;

https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~

So the ideal is to apply this when merging drm-intel/for-linux-next now.

Please let us know if there is anything else we might be missing.

Thanks,
Rodrigo.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#1 lore raw

Hi Rodrigo,

Quoted 3 lines · On Tue, 5 Dec 2017 17:19:21 -0800 Rodrigo Vivi <[email protected]> wrote:

We noticed that drm-intel/for-linux-next is currently disabled on linux-next.

What gave you that idea?

Quoted 7 lines

I wonder if it has to do with the compilation error we had yesterday night (enum plane related). Was it the case?

Our solution on drm-tip was to fix at drm-rerere side when building the branches so we don't break nor are forced to mix drm-misc-next with drm-intel-next-queued.

Quoted 7 lines

Solution is:

+-      enum plane plane;
++      enum i9xx_plane_id plane;

https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~

So the ideal is to apply this when merging drm-intel/for-linux-next now.

See my email earlier today which addresses exactly this.

Signature · 6 lines
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

On Dec 5, 2017, at 6:11 PM, Stephen Rothwell <[email protected]<mailto:[email protected]>> wrote:

Hi Rodrigo,

On Tue, 5 Dec 2017 17:19:21 -0800 Rodrigo Vivi <[email protected]<mailto:[email protected]>> wrote:

We noticed that drm-intel/for-linux-next is currently disabled on linux-next.

What gave you that idea?

Daniel noticed this morning and warned me that he had seen linux-next didn’t have our stuff merged yet...
I put a note on my todo list and by the end of the day I checked myself and it was still the case... but probably right before you did the fix-up.

I wonder if it has to do with the compilation error we had yesterday night (enum plane related). Was it the case?

Our solution on drm-tip was to fix at drm-rerere side when building the branches so we don't break nor are forced to mix drm-misc-next with drm-intel-next-queued.

Solution is:

+-      enum plane plane;
++      enum i9xx_plane_id plane;

https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~

So the ideal is to apply this when merging drm-intel/for-linux-next now.

See my email earlier today which addresses exactly this.

Yeap.. I saw your email right after sending this...

Thanks,
Rodrigo

--
Cheers,
Stephen Rothwell

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
In reply to Stephen Rothwell
Quoted 8 lines · Stephen Rothwell

Hi Rodrigo,

Quoted 3 lines · On Tue, 5 Dec 2017 17:19:21 -0800 Rodrigo Vivi <[email protected]> wrote:

We noticed that drm-intel/for-linux-next is currently disabled on linux-next.

What gave you that idea?

next-20171205 didn't have any of the patches in drm-intel/for-linux-next that weren't already in the drm-next branch. My for-linux-next was at

commit 39ccc9852e2b46964c9c44eba52db57413ba6d27 (HEAD -> drm-intel-next-queued)

Author: Anusha Srivatsa <[email protected]>
Date:   Thu Nov 9 17:18:32 2017 -0800

drm/i915/skl: DMC firmware for skylake v1.27

when I did that check. The linux-next you just pushed out has it all again.

We realized that because our CI noticed a lockdep splat in linux-next that we've fixed a few days ago already ...
-Daniel

Quoted 25 lines
Quoted 8 lines

I wonder if it has to do with the compilation error we had yesterday night (enum plane related). Was it the case?

Our solution on drm-tip was to fix at drm-rerere side when building the branches so we don't break nor are forced to mix drm-misc-next with drm-intel-next-queued.

Quoted 7 lines

Solution is:

+-      enum plane plane;
++      enum i9xx_plane_id plane;

https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~

So the ideal is to apply this when merging drm-intel/for-linux-next now.

See my email earlier today which addresses exactly this.

Signature · 6 lines
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

Hi Daniel,

Quoted 4 lines · On Wed, 6 Dec 2017 10:52:05 +0100 Daniel Vetter <[email protected]> wrote:

next-20171205 didn't have any of the patches in drm-intel/for-linux-next that weren't already in the drm-next branch. My for-linux-next was at

Quoted 8 lines

commit 39ccc9852e2b46964c9c44eba52db57413ba6d27 (HEAD -> drm-intel-next-queued)

Author: Anusha Srivatsa <[email protected]>
Date:   Thu Nov 9 17:18:32 2017 -0800

drm/i915/skl: DMC firmware for skylake v1.27

when I did that check. The linux-next you just pushed out has it all again.

I fetch your tree every morning and several times during the day (up until the point it gets merged), so I have no idea what happened. You do remember that I am in a very different time zone, right?

Just in case, I am fetching the for-linux-next-fixes and for-linux-next branches of git://anongit.freedesktop.org/drm-intel

Signature · 6 lines
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 16 lines · Stephen Rothwell

Hi Daniel,

Quoted 4 lines · On Wed, 6 Dec 2017 10:52:05 +0100 Daniel Vetter <[email protected]> wrote:

next-20171205 didn't have any of the patches in drm-intel/for-linux-next that weren't already in the drm-next branch. My for-linux-next was at

Quoted 8 lines

commit 39ccc9852e2b46964c9c44eba52db57413ba6d27 (HEAD -> drm-intel-next-queued)

Author: Anusha Srivatsa <[email protected]>
Date:   Thu Nov 9 17:18:32 2017 -0800

drm/i915/skl: DMC firmware for skylake v1.27

when I did that check. The linux-next you just pushed out has it all again.

Quoted 6 lines

I fetch your tree every morning and several times during the day (up until the point it gets merged), so I have no idea what happened. You do remember that I am in a very different time zone, right?

Just in case, I am fetching the for-linux-next-fixes and for-linux-next branches of git://anongit.freedesktop.org/drm-intel

Yeah, that's all clear. Just wondered what happened, since the tree had patches for a while, at least afaics. Oh well, no harm done, and it's all back in working order.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx