1. 22 5月, 2014 1 次提交
  2. 21 5月, 2014 6 次提交
  3. 20 5月, 2014 2 次提交
  4. 19 5月, 2014 2 次提交
  5. 14 5月, 2014 1 次提交
  6. 13 5月, 2014 1 次提交
  7. 07 5月, 2014 1 次提交
  8. 05 5月, 2014 3 次提交
    • A
      ALSA: hda - hdmi: Set infoframe and channel mapping even without sink · 561a7d6e
      Anssi Hannula 提交于
      Currently infoframe contents and channel mapping are only set when a
      sink (monitor) is present.
      
      However, this does not make much sense, since
      1) We can make a very reasonable guess on CA after 18e39186 ("ALSA:
         hda - hdmi: Fallback to ALSA allocation when selecting CA") or by
         relying on a previously valid ELD (or we may be using a
         user-specified channel map).
      2) Not setting infoframe contents and channel count simply means they
         are left at a possibly incorrect state - playback is still allowed
         to proceed (with missing or wrongly mapped channels).
      
      Reasons for monitor_present being 0 include disconnected cable, video
      driver issues, or codec not being spec-compliant. Note that in
      actual disconnected-cable case it should not matter if these settings
      are wrong as they will be re-set after jack detection, though.
      
      Change the behavior to allow the infoframe contents and the channel
      mapping to be set even without a sink/monitor, either based on the
      previous valid ELD contents, if any, or based on sensible defaults
      (standard channel layouts or provided custom map, sink type HDMI).
      Signed-off-by: NAnssi Hannula <anssi.hannula@iki.fi>
      Tested-by: NStephan Raue <stephan@openelec.tv>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      561a7d6e
    • T
      Merge branch 'for-linus' into for-next · 59991da4
      Takashi Iwai 提交于
      ... for applying the further HDMI fixes.
      59991da4
    • A
      ALSA: hda - hdmi: Set converter channel count even without sink · f06ab794
      Anssi Hannula 提交于
      Since commit 1df5a06a ("ALSA: hda - hdmi: Fix programmed active channel
      count") channel count is no longer being set if monitor_present is 0.
      This is because setting the count was moved after the CA value is
      determined, which is only after the monitor_present check in
      hdmi_setup_audio_infoframe().
      
      Unfortunately, in some cases, such as with a non-spec-compliant codec or
      with a problematic video driver, monitor_present is always 0. As a
      specific example, this seems to happen with gen1 ATV (SiI1390 codec),
      causing left-channel-only stereo playback (multi-channel playback has
      apparently never worked with this codec despite it reporting 8 channels,
      reason unknown).
      
      Simply setting converter channel count without setting the pin infoframe
      and channel mapping as well does not theoretically make much sense as
      this will just mean they are out-of-sync and multichannel playback will
      have a wrong channel mapping.
      
      However, adding back just setting the converter channel count even in
      no-monitor case is the safest change which at least fixes the stereo
      playback regression on SiI1390 codec. Do that.
      Signed-off-by: NAnssi Hannula <anssi.hannula@iki.fi>
      Reported-by: NStephan Raue <stephan@openelec.tv>
      Tested-by: NStephan Raue <stephan@openelec.tv>
      Cc: <stable@vger.kernel.org> # 3.12+
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      f06ab794
  9. 03 5月, 2014 4 次提交
  10. 30 4月, 2014 2 次提交
  11. 29 4月, 2014 2 次提交
  12. 28 4月, 2014 6 次提交
  13. 23 4月, 2014 5 次提交
  14. 21 4月, 2014 4 次提交
    • J
      ASoC: dapm: Fix widget double free with auto-disable DAPM kcontrol · 2697e4fb
      Jarkko Nikula 提交于
      Commit 9e1fda4ae158 ("ASoC: dapm: Implement mixer input auto-disable")
      is trying to free the widget it allocated by snd_soc_dapm_new_control()
      call in dapm_kcontrol_data_alloc() by adding kfree(data->widget) to
      dapm_kcontrol_free().
      
      This is causing a widget double free with auto-disabled DAPM kcontrols
      in sound card unregistration because widgets are already freed before
      dapm_kcontrol_free() is called.
      
      Reason for that is all widgets are added into dapm->card->widgets list
      in snd_soc_dapm_new_control() and freed in dapm_free_widgets() during
      execution of snd_soc_dapm_free().
      
      Now snd_soc_dapm_free() calls for different DAPM contexts happens before
      snd_card_free() call from where the call chain to dapm_kcontrol_free()
      begins:
      
      soc_cleanup_card_resources()
        soc_remove_dai_links()
          soc_remove_link_dais()
            snd_soc_dapm_free(&cpu_dai->dapm)
          soc_remove_link_components()
            soc_remove_platform()
              snd_soc_dapm_free(&platform->dapm)
            soc_remove_codec()
              snd_soc_dapm_free(&codec->dapm)
        snd_soc_dapm_free(&card->dapm)
        snd_card_free()
          snd_card_do_free()
            snd_device_free_all()
              snd_device_free()
                snd_ctl_dev_free()
                  snd_ctl_remove()
                    snd_ctl_free_one()
                      dapm_kcontrol_free()
      
      This wasn't making harm with ordinary DAPM kcontrols since data->widget is NULL for
      them.
      
      Fixes: 9e1fda4ae158 (ASoC: dapm: Implement mixer input auto-disable)
      Signed-off-by: NJarkko Nikula <jarkko.nikula@linux.intel.com>
      Acked-by: NLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: NMark Brown <broonie@linaro.org>
      Cc: stable@vger.kernel.org
      2697e4fb
    • L
      Linux 3.15-rc2 · a798c10f
      Linus Torvalds 提交于
      a798c10f
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 372feacb
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "Back from long weekend here in India and now the time to send fixes
        for slave dmaengine.
         - Dan's fix of sirf xlate code
         - Jean's fix for timberland
         - edma fixes by Sekhar for SG handling and Yuan for changing init
           call"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dma: fix eDMA driver as a subsys_initcall
        dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
        platform: Fix timberdale dependencies
        dma: edma: fix incorrect SG list handling
      372feacb
    • L
      Merge tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 5269519f
      Linus Torvalds 提交于
      Pull iommu fixes from Joerg Roedel:
       "Fixes for regressions:
      
         - fix wrong IOMMU enumeration causing some SCSI device drivers
           initialization failures
         - ARM-SMMU fixes for a panic condition and a wrong return value"
      
      * tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte
        iommu/arm-smmu: Return 0 on unmap failure
        iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors
        iommu/vt-d: Fix get_domain_for_dev() handling of upstream PCIe bridges
        iommu/vt-d: fix memory leakage caused by commit ea8ea460
      5269519f