1. 30 Apr, 2014 5 commits
    • Dave Airlie's avatar
      drm: try harder to avoid regression when merging mode bits · b87577b7
      Dave Airlie authored
      For QXL hw we really want the bits to be replaced as we change
      the preferred mode on the fly, and the same goes for virgl when
      I get to it, however the original fix for this seems to have caused
      a wierd regression on Intel G33 that in a stunning display of failure
      at opposition to his normal self, Daniel failed to diagnose.
      
      So we are left doing this, ugly ugly ugly ugly, Daniel you fixed
      that G33 yet?, ugly, ugly.
      Tested-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b87577b7
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-intel into drm-next · 885ac04a
      Dave Airlie authored
      drm-intel-next-2014-04-16:
      - vlv infoframe fixes from Jesse
      - dsi/mipi fixes from Shobhit
      - gen8 pageflip fixes for LRI/SRM from Damien
      - cmd parser fixes from Brad Volkin
      - some prep patches for CHV, DRRS, ...
      - and tons of little things all over
      drm-intel-next-2014-04-04:
      - cmd parser for gen7 but only in enforcing and not yet granting mode - the
        batch copying stuff is still missing. Also performance is a bit ... rough
        (Brad Volkin + OACONTROL fix from Ken).
      - deprecate UMS harder (i.e. CONFIG_BROKEN)
      - interrupt rework from Paulo Zanoni
      - runtime PM support for bdw and snb, again from Paulo
      - a pile of refactorings from various people all over the place to prep for new
        stuff (irq reworks, power domain polish, ...)
      
      drm-intel-next-2014-04-04:
      - cmd parser for gen7 but only in enforcing and not yet granting mode - the
        batch copying stuff is still missing. Also performance is a bit ... rough
        (Brad Volkin + OACONTROL fix from Ken).
      - deprecate UMS harder (i.e. CONFIG_BROKEN)
      - interrupt rework from Paulo Zanoni
      - runtime PM support for bdw and snb, again from Paulo
      - a pile of refactorings from various people all over the place to prep for new
        stuff (irq reworks, power domain polish, ...)
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_gem_context.c
      885ac04a
    • Vineet Gupta's avatar
      ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe · 8aa9e85a
      Vineet Gupta authored
      There was a very small race window where resume to kernel mode from a
      Exception Path (or pure kernel mode which is true for most of ARC
      exceptions anyways), was not disabling interrupts in restore_regs,
      clobbering the exception regs
      
      Anton found the culprit call flow (after many sleepless nights)
      
      | 1. we got a Trap from user land
      | 2. started to service it.
      | 3. While doing some stuff on user-land memory (I think it is padzero()),
      |     we got a DataTlbMiss
      | 4. On return from it we are taking "resume_kernel_mode" path
      | 5. NEED_RESHED is not set, so we go to "return from exception" path in
      |     restore regs.
      | 6. there seems to be IRQ happening
      Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
      Cc: <stable@vger.kernel.org>   #3.10, 3.12, 3.13, 3.14
      Cc: Anton Kolesov <Anton.Kolesov@synopsys.com>
      Cc: Francois Bedard <Francois.Bedard@synopsys.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8aa9e85a
    • Linus Torvalds's avatar
      Merge tag 'sound-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 71dc96e3
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A few collections of small eggs that have been gathered during the
        Easter holidays.  Mostly small ASoC fixes, with a HD-audio quirk and a
        workaround for Nvidia controller"
      
      * tag 'sound-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Suppress CORBRP clear on Nvidia controller chips
        ALSA: hda - add headset mic detect quirk for a Dell laptop
        ASoC: jz4740: Remove Makefile entry for removed file
        ASoC: Intel: Fix audio crash due to negative address offset
        ASoC: dapm: Fix widget double free with auto-disable DAPM kcontrol
        ASoC: Intel: Fix incorrect sizeof() in sst_hsw_stream_get_volume()
        ASoC: Intel: some incorrect sizeof() usages
        ASoC: cs42l73: Convert to use devm_gpio_request_one
        ASoC: cs42l52: Convert to use devm_gpio_request_one
        ASoC: tlv320aic31xx: document that the regulators are mandatory
        ASoC: fsl_spdif: Fix wrong OFFSET of STC_SYSCLK_DIV
        ASoC: alc5623: Fix regmap endianness
        ASoC: tlv320aic3x: fix shared reset pin for DT
        ASoC: rsnd: fix clock prepare/unprepare
      71dc96e3
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · ed8c37e1
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Smattering of fixes, i915, exynos, tegra, msm, vmwgfx.
      
        A bit of framebuffer reference counting fallout fixes, i915 GM45
        regression fix, DVI regression fix, vmware info leak between processes
        fix"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/exynos: use %pad for dma_addr_t
        drm/exynos: dsi: use IS_ERR() to check devm_ioremap_resource() results
        MAINTAINERS: update maintainer entry for Exynos DP driver
        drm/exynos: balance framebuffer refcount
        drm/i915: Move all ring resets before setting the HWS page
        drm/i915: Don't WARN nor handle unexpected hpd interrupts on gmch platforms
        drm/msm/mdp4: cure for the cursor blues (v2)
        drm/msm: default to XR24 rather than AR24
        drm/msm: fix memory leak
        drm/tegra: restrict plane loops to legacy planes
        drm/i915: Allow full PPGTT with param override
        drm/i915: Discard BIOS framebuffers too small to accommodate chosen mode
        drm/vmwgfx: Make sure user-space can't DMA across buffer object boundaries v2
        drm/i915: get power domain in case the BIOS enabled eDP VDD
        drm/i915: Don't check gmch state on inherited configs
        drm/i915: Allow user modes to exceed DVI 165MHz limit
      ed8c37e1
  2. 29 Apr, 2014 6 commits
  3. 28 Apr, 2014 29 commits