Skip to content

Intel LPE audio driver cleanups

Takashi Iwai alsa-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest53 patches 4 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/53ALSA: x86: Don't set PCM state to DISCONNECTEDsound/x86/intel_hdmi_audio_if.c+1 -10 replies
2/53ALSA: x86: Remove v1 ops and structssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_lpe_audio.h+1 -2340 replies
3/53ALSA: x86: Drop indirect calls of had_opssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_audio_if.c+42 -680 replies
4/53ALSA: x86: Replace indirect register ops with direct callssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_audio_if.c +2 more+30 -1090 replies
5/53ALSA: x86: Replace indirect query_ops with direct callssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.c +1 more+16 -380 replies
6/53ALSA: x86: Drop snd_intel_had_interface indirect callssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_audio_if.c +2 more+23 -910 replies
7/53ALSA: x86: Pass snd_intelhad object to helperssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_audio_if.c +2 more+131 -1300 replies
8/53ALSA: x86: Handle the error from hdmi_audio_probe() properlysound/x86/intel_hdmi_lpe_audio.c+16 -90 replies
9/53ALSA: x86: Drop useless mutex at probesound/x86/intel_hdmi_audio.c+2 -80 replies
10/53ALSA: x86: Call event callback directlysound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.c +1 more+1 -350 replies
11/53ALSA: x86: Fix possible stale interrupt callssound/x86/intel_hdmi_lpe_audio.c+13 -130 replies
12/53ALSA: x86: Drop unused mid_hdmi_audio_is_busy()sound/x86/intel_hdmi_lpe_audio.c sound/x86/intel_hdmi_lpe_audio.h+0 -240 replies
13/53ALSA: x86: Drop the global platform device referencesound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_lpe_audio.c sound/x86/intel_hdmi_lpe_audio.h+87 -910 replies
14/53ALSA: x86: Drop global hlpe_statesound/x86/intel_hdmi_lpe_audio.c+9 -120 replies
15/53ALSA: x86: Drop global ELD copysound/x86/intel_hdmi_lpe_audio.c+5 -260 replies
16/53ALSA: x86: Move the global underrun_count to struct snd_intelhadsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+9 -80 replies
17/53ALSA: x86: Drop unused hw_silence fieldsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+0 -34 replies
18/53ALSA: x86: Move dma_mask debug print into intel_hdmi_lpe_audio.csound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_lpe_audio.c+1 -110 replies
19/53ALSA: x86: Embed snd_intelhad into snd_cardsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_audio_if.c+31 -820 replies
20/53ALSA: x86: Drop superfluous CHT PCI ID checksound/x86/intel_hdmi_lpe_audio.c+0 -140 replies
21/53ALSA: x86: Check platform_data earliersound/x86/intel_hdmi_lpe_audio.c+6 -80 replies
22/53ALSA: x86: Call snd_card_register() at the endsound/x86/intel_hdmi_audio.c+5 -50 replies
23/53ALSA: x86: Drop unused hdmi_audio_query()sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_audio_if.c+0 -550 replies
24/53ALSA: x86: Flatten two abstraction layerssound/x86/Makefile sound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h +3 more+358 -7710 replies
25/53ALSA: x86: Fold intel_hdmi_audio_if.c into main filesound/x86/Makefile sound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h +1 more+376 -4390 replies
26/53ALSA: x86: Replace pr_xxx() with dev_xxx()sound/x86/intel_hdmi_audio.c+84 -1210 replies
27/53ALSA: x86: Fix for CONFIG_PM=nsound/x86/intel_hdmi_audio.c+1 -10 replies
28/53ALSA: x86: Remove indirect call of snd_pcm_period_elapsed()sound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+7 -110 replies
29/53ALSA: x86: Drop unused fields from snd_intelhad structsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+6 -220 replies
30/53ALSA: x86: Drop superfluous PCM private_freesound/x86/intel_hdmi_audio.c+0 -120 replies
31/53ALSA: x86: Fix sleep-in-atomic via i915 notificationsound/x86/intel_hdmi_audio.c+24 -270 replies
32/53ALSA: x86: Remove superfluous check at resumesound/x86/intel_hdmi_audio.c+1 -90 replies
33/53ALSA: x86: Drop had_get_hwstate()sound/x86/intel_hdmi_audio.c+14 -280 replies
34/53ALSA: x86: Tidy up codessound/x86/intel_hdmi_audio.c+59 -890 replies
35/53ALSA: x86: Remove _v[12] sufficessound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+31 -410 replies
36/53ALSA: x86: Constfy tablessound/x86/intel_hdmi_audio.c+3 -30 replies
37/53ALSA: x86: Remove superfluous irqsave flagssound/x86/intel_hdmi_audio.c+33 -380 replies
38/53ALSA: x86: Fix racy access to chmapsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+24 -90 replies
39/53ALSA: x86: Drop flag_underrun fieldsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+1 -90 replies
40/53ALSA: x86: Drop superfluous state fieldsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+21 -440 replies
41/53ALSA: x86: Drop redundant had_stream_pvtsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+4 -630 replies
42/53ALSA: x86: Drop unused fields from pcm_stream_infosound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+1 -210 replies
43/53ALSA: x86: Properly manage PCM substream lifetypesound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h+98 -740 replies
44/53ALSA: x86: Implement runtime PMsound/x86/intel_hdmi_audio.c+50 -770 replies
45/53ALSA: x86: Move stream status into pcm_stream_infosound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+14 -500 replies
46/53ALSA: x86: Use the standard ELD bytes definitionssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+9 -1270 replies
47/53ALSA: x86: Reduce redundant register field namessound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+90 -1690 replies
48/53ALSA: x86: Clean up unused defines and inclusionssound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+20 -690 replies
49/53ALSA: x86: Create ELD control elementsound/x86/intel_hdmi_audio.c+51 -210 replies
50/53ALSA: x86: Set CA bits for DisplayPort toosound/x86/intel_hdmi_audio.c+4 -40 replies
51/53ALSA: x86: Simplify commentssound/x86/intel_hdmi_audio.c+14 -520 replies
52/53ALSA: x86: Yet more tidy-up and clean-upssound/x86/intel_hdmi_audio.c+36 -320 replies
53/53ALSA: x86: Rename drv_status to connectedsound/x86/intel_hdmi_audio.c sound/x86/intel_hdmi_audio.h sound/x86/intel_hdmi_lpe_audio.h+22 -300 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/53] Intel LPE audio driver cleanups

