Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 16, 2012
  1. Linux 3.6-rc2

    authored
  2. @raven-au

    autofs4 - fix get_next_positive_subdir()

    raven-au authored committed
    Following a report of a crash during an automount expire I found that
    the locking in fs/autofs4/expire.c:get_next_positive_subdir() was wrong.
    Not only is the locking wrong but the function is more complex than it
    needs to be.
    
    The function is meant to calculate (and dget) the next entry in the list
    of directories contained in the root of an autofs mount point (an autofs
    indirect mount to be precise). The main problem was that the d_lock of
    the owner of the list was not being taken when walking the list, which
    lead to list corruption under load. The only other lock that needs to
    be taken is against the next dentry candidate so it can be checked for
    usability.
    
    Signed-off-by: Ian Kent <raven@themaw.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  3. Merge tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio

    authored
    Pull VFIO fix from Alex Williamson:
     "Just a trivial patch to include vfio.h in the installed headers so we
      can complete userspace integration into QEMU."
    
    * tag 'vfio-for-v3.6-rc1' of git://github.com/awilliam/linux-vfio:
      vfio: Include vfio.h in installed headers
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/mszeredi/fuse
    
    Pull fuse updates from Miklos Szeredi.
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
      fuse: verify all ioctl retry iov elements
      fuse: add missing INIT flag descriptions
      fuse: add missing INIT flags
      fuse: update attributes on aio_read
      fuse: invalidate inode mapping if mtime changes
      fuse: add FUSE_AUTO_INVAL_DATA init flag
  5. Merge tag 'stable/for-linus-3.6-rc1-tag' of git://git.kernel.org/pub/…

    authored
    …scm/linux/kernel/git/konrad/xen
    
    Pull Xen fix from Konrad Rzeszutek Wilk:
     "Way back in v3.5 we added a mechanism to populate back pages that were
      released (they overlapped with MMIO regions), but neglected to reserve
      the proper amount of virtual space for extend_brk to work properly.
    
      Coincidentally some other commit aligned the _brk space to larger area
      so I didn't trigger this until it was run on a machine with more than
      2GB of MMIO space."
    
     * On machines with large MMIO/PCI E820 spaces we fail to boot b/c
       we failed to pre-allocate large enough virtual space for extend_brk.
    
    * tag 'stable/for-linus-3.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
      xen/p2m: Reserve 8MB of _brk space for P2M leafs when populating back.
  6. Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

    authored
    Pull SuperH fixes from Paul Mundt.
    
    * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
      sh: intc: Handle domain association for sparseirq pre-allocated vectors.
      sh: sh7269: Fix LCD pinmux
      sh: dma: fix request_irq usage
  7. MAINTAINERS: update address for Dan Williams

    Dan Williams authored committed
    Moved to djbw@fb.com
    
    Cc: Dave Jiang <dave.jiang@intel.com>
    Cc: Vinod Koul <vinod.koul@linux.intel.com>
    Signed-off-by: Dan Williams <djbw@fb.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. scripts/decodecode: Fixup trapping instruction marker

    Borislav Petkov authored committed
    When dumping "Code: " sections from an oops, the trapping instruction
    %rip points to can be a string copy
    
      2b:*  f3 a5                   rep movsl %ds:(%rsi),%es:(%rdi)
    
    and the line contain a bunch of ":".  Current "cut" selects only the and
    the second field output looks funnily overlaid this:
    
      2b:*  f3 a5                   rep movsl %ds     <-- trapping instruction:(%rsi),%es:(%rdi
    
    Fix this by selecting the remaining fields too.
    
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: linux-kbuild@vger.kernel.org
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

    authored
    Pull two slave-dmaengine fixes from Vinod Koul:
     "One fixes the correct use of clock API in imx driver and the other
      enables clock for tegra driver, which is used for other tegra driver
      conversion to dmanegine in -next."
    
    * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
      dma: tegra: enable/disable dma clock
      dma: imx-dma: Fix kernel crash due to missing clock conversion
  10. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    Pull more drm fixes from Dave Airlie:
     "Just some intel and nouveau ones this time, intel has more edp panel
      fixes for macbooks and nouveau has a suspend/resume regression fix in
      there."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
      drm/i915: Apply post-sync write for pipe control invalidates
      drm/i915: reorder edp disabling to fix ivb MacBook Air
      drm/nv86/fifo: suspend fix
      drm/nouveau: disable copy engine on NVAF
      nouveau: fixup scanout enable in nvc0_pm
      drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry
      drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate
      drm/i915: ensure i2c adapter is all set before adding it
      drm/i915: ignore eDP bpc settings from vbt
      drm/i915: Fix blank panel at reopening lid
      drm/nve0/fifo: add support for the flip completion swmthd
  11. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

    authored
    Pull two sparc fixes from David S. Miller.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
      sparc64: Be less verbose during vmemmap population.
      sparc64: do not clobber personality flags in sys_sparc64_personality()
Commits on Aug 15, 2012
  1. @airlied

    Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nou…

    airlied authored
    …veau/linux-2.6 into drm-fixes
    
    * 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6:
      drm/nv86/fifo: suspend fix
      drm/nouveau: disable copy engine on NVAF
      nouveau: fixup scanout enable in nvc0_pm
      drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry
      drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate
      drm/nve0/fifo: add support for the flip completion swmthd
  2. @airlied

    Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danve…

    airlied authored
    …t/drm-intel into drm-fixes
    
    Daniel Vetter writes:
    
    "A few important fixers:
    - fix various lvds backlight issues, regressed in 3.6 (Takashi Iwai)
    - make the retina mbp work (ignore bogus edp bpc value in vbt)
    - fix a gmbus regression introduced in (iirc) 3.4 (Jani Nikula)
    - fix an edp panel power sequence regression, fixes the new macbook air
    - apply the tlb invalidate w/a
    
    Otherwise we still have another gmbus regression (patches are awaiting
    tested-bys) and there's something odd going with some rare systems not
    entering rc6 often enough (and hence blowing through too much power).  It
    seems to be a timing-related issue and can be mitigated by frobbing the
    magic tuning parameters. We're still working on that one. Also, we still
    have some fallout from the hw context support, but you can only hit that
    with mesa master."
    
    * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
      drm/i915: Apply post-sync write for pipe control invalidates
      drm/i915: reorder edp disabling to fix ivb MacBook Air
      drm/i915: ensure i2c adapter is all set before adding it
      drm/i915: ignore eDP bpc settings from vbt
      drm/i915: Fix blank panel at reopening lid
  3. @davem330

    sparc64: Be less verbose during vmemmap population.

    davem330 authored
    On a 2-node machine with 256GB of ram we get 512 lines of
    console output, which is just too much.
    
    This mimicks Yinghai Lu's x86 commit c2b91e2
    (x86_64/mm: check and print vmemmap allocation continuous) except that
    we aren't ever going to get contiguous block pointers in between calls
    so just print when the virtual address or node changes.
    
    This decreases the output by an order of 16.
    
    Also demote this to KERN_DEBUG.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
Commits on Aug 14, 2012
  1. @ickle @danvet

    drm/i915: Apply post-sync write for pipe control invalidates

    ickle authored danvet committed
    When invalidating the TLBs it is documentated as requiring a post-sync
    write. Failure to do so seems to result in a GPU hang.
    
    Exposure to this hang on IVB seems to be a result of removing the extra
    stalls required for SNB pipecontrol workarounds:
    
    commit 6c6cf5a
    Author: Chris Wilson <chris@chris-wilson.co.uk>
    Date:   Fri Jul 20 18:02:28 2012 +0100
    
        drm/i915: Only apply the SNB pipe control w/a to gen6
    
    Note: Manually switch the pipe_control cmd to 4 dwords to avoid a
    (silent) functional conflict with -next. This way will get a loud (but
    conflict with next (since the scratch_addr has been deleted there).
    
    Reported-and-tested-by: yex.tian@intel.com
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=53322
    Acked-by: Ben Widawsky <ben@bwidawsk.net>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    [danvet: added note about merge conflict with -next.]
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  2. @danvet

    drm/i915: reorder edp disabling to fix ivb MacBook Air

    danvet authored
    eDP is tons of fun. It turns out that at least the new MacBook Air 5,1
    model absolutely doesn't like the new force vdd dance we've introduced
    in
    
    commit 6cb4983
    Author: Daniel Vetter <daniel.vetter@ffwll.ch>
    Date:   Sun May 20 17:14:50 2012 +0200
    
        drm/i915: enable vdd when switching off the eDP panel
    
    But that patch also tried to fix some neat edp sequence issue with the
    force_vdd timings. Closer inspection reveals that we've raised
    force_vdd only to do the aux channel communication dp_sink_dpms. If we
    move the edp_panel_off below that, we don't need any force_vdd for the
    disable sequence, which makes the Air happy.
    
    Unfortunately the reporter of the original bug that the above commit
    fixed is travelling, so we can't test whether this regresses things.
    But my theory is that since we don't check for any power-off ->
    force_vdd-on delays in edp_panel_vdd_on, this was the actual
    root-cause of this failure. With that force_vdd dance completely
    eliminated, I'm hopeful the original bug stays fixed, too.
    
    For reference the old bug, which hopefully doesn't get broken by this:
    
    https://bugzilla.kernel.org/show_bug.cgi?id=43163
    
    In any case, regression fixers win over plain bugfixes, so this needs
    to go in asap.
    
    v2: The crucial pieces seems to be to clear the force_vdd flag
    uncoditionally, too, in edp_panel_off. Looks like this is left behind
    by the firmware somehow.
    
    v3: The Apple firmware seems to switch off the panel on it's own, hence
    we still need to keep force_vdd on, but properly clear it when switching
    the panel off.
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=45671
    Tested-by: Roberto Romer <sildurin@gmail.com>
    Tested-by: Daniel Wagner <wagi@monom.org>
    Tested-by: Keith Packard <keithp@keithp.com>
    Cc: stable@vger.kernel.org
    Cc: Keith Packard <keithp@keithp.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    authored
    …/git/s390/linux
    
    Pull s390 patches from Martin Schwidefsky:
     "Included are bug fixes and a patch to enable system call filtering
      with BPF."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
      s390/compat: fix mmap compat system calls
      s390/compat: fix compat wrappers for process_vm system calls
      s390: do not clobber personality flags in sys_32_personality()
      s390/seccomp: add support for system call filtering using BPF
      s390/sclp_sdias: Add missing break and "fall through"
      s390/mm: remove MAX_PHYSADDR_BITS define
  4. Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

    authored
    Pull drm fixes from Dave Airlie:
     "Radeon and intel fixes mostly, one fix to the mgag200 driver to not
      hang on certain server variants."
    
    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (32 commits)
      drm/radeon: fix typo in function header comment
      drm/radeon/kms: implement timestamp userspace query (v2)
      drm/radeon/kms: add MSAA texture support for r600-evergreen
      drm/radeon/kms: reorder code in r600_check_texture_resource
      drm/radeon: fence virtual address and free it once idle v4
      drm/radeon: fix some missing parens in asic macros
      drm/radeon: add some new SI pci ids
      drm/radeon: fix ordering in pll picking on dce4+
      drm/radeon: do not reenable crtc after moving vram start address
      drm/radeon: fix bank tiling parameters on cayman
      drm/radeon: fix bank tiling parameters on evergreen
      drm/radeon: fix bank tiling parameters on SI
      drm/radeon: properly handle crtc powergating
      drm/radeon: properly handle SS overrides on TN (v2)
      drm/radeon/dce4+: set a more reasonable cursor watermark
      drm/radeon: fix handling for ddc type 5 on combios
      drm/mgag200: fix G200ER pll picking algorithm
      drm/edid: Fix potential memory leak in edid_load()
      drm/udl: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(.. [1]
      drm/radeon/kms: allow "invalid" DB formats as a means to disable DB
      ...
  5. @arndb

    GPIO: gpio-pxa: fix building without CONFIG_OF

    arndb authored committed
    Commit 7212157 ("GPIO: gpio-pxa: fix devicetree functions") added an
    "xlate" function pointer to the irq_domain_ops, but this function is nor
    declared or defined anywhere when CONFIG_OF is disabled, causing the
    build error:
    
      drivers/gpio/gpio-pxa.c:532:11: error: 'irq_domain_xlate_twocell' undeclared here (not in a function)
    
    Extending the DT-only code section to cover the irq_domain_ops and the
    pxa_gpio_dt_ids solves this problem and makes it clearer which code is
    actually used without DT.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Aug 13, 2012
  1. @maximlevitsky

    drm/nv86/fifo: suspend fix

    maximlevitsky authored Ben Skeggs committed
    This fix is a backport from the reworked nouveau driver.  It masks off the
    engines we're not expecting to use before attempting a channel kickoff.
    
    Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  2. @rydberg

    drm/nouveau: disable copy engine on NVAF

    rydberg authored Ben Skeggs committed
    The copy engine exhibits random memory corruption in at least one case, the
    GeForce 320M (nv50, 0xaf) in the MacBookAir3,1.
    
    This patch omits creating the engine for the specific chipset, falling back
    to M2MF, which kills the symptoms.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  3. nouveau: fixup scanout enable in nvc0_pm

    Maarten Lankhorst authored Ben Skeggs committed
    Fixes screen being black after changing performance level.
    
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
    Cc: stable@vger.kernel.org [3.5+]
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  4. drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry

    Ben Skeggs authored
    At least partially fixes DP output detection on W530.  Not sure if more
    issues remain, or if my adaptor is just behaving weirdly (it does that
    sometimes).
    
    In any case, this patch is necessary.
    
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  5. drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate

    Christoph Bumiller authored Ben Skeggs committed
    Signed-off-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
    Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    Cc: stable@vger.kernel.org
  6. Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/l…

    Dave Airlie authored
    …inux into drm-fixes
    
    Alex Deucher writes:
    This is the current set of radeon fixes for 3.6.  Nothing too major.
    
    Highlights:
    - various display fixes
    - some SI fixes
    - new SI pci ids
    - major VM fix
    - CS checker support for MSAA
    
    I've tested on a number of cards across generations and noticed no problems.
    
    * 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux:
      drm/radeon: fix typo in function header comment
      drm/radeon/kms: implement timestamp userspace query (v2)
      drm/radeon/kms: add MSAA texture support for r600-evergreen
      drm/radeon/kms: reorder code in r600_check_texture_resource
      drm/radeon: fence virtual address and free it once idle v4
      drm/radeon: fix some missing parens in asic macros
      drm/radeon: add some new SI pci ids
      drm/radeon: fix ordering in pll picking on dce4+
      drm/radeon: do not reenable crtc after moving vram start address
      drm/radeon: fix bank tiling parameters on cayman
      drm/radeon: fix bank tiling parameters on evergreen
      drm/radeon: fix bank tiling parameters on SI
      drm/radeon: properly handle crtc powergating
      drm/radeon: properly handle SS overrides on TN (v2)
      drm/radeon/dce4+: set a more reasonable cursor watermark
      drm/radeon: fix handling for ddc type 5 on combios
  7. @jnikula @danvet

    drm/i915: ensure i2c adapter is all set before adding it

    jnikula authored danvet committed
    i2c_add_adapter() may do i2c transfers on the bus to detect supported
    devices. Therefore the adapter needs to be all set before adding it. This
    was not the case for the bit-banging fallback, resulting in an oops if the
    device detection GMBUS transfers timed out. Fix the issue by calling
    i2c_add_adapter() only after intel_gpio_setup().
    
    LKML-Reference: <5021F00B.7000503@ionic.de>
    Tested-by: Mihai Moldovan <ionic@ionic.de>
    Signed-off-by: Jani Nikula <jani.nikula@intel.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  8. drm/radeon: fix typo in function header comment

    Dmitrii Cherkasov authored Alex Deucher committed
    Signed-off-by: Dmitrii Cherkasov <DCherkasov@luxsoft.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  9. @marekolsak

    drm/radeon/kms: implement timestamp userspace query (v2)

    marekolsak authored Alex Deucher committed
    Returns a snapshot of the GPU clock counter.  Needed
    for certain OpenGL extensions.
    
    v2: agd5f
    - address Jerome's comments
    - add function documentation
    
    Signed-off-by: Marek Olšák <maraeo@gmail.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  10. @marekolsak

    drm/radeon/kms: add MSAA texture support for r600-evergreen

    marekolsak authored Alex Deucher committed
    Most of the checking seems to be in place already. As you can see,
    log2(number of samples) resides in LAST_LEVEL.
    
    This is required for MSAA support (namely for depth-stencil resolve and
    blitting between MSAA resources).
    
    Signed-off-by: Marek Olšák <maraeo@gmail.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  11. @marekolsak

    drm/radeon/kms: reorder code in r600_check_texture_resource

    marekolsak authored Alex Deucher committed
    Signed-off-by: Marek Olšák <maraeo@gmail.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  12. drm/radeon: fence virtual address and free it once idle v4

    Jerome Glisse authored Alex Deucher committed
    Virtual address need to be fenced to know when we can safely remove it.
    This patch also properly clear the pagetable. Previously it was
    serouisly broken.
    
    Kernel 3.5/3.4 need a similar patch but adapted for difference in mutex locking.
    
    v2: For to update pagetable when unbinding bo (don't bailout if
        bo_va->valid is true).
    v3: Add kernel 3.5/3.4 comment.
    v4: Fix compilation warnings.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
  13. drm/radeon: fix some missing parens in asic macros

    Alex Deucher authored
    Better safe than sorry.
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
  14. drm/radeon: add some new SI pci ids

    Alex Deucher authored
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: stable@vger.kernel.org
  15. drm/radeon: fix ordering in pll picking on dce4+

    Alex Deucher authored
    No functional change, but re-order the cases so they
    evaluate properly due to the way the DCE macros work.
    
    Noticed by kallisti5 on IRC.
    
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  16. drm/radeon: do not reenable crtc after moving vram start address

    Jerome Glisse authored Alex Deucher committed
    It seems we can not update the crtc scanout address. After disabling
    crtc, update to base address do not take effect after crtc being
    reenable leading to at least frame being scanout from the old crtc
    base address. Disabling crtc display request lead to same behavior.
    
    So after changing the vram address if we don't keep crtc disabled
    we will have the GPU trying to read some random system memory address
    with some iommu this will broke the crtc engine and will lead to
    broken display and iommu error message.
    
    So to avoid this, disable crtc. For flicker less boot we will need
    to avoid moving the vram start address.
    
    This patch should also fix :
    
    https://bugs.freedesktop.org/show_bug.cgi?id=42373
    
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Something went wrong with that request. Please try again.