1. 11 May, 2021 2 commits
    • Mark Brown's avatar
      Merge series "ASoC: SOF: Intel: split Baytrail and Merrifield" from... · b748ad38
      Mark Brown authored
      Merge series "ASoC: SOF: Intel: split Baytrail and Merrifield" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
      
      We've had recurring randconfig issues with the two platforms relying
      on ACPI and PCI. I think it's time to split the two and introduce a
      common 'atom' module, so that dependencies are better handled.
      
      I chose not to add a Fixes tag since the changes are rather invasive,
      and the randconfig issues only happen in non-functional cases.
      
      There should be no functional changes with this patchset, only code
      moved and renamed.
      
      Pierre-Louis Bossart (2):
        ASoC: SOF: Intel: byt: prepare split between Baytrail and Merrifield
        ASoC: SOF: Intel: move common ATOM stuff to module
      
       sound/soc/sof/intel/Makefile  |   5 +-
       sound/soc/sof/intel/atom.c    | 463 ++++++++++++++++++++
       sound/soc/sof/intel/atom.h    |  74 ++++
       sound/soc/sof/intel/byt.c     | 768 ++++------------------------------
       sound/soc/sof/intel/pci-tng.c | 171 +++++++-
       5 files changed, 783 insertions(+), 698 deletions(-)
       create mode 100644 sound/soc/sof/intel/atom.c
       create mode 100644 sound/soc/sof/intel/atom.h
      
      --
      2.25.1
      b748ad38
    • Mark Brown's avatar
      Merge series "ASoC: Intel: machine driver updates for 5.14" from Pierre-Louis... · 93c964af
      Mark Brown authored
      Merge series "ASoC: Intel: machine driver updates for 5.14" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:
      
      Some of the patches in this series for TigerLake and AlderLake
      SoundWire/Bluetooth support were missed in a previous submission,
      resend them as is, and add new patches for the CS42L42 machine driver.
      
      Brent Lu (3):
        ASoC: Intel: maxim-common: support max98357a
        ASoC: Intel: add sof-cs42l42 machine driver
        ASoC: Intel: sof_rt5682: code refactor for max98357a
      
      Libin Yang (1):
        ASoC: Intel: sof_sdw: add SOF_RT715_DAI_ID_FIX for AlderLake
      
      Pierre-Louis Bossart (4):
        ASoC: Intel: sof_sdw: add mutual exclusion between PCH DMIC and RT715
        ASoC: Intel: boards: handle hda-dsp-common as a module
        ASoC: Intel: boards: create sof-maxim-common module
        ASoC: Intel: boards: remove .nonatomic for BE dailinks
      
      Vamshi Krishna Gopal (2):
        ASoC: Intel: soc-acpi: add entries for i2s machines in ADL match table
        ASoC: Intel: boards: add support for adl boards in sof-rt5682
      
      Yong Zhi (3):
        ASoC: Intel: Boards: tgl_max98373: Add BT offload support
        ASoC: Intel: sof_sdw: add support for Bluetooth offload
        ASoC: Intel: sof_rt5682: Enable Bluetooth offload on tgl and adl
      
       sound/soc/intel/boards/Kconfig                |  36 +-
       sound/soc/intel/boards/Makefile               |  30 +-
       sound/soc/intel/boards/bxt_da7219_max98357a.c |   1 +
       sound/soc/intel/boards/bxt_rt298.c            |   1 +
       sound/soc/intel/boards/bytcht_cx2072x.c       |   1 -
       sound/soc/intel/boards/bytcht_da7213.c        |   1 -
       sound/soc/intel/boards/bytcht_es8316.c        |   1 -
       sound/soc/intel/boards/bytcht_nocodec.c       |   1 -
       sound/soc/intel/boards/bytcr_rt5640.c         |   1 -
       sound/soc/intel/boards/bytcr_rt5651.c         |   1 -
       sound/soc/intel/boards/bytcr_wm5102.c         |   1 -
       sound/soc/intel/boards/cht_bsw_rt5645.c       |   1 -
       sound/soc/intel/boards/cht_bsw_rt5672.c       |   1 -
       sound/soc/intel/boards/cml_rt1011_rt5682.c    |   1 +
       sound/soc/intel/boards/ehl_rt5660.c           |   2 +-
       sound/soc/intel/boards/glk_rt5682_max98357a.c |   1 +
       sound/soc/intel/boards/hda_dsp_common.c       |   5 +
       sound/soc/intel/boards/skl_hda_dsp_generic.c  |   1 +
       sound/soc/intel/boards/sof_cs42l42.c          | 509 ++++++++++++++++++
       sound/soc/intel/boards/sof_da7219_max98373.c  |   1 +
       sound/soc/intel/boards/sof_maxim_common.c     |  84 ++-
       sound/soc/intel/boards/sof_maxim_common.h     |  14 +-
       sound/soc/intel/boards/sof_pcm512x.c          |   2 +-
       sound/soc/intel/boards/sof_rt5682.c           | 119 +++-
       sound/soc/intel/boards/sof_sdw.c              |  55 +-
       sound/soc/intel/boards/sof_sdw_common.h       |   8 +
       sound/soc/intel/boards/sof_sdw_max98373.c     |   4 +-
       sound/soc/intel/boards/sof_wm8804.c           |   1 -
       .../intel/common/soc-acpi-intel-adl-match.c   |  26 +
       .../intel/common/soc-acpi-intel-glk-match.c   |  10 +
       30 files changed, 861 insertions(+), 59 deletions(-)
       create mode 100644 sound/soc/intel/boards/sof_cs42l42.c
      
      --
      2.25.1
      93c964af
  2. 10 May, 2021 33 commits
  3. 09 May, 2021 5 commits
    • Linus Torvalds's avatar
      Linux 5.13-rc1 · 6efb943b
      Linus Torvalds authored
      6efb943b
    • Linus Torvalds's avatar
      fbmem: fix horribly incorrect placement of __maybe_unused · 6dae40ae
      Linus Torvalds authored
      Commit b9d79e4c ("fbmem: Mark proc_fb_seq_ops as __maybe_unused")
      places the '__maybe_unused' in an entirely incorrect location between
      the "struct" keyword and the structure name.
      
      It's a wonder that gcc accepts that silently, but clang quite reasonably
      warns about it:
      
          drivers/video/fbdev/core/fbmem.c:736:21: warning: attribute declaration must precede definition [-Wignored-attributes]
          static const struct __maybe_unused seq_operations proc_fb_seq_ops = {
                              ^
      
      Fix it.
      
      Cc: Guenter Roeck <linux@roeck-us.net>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6dae40ae
    • Linus Torvalds's avatar
      Merge tag 'drm-next-2021-05-10' of git://anongit.freedesktop.org/drm/drm · efc58a96
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Bit later than usual, I queued them all up on Friday then promptly
        forgot to write the pull request email. This is mainly amdgpu fixes,
        with some radeon/msm/fbdev and one i915 gvt fix thrown in.
      
        amdgpu:
         - MPO hang workaround
         - Fix for concurrent VM flushes on vega/navi
         - dcefclk is not adjustable on navi1x and newer
         - MST HPD debugfs fix
         - Suspend/resumes fixes
         - Register VGA clients late in case driver fails to load
         - Fix GEM leak in user framebuffer create
         - Add support for polaris12 with 32 bit memory interface
         - Fix duplicate cursor issue when using overlay
         - Fix corruption with tiled surfaces on VCN3
         - Add BO size and stride check to fix BO size verification
      
        radeon:
         - Fix off-by-one in power state parsing
         - Fix possible memory leak in power state parsing
      
        msm:
         - NULL ptr dereference fix
      
        fbdev:
         - procfs disabled warning fix
      
        i915:
         - gvt: Fix a possible division by zero in vgpu display rate
           calculation"
      
      * tag 'drm-next-2021-05-10' of git://anongit.freedesktop.org/drm/drm:
        drm/amdgpu: Use device specific BO size & stride check.
        drm/amdgpu: Init GFX10_ADDR_CONFIG for VCN v3 in DPG mode.
        drm/amd/pm: initialize variable
        drm/radeon: Avoid power table parsing memory leaks
        drm/radeon: Fix off-by-one power_state index heap overwrite
        drm/amd/display: Fix two cursor duplication when using overlay
        drm/amdgpu: add new MC firmware for Polaris12 32bit ASIC
        fbmem: Mark proc_fb_seq_ops as __maybe_unused
        drm/msm/dpu: Delete bonkers code
        drm/i915/gvt: Prevent divided by zero when calculating refresh rate
        amdgpu: fix GEM obj leak in amdgpu_display_user_framebuffer_create
        drm/amdgpu: Register VGA clients after init can no longer fail
        drm/amdgpu: Handling of amdgpu_device_resume return value for graceful teardown
        drm/amdgpu: fix r initial values
        drm/amd/display: fix wrong statement in mst hpd debugfs
        amdgpu/pm: set pp_dpm_dcefclk to readonly on NAVI10 and newer gpus
        amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID
        drm/amdgpu: fix concurrent VM flushes on Vega/Navi v2
        drm/amd/display: Reject non-zero src_y and src_x for video planes
      efc58a96
    • Linus Torvalds's avatar
      Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block · 506c3079
      Linus Torvalds authored
      Pull block fix from Jens Axboe:
       "Turns out the bio max size change still has issues, so let's get it
        reverted for 5.13-rc1. We'll shake out the issues there and defer it
        to 5.14 instead"
      
      * tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block:
        Revert "bio: limit bio max size"
      506c3079
    • Linus Torvalds's avatar
      Merge tag '5.13-rc-smb3-part3' of git://git.samba.org/sfrench/cifs-2.6 · 0a55a1fb
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Three small SMB3 chmultichannel related changesets (also for stable)
        from the SMB3 test event this week.
      
        The other fixes are still in review/testing"
      
      * tag '5.13-rc-smb3-part3' of git://git.samba.org/sfrench/cifs-2.6:
        smb3: if max_channels set to more than one channel request multichannel
        smb3: do not attempt multichannel to server which does not support it
        smb3: when mounting with multichannel include it in requested capabilities
      0a55a1fb