Hi,

this is a fairly largish patchset to fix and clean up Intel LPE audio driver. Most of the patches are to clean up and refactoring of the codes. As you can see in the diffstat below, quite lots of codes (over 1600 lines) are reduced. Now the driver structure is flattened to a single layer, and it looks much like a normal driver.

Besides the refactoring, there are a few major fixes: e.g. the fix for the PCM disconnection that confuses PA,. the fix for the possible sleep-in-atomic at hotplug, the fix for racy chmap accesses.

As new features, the driver supports the runtime PM properly now, it sets the CA bit for DP, and it exposes the ELD via ALSA control element.

The current code is available in topic/intel-lpe-audio-cleanup branch, and it's based on the DP-audio branch, topic/intel-lpe-audio-dp that I'm going to merge to for-next soon.

Takashi

===

Takashi Iwai (53):
ALSA: x86: Don't set PCM state to DISCONNECTED
ALSA: x86: Remove v1 ops and structs
ALSA: x86: Drop indirect calls of had_ops
ALSA: x86: Replace indirect register ops with direct calls
ALSA: x86: Replace indirect query_ops with direct calls
ALSA: x86: Drop snd_intel_had_interface indirect calls
ALSA: x86: Pass snd_intelhad object to helpers
ALSA: x86: Handle the error from hdmi_audio_probe() properly
ALSA: x86: Drop useless mutex at probe
ALSA: x86: Call event callback directly
ALSA: x86: Fix possible stale interrupt calls
ALSA: x86: Drop unused mid_hdmi_audio_is_busy()
ALSA: x86: Drop the global platform device reference
ALSA: x86: Drop global hlpe_state
ALSA: x86: Drop global ELD copy
ALSA: x86: Move the global underrun_count to struct snd_intelhad
ALSA: x86: Drop unused hw_silence field
ALSA: x86: Move dma_mask debug print into intel_hdmi_lpe_audio.c
ALSA: x86: Embed snd_intelhad into snd_card
ALSA: x86: Drop superfluous CHT PCI ID check
ALSA: x86: Check platform_data earlier
ALSA: x86: Call snd_card_register() at the end
ALSA: x86: Drop unused hdmi_audio_query()
ALSA: x86: Flatten two abstraction layers
ALSA: x86: Fold intel_hdmi_audio_if.c into main file
ALSA: x86: Replace pr_xxx() with dev_xxx()
ALSA: x86: Fix for CONFIG_PM=n
ALSA: x86: Remove indirect call of snd_pcm_period_elapsed()
ALSA: x86: Drop unused fields from snd_intelhad struct
ALSA: x86: Drop superfluous PCM private_free
ALSA: x86: Fix sleep-in-atomic via i915 notification
ALSA: x86: Remove superfluous check at resume
ALSA: x86: Drop had_get_hwstate()
ALSA: x86: Tidy up codes
ALSA: x86: Remove _v[12] suffices
ALSA: x86: Constfy tables
ALSA: x86: Remove superfluous irqsave flags
ALSA: x86: Fix racy access to chmap
ALSA: x86: Drop flag_underrun field
ALSA: x86: Drop superfluous state field
ALSA: x86: Drop redundant had_stream_pvt
ALSA: x86: Drop unused fields from pcm_stream_info
ALSA: x86: Properly manage PCM substream lifetype
ALSA: x86: Implement runtime PM
ALSA: x86: Move stream status into pcm_stream_info
ALSA: x86: Use the standard ELD bytes definitions
ALSA: x86: Reduce redundant register field names
ALSA: x86: Clean up unused defines and inclusions
ALSA: x86: Create ELD control element
ALSA: x86: Set CA bits for DisplayPort too
ALSA: x86: Simplify comments
ALSA: x86: Yet more tidy-up and clean-ups
ALSA: x86: Rename drv_status to connected

 sound/x86/Makefile               |    4 +-
 sound/x86/intel_hdmi_audio.c     | 1901 +++++++++++++++++++-------------------
 sound/x86/intel_hdmi_audio.h     |  117 +--
 sound/x86/intel_hdmi_audio_if.c  |  548 -----------
 sound/x86/intel_hdmi_lpe_audio.c |  665 -------------
 sound/x86/intel_hdmi_lpe_audio.h |  470 ++--------
 6 files changed, 1026 insertions(+), 2679 deletions(-)
 delete mode 100644 sound/x86/intel_hdmi_audio_if.c
 delete mode 100644 sound/x86/intel_hdmi_lpe_audio.c
Signature · 1 line
2.11.0