[alsa-devel] [PATCH v2 0/3] Make the audio component binding more generic

[Pierre-Louis Bossart]

On 7/19/18 1:56 PM, Takashi Iwai wrote:
> On Thu, 19 Jul 2018 15:05:45 +0200,
> Pierre-Louis Bossart wrote:
>>
>> On 7/19/18 12:50 AM, Takashi Iwai wrote:
>>> On Wed, 18 Jul 2018 22:54:35 +0200,
>>> Pierre-Louis Bossart wrote:
>>>>
>>>>
>>>>
>>>> On 07/17/2018 04:26 AM, Takashi Iwai wrote:
>>>>> Hi,
>>>>>
>>>>> this is a preliminiary patch set to convert the existing i915 /
>>>>> HD-audio component binding to be applicable to other drivers like
>>>>> radeon / amdgpu.  This patchset itself doesn't change the
>>>>> functionality but only renames and split to a new drm_audio_component
>>>>> stuff from i915_audio_component.
>>>>>
>>>>> The actual usage of the new API will follow once after this one gets
>>>>> reviewed / accepted.  The whole patches (including this patchset) are
>>>>> found in topic/hda-acomp branch of sound.git tree.
>>>>>
>>>>> BTW, since the whole stuff is about the audio binding, I suppose these
>>>>> will go through sound git tree.  Let me know if anyone has concerns.
>>>> No objections but a slight concern that this will conflict with the
>>>> HDAudio+DSP patches that I was about to resubmit on top of your
>>>> topic/hda-core-intel branch. the two series touch the same files so
>>>> it'd be a miracle if there is no issue.
>>>> How do you want to deal with this?
>>>
>>> Does it conflict severely?  If it's trivial, it can be resolved at
>>> merge time, too.  The changes in my patchset are fairly trivial, so it
>>> shouldn't be too hard.
>>
>> I was able to make things work by taking your topic/hda-core-intel,
>> merge it on Mark's for-next, then add my additional changes and these
>> DRM changes. The last two can be done in any order. But I am getting
>> some conflicts if I try to apply these DRM changes first, not sure why
>> git is complaining though, the changes look trivial enough.
>> So yes it looks possible to deal with the two series in parallel, will
>> send my update later today.
> 
> OK, since my changes are relatively trivial to deal with, I merge the
> changes to for-next branch now.
> 
> If your patches can be respinned, maybe it's easier to be rebased on
> top of these merges.

I was planning to resend them tomorrow after internal reviews (mostly 
changes in the detection/enablement of the HDaudio+DSP case). If you 
want to take a look in the mean time the patches are here: 
https://github.com/plbossart/sound/commits/upstream/hda2

I can rebase them as needed, no big deal.
Thanks
-Pierre

> 
> Mark, could you merge topic/drm_audio_component branch into yours, if
> Pierre's patchset won't go in immediately?  It's an immutable branch,
> including already topic/hda-core-intel in itself.
> 
> 
> thanks,
> 
> Takashi
>