On Wed, Jan 11, 2017 at 09:00:27AM +0100, Takashi Iwai wrote: > On Wed, 11 Jan 2017 08:39:13 +0100, > Daniel Vetter wrote: > > > > On Tue, Jan 10, 2017 at 9:49 AM, Takashi Iwai <tiwai@xxxxxxx> wrote: > > > On Tue, 10 Jan 2017 09:45:31 +0100, > > >> >-----Original Message----- > > >> >From: Takashi Iwai [mailto:tiwai@xxxxxxx] > > >> >Sent: Tuesday, January 10, 2017 4:19 PM > > >> >To: Yang, Libin <libin.yang@xxxxxxxxx> > > >> >Cc: Daniel Vetter <daniel@xxxxxxxx>; intel-gfx <intel-gfx@xxxxxxxxxxxxxxxxxxxxx>; > > >> >Nikula, Jani <jani.nikula@xxxxxxxxxxxxxxx>; alsa-devel@xxxxxxxxxxxxxxxx; Lin, > > >> >Mengdong <mengdong.lin@xxxxxxxxx> > > >> >Subject: Re: [alsa-devel] [PATCH v4 0/3] support DP MST audio > > >> > > > >> >On Mon, 09 Jan 2017 07:22:55 +0100, > > >> >Yang, Libin wrote: > > >> >> > > >> >> Hi Takashi, > > >> >> > > >> >> It seems the patches for DP MST in gfx is not merged into Linus branch. > > >> >> > > >> >> Do we have plan to merge gfx branch manually and review the patches for > > >> >audio? Or we will wait the DP MST patches for i915 merged into Linus branch? > > >> > > > >> >Sorry, this was delayed due to the vacation. > > >> >Now I applied these three patches to topic/hda-dp-mst branch based on 4.10- > > >> >rc2, and it was merged to for-next branch. > > >> > > > >> > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hda-dp- > > >> >mst > > >> > > >> Thanks. These audio patches are based on the i915 dp mst patches. Without > > >> I915 driver patches support, it will make errors. > > > > > > Ah yeah, I forgot it. So I removed it from for-next branch, but > > > topic/hda-dp-mst branch is kept so that it can be merged to i915 > > > tree. > > > > > > Let me know if there is any i915 branch I can pull into sound tree. > > > > Aw, I didn't know that the depency goes this way round, the dp mst > > patches (I'm not even sure which ones they are) on the i915 are just > > on the general pile. So not anywhere near a place where I can make a > > topic branch. > > > > I guess what needs to be done now is a cherry-picked list of just the > > patches we need, on top of -rc3, that I can then pull into > > drm-intel.git plus send a pull request for that to Takashi. That means > > the patches are twice in drm-intel.git, but if we cherry-pick > > reference them correctly then that should be all ok and can't really > > be helped. > > > > Or we just delay the audio side for 4.12, dp mst audio support is 4 > > years late anyway, so one more release won'thurt that much ;-) > > Well, thinking of the amount of patches, I guess we can do other way > round: basically it's fine to apply Libin's latest patches to drm tree > for 4.11, if it makes things easier. I don't think we'll have a big > conflict with these changes for others during 4.11 development. If > any, I can pull some of stable point from drm tree. > > Does it work for you? If yes, feel free to apply these three sound > patches to drm or i915 tree with my ack. > > Reviewed-by: Takashi Iwai <tiwai@xxxxxxx> Works for me too. Libin, can you pls resend (somehow this thread disconnected from the patches for me), with Takashi's r-b + ack for merging through drm-intel? Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
