lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 249/272] ALSA: hda - Force buffer alignment for Haswell HDMI controllers
    Date
    3.11.10.1 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 33499a15c2f7addc81695778753c2338b960eff7 upstream.

    Haswell HDMI audio controllers seem to get stuck when unaligned buffer
    size is used. Let's enable the buffer alignment for the corresponding
    entries.

    Since AZX_DCAPS_INTEL_PCH contains AZX_DCAPS_BUFSIZE that disables the
    buffer alignment forcibly, define AZX_DCAPS_INTEL_HASWELL and put the
    necessary AZX_DCAPS bits there.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=60769
    Reported-by: Alexander E. Patrakov <patrakov@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    sound/pci/hda/hda_intel.c | 14 ++++++++------
    1 file changed, 8 insertions(+), 6 deletions(-)

    diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
    index 9552da2..022c535 100644
    --- a/sound/pci/hda/hda_intel.c
    +++ b/sound/pci/hda/hda_intel.c
    @@ -609,6 +609,11 @@ enum {
    #define AZX_DCAPS_INTEL_PCH \
    (AZX_DCAPS_INTEL_PCH_NOPM | AZX_DCAPS_PM_RUNTIME)

    +#define AZX_DCAPS_INTEL_HASWELL \
    + (AZX_DCAPS_SCH_SNOOP | AZX_DCAPS_ALIGN_BUFSIZE | \
    + AZX_DCAPS_COUNT_LPIB_DELAY | AZX_DCAPS_PM_RUNTIME | \
    + AZX_DCAPS_I915_POWERWELL)
    +
    /* quirks for ATI SB / AMD Hudson */
    #define AZX_DCAPS_PRESET_ATI_SB \
    (AZX_DCAPS_ATI_SNOOP | AZX_DCAPS_NO_TCSEL | \
    @@ -3933,14 +3938,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = {
    .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
    /* Haswell */
    { PCI_DEVICE(0x8086, 0x0a0c),
    - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
    - AZX_DCAPS_I915_POWERWELL },
    + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },
    { PCI_DEVICE(0x8086, 0x0c0c),
    - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
    - AZX_DCAPS_I915_POWERWELL },
    + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },
    { PCI_DEVICE(0x8086, 0x0d0c),
    - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH |
    - AZX_DCAPS_I915_POWERWELL },
    + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_HASWELL },
    /* 5 Series/3400 */
    { PCI_DEVICE(0x8086, 0x3b56),
    .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM },
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-06 15:01    [W:4.152 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site