[Intel-gfx] Could you merge the tsc patches directly from Len Brown's public repo?
Daniel Vetter
daniel.vetter at ffwll.ch
Fri Apr 29 09:09:40 UTC 2016
Hi all,
Since these tsc fixes blew up once already pretty bad I don't want to
rush things. 4.7 merge window is also rather close, and then we'll
sync up with whatever is in Len's tree. If there's still trouble after
that, then we can take another look at cherry-picking patches over.
But yeah I don't like to cherry-pick and then be greeted with fireworks.
-Daniel
On Fri, Apr 29, 2016 at 7:02 AM, Lu, Han <han.lu at intel.com> wrote:
> Hi Len, Daniel, Jani,
>
> Keqiao has validated the 8 patches can fix the pulseaudio issues on APL.
> As soon as the 9 patches have been in Ingo's repo, it may difficult to revert
> 540cc882de7d1da2e71591e215f0e04cb89883fa.
> So can we follow the process below:
>
> 1. Daniel and Jani help to cherry-pick other 8 commits:
> Repo: https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
> Branch: x86
> Commit id (begin from earliest):
> 6e0c25e64e0fb65a42dfc63ad5f660302e07cd87
> 16caa2834b2f08cdfd130baa490c45822edef256
> ce5c7b5eaad93c7b0043a7509eec319fe0a0e8a0
> ca376a9909f1151484854c46dc7f01be6d6d9bdb
> 4a62ba36cf4fb77ea35dee1f5992e0e7c48dad14
> (ignore this commit: 540cc882de7d1da2e71591e215f0e04cb89883fa)
> 433f82c8ab3fcaa7ff3b852d01cc74dbdf6d94f1
> 65ae86d4fa3473d24445ea402b190e4b4342172e
> 3152b94afb8c27595f9b1bfa67885015cb569ba2
> 2. Len help to work out a patch to fix the SandyBridge hang, and upstream with
> the 9 patches;
> 3. Daniel and Jani help to merge the (9+1) tsc patches from upstream to drm-intel
> repo, and discard the 8 patches cherry-picked in step 1.
>
> BR,
> Han Lu
>
>
>> -----Original Message-----
>> From: Chen, Yu C
>> Sent: Friday, April 29, 2016 9:43 AM
>> To: Lu, Han <han.lu at intel.com>; 'Ville Syrjälä' <ville.syrjala at linux.intel.com>;
>> Brown, Len <len.brown at intel.com>
>> Cc: 'Daniel Vetter' <daniel.vetter at ffwll.ch>; Nikula, Jani
>> <jani.nikula at intel.com>; Lin, Mengdong <mengdong.lin at intel.com>; Yang,
>> Libin <libin.yang at intel.com>; Li, Jocelyn <jocelyn.li at intel.com>; 'intel-gfx'
>> <intel-gfx at lists.freedesktop.org>; Zhao, Juan J <juan.j.zhao at intel.com>
>> Subject: RE: Could you merge the tsc patches directly from Len Brown's
>> public repo?
>>
>> Please ignore my previous patch(it is incorrect), you can cherry pick Len's
>> 8 patches except this one:
>>
>> 540cc882de7d1da2e71591e215f0e04cb89883fa
>> x86 tsc_msr: Extend to include Intel Core Architecture
>>
>> thanks,
>> Yu
>>
>> > -----Original Message-----
>> > From: Lu, Han
>> > Sent: Friday, April 29, 2016 9:38 AM
>> > To: 'Ville Syrjälä'; Brown, Len
>> > Cc: 'Daniel Vetter'; Nikula, Jani; Lin, Mengdong; Yang, Libin; Li,
>> > Jocelyn; 'intel- gfx'; Chen, Yu C; Zhao, Juan J
>> > Subject: RE: Could you merge the tsc patches directly from Len Brown's
>> > public repo?
>> >
>> > +Juan
>> >
>> > Hi Yu,
>> >
>> > Do you have any update on your patches? We need a solution to fix the
>> > SandyBridge hang asap, then Daniel and Jani can help to cherry-pick
>> > the tsc patches to drm-intel repo.
>> >
>> > BR,
>> > Han Lu
>> >
>> > > -----Original Message-----
>> > > From: Lu, Han
>> > > Sent: Wednesday, April 27, 2016 1:18 PM
>> > > To: Ville Syrjälä <ville.syrjala at linux.intel.com>; Brown, Len
>> > > <len.brown at intel.com>
>> > > Cc: Daniel Vetter <daniel.vetter at ffwll.ch>; Nikula, Jani
>> > > <jani.nikula at intel.com>; Lin, Mengdong <mengdong.lin at intel.com>;
>> > > Yang, Libin <libin.yang at intel.com>; Li, Jocelyn
>> > > <jocelyn.li at intel.com>; intel-gfx <intel-gfx at lists.freedesktop.org>;
>> > > Chen, Yu C <yu.c.chen at intel.com>
>> > > Subject: RE: Could you merge the tsc patches directly from Len
>> > > Brown's public repo?
>> > >
>> > > Hi Len,
>> > >
>> > > Could you please share if you have any following plan to fix the
>> > > hard-hang on SandyBridge? Will you modify patch
>> > > 540cc882de7d1da2e71591e215f0e04cb89883fa and update your public
>> repo?
>> > > Thanks.
>> > >
>> > > BR,
>> > > Han Lu
>> > >
>> > > > -----Original Message-----
>> > > > From: Ville Syrjälä [mailto:ville.syrjala at linux.intel.com]
>> > > > Sent: Wednesday, April 27, 2016 12:36 AM
>> > > > To: Brown, Len <len.brown at intel.com>
>> > > > Cc: Daniel Vetter <daniel.vetter at ffwll.ch>; Lu, Han
>> > > > <han.lu at intel.com>; Nikula, Jani <jani.nikula at intel.com>; Lin,
>> > > > Mengdong <mengdong.lin at intel.com>; Yang, Libin
>> > > > <libin.yang at intel.com>; Li, Jocelyn <jocelyn.li at intel.com>;
>> > > > intel-gfx <intel-gfx at lists.freedesktop.org>
>> > > > Subject: Re: Could you merge the tsc patches directly from Len
>> > > > Brown's public repo?
>> > > >
>> > > > On Tue, Apr 26, 2016 at 06:46:23AM +0000, Brown, Len wrote:
>> > > > > > On Wed, Apr 20, 2016 at 11:24 AM, Daniel Vetter
>> > > > > > <daniel.vetter at ffwll.ch>
>> > > > > > wrote:
>> > > > > > > On Wed, Apr 20, 2016 at 10:26 AM, Lu, Han <han.lu at intel.com>
>> > wrote:
>> > > > > > >> Hi Jani,
>> > > > > > >>
>> > > > > > >> Please find the repo and commit id below:
>> > > > > > >> Repo:
>> > > > > > >> https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.
>> > > > > > >> gi
>> > > > > > >> t
>> > > > > > >> Branch: x86
>> > > > > > >> Commit id (begin from earliest):
>> > > > > > >> 6e0c25e64e0fb65a42dfc63ad5f660302e07cd87
>> > > > > > >> 16caa2834b2f08cdfd130baa490c45822edef256
>> > > > > > >> ce5c7b5eaad93c7b0043a7509eec319fe0a0e8a0
>> > > > > > >> ca376a9909f1151484854c46dc7f01be6d6d9bdb
>> > > > > > >> 4a62ba36cf4fb77ea35dee1f5992e0e7c48dad14
>> > > > > > >> 540cc882de7d1da2e71591e215f0e04cb89883fa
>> > > > > > >> 433f82c8ab3fcaa7ff3b852d01cc74dbdf6d94f1
>> > > > > > >> 65ae86d4fa3473d24445ea402b190e4b4342172e
>> > > > > > >> 3152b94afb8c27595f9b1bfa67885015cb569ba2
>> > > > > > >>
>> > > > > > >> I have one silly question: if I understand correctly, these
>> > > > > > >> patches
>> > > > > > will be merged into a separate branch and drm-nightly both.
>> > > > > > After a few weeks, will there be conflicts when merging from
>> > > > > > upstream to drm-nightly, as both upstream and drm-nightly
>> > > > > > contain tsc
>> > patches?
>> > > > > > >
>> > > > > > > All cherry-picked to topic/core-for-CI, pls double-check
>> > > > > > > it's all there (scripts will take another 5 minutes or so to
>> > > > > > > push it all out and rebuild drm-intel-nightly with those patches).
>> > > > > >
>> > > > > > Dropped them again because they hard-hang Ville's sandybridge
>> > > > > > on boot-up. Adding Ville and Len and mailing lists.
>> > > > >
>> > > > > Does the SNB work if you revert this one?:
>> > > > >
>> > > > > commit 540cc882de7d1da2e71591e215f0e04cb89883fa
>> > > > > Author: Len Brown <len.brown at intel.com>
>> > > > > Date: Sun Nov 29 01:21:06 2015 -0500
>> > > > >
>> > > > > x86 tsc_msr: Extend to include Intel Core Architecture
>> > > >
>> > > > Yep, that does seem to be the bad apple.
>> > > >
>> > > > --
>> > > > Ville Syrjälä
>> > > > Intel OTC
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
More information about the Intel-gfx
mailing list