1. 24 7月, 2015 3 次提交
    • D
      Merge tag 'drm-intel-next-2015-07-17' of git://anongit.freedesktop.org/drm-intel into drm-next · f60de976
      Dave Airlie 提交于
      - prelim hw support dropped for skl after Damien fixed an ABI issue around
        planes
      - legacy modesetting is done using atomic infrastructure now (Maarten)!
      - more gen9 workarounds (Arun&Nick)
      - MOCS programming (cache control for better performance) for skl/bxt
      - vlv/chv dpll improvements (Ville)
      - PSR fixes from Rodrigo
      - fbc improvements from Paulo
      - plumb requests into execlist submit functions (Mika)
      - opregion code cleanup from Jani
      - resource streamer support from Abdiel for mesa
      - final fixes for 12bpc hdmi + enabling support from Ville
      drm-intel-next-2015-07-03:
      - dsi improvements (Gaurav)
      - bxt ddi dpll hw state readout (Imre)
      - chv dvfs support and overall wm improvements for both vlv and chv (Ville)
      - ppgtt polish from Mika and Michel
      - cdclk support for bxt (Bob Pauwe)
      - make frontbuffer tracking more precise
      - OLR removal (John Harrison)
      - per-ctx WA batch buffer support (Arun Siluvery)
      - remvoe KMS Kconfig option (Chris)
      - more hpd handling refactoring from Jani
      - use atomic states throughout modeset code and integrate with atomic plane
        update (Maarten)
      drm-intel-next-2015-06-19:
      - refactoring hpd irq handlers (Jani)
      - polish skl dpll code a bit (Damien)
      - dynamic cdclk adjustement (Ville & Mika)
      - fix up 12bpc hdmi and enable it for real again (Ville)
      - extend hsw cmd parser to be useful for atomic configuration (Franscico Jerez)
      - even more atomic conversion and rolling state handling out across modeset code
        from Maarten & Ander
      - fix DRRS idleness detection (Ramalingam)
      - clean up dsp address alignment handling (Ville)
      - some fbc cleanup patches from Paulo
      - prevent hard-hangs when trying to reset the gpu on skl (Mika)
      
      * tag 'drm-intel-next-2015-07-17' of git://anongit.freedesktop.org/drm-intel: (386 commits)
        drm/i915: Update DRIVER_DATE to 20150717
        drm/i915/skl: Drop the preliminary_hw_support flag
        drm/i915/skl: Don't expose the top most plane on gen9 display
        drm/i915: Fix divide by zero on watermark update
        drm/i915: Invert fastboot check
        drm/i915: Clarify logic for initial modeset
        drm/i915: Unconditionally check gmch pfit state
        drm/i915: always disable irqs in intel_pipe_update_start
        drm/i915: Remove use of runtime pm in atomic commit functions
        drm/i915: Call plane update functions directly from intel_atomic_commit.
        drm/i915: Use full atomic modeset.
        drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
        drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
        drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
        drm/i915: Enable WA batch buffers for Gen9
        drm/i915/gen9: Implement WaDisableKillLogic for gen 9
        drm/i915: Use expcitly fixed type in compat32 structs
        drm/i915: Fix noatomic crtc disabling, v2.
        drm/i915: fill in more mode members
        drm/i915: Added BXT check in HAS_CORE_RING_FREQ macro
        ...
      f60de976
    • D
      Merge tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel into drm-next · fa78ceab
      Dave Airlie 提交于
      Update drm-misc pull request since the first one didn't go in yet. Few
      atomic helper patches, rejecting some old dri1 crap for modern drivers and
      a few trivial things on top.
      
      * tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel:
        drm/mgag200: remove unneeded variable
        drm/mgag200: remove unused variables
        drm/atomic: Only update crtc->x/y if it's part of the state, v2.
        drm/fb: drop panic handling
        drm: Fix warning with make xmldocs caused by drm_irq.c
        drm/gem: rip out drm vma accounting for gem mmaps
        drm/fourcc: Add formats R8, RG88, GR88
        drm/atomic: Cleanup on error properly in the atomic ioctl.
        drm: Update plane->fb also for page_flip
        drm: remove redundant code form drm_ioc32.c
        drm: reset empty state in transitional helpers
        drm/crtc-helper: Fixup error handling in drm_helper_crtc_mode_set
        drm/atomic: Update old_fb after setting a property.
        drm: Remove useless blank line
        drm: Reject DRI1 hw lock ioctl functions for kms drivers
        drm: Convert drm_legacy_ctxbitmap_init to void return type
        drm: Turn off Legacy Context Functions
      fa78ceab
    • D
      Merge tag 'drm-amdkfd-next-2015-07-20' of git://people.freedesktop.org/~gabbayo/linux into drm-next · 5da612fa
      Dave Airlie 提交于
      - Add Carrizo support for amdkfd, using the new amdgpu driver as the relevant
        kgd. The support includes interfaces with amdgpu both for gfx7 (Kaveri) and
        gfx8 (Carrizo). However, gfx7 interface is used for debugging purposes only,
        so amdkfd defaults to using radeon when Kaveri is installed.
      
      I would like to note that no new IOCTLs are being introduced, and there is no
      change in the current IOCTLs, as they are suited both for gfx7 and gfx8.
      
      * tag 'drm-amdkfd-next-2015-07-20' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: Set correct doorbell packet type for Carrizo
        drm/amdkfd: Use generic defines in new amd headers
        drm/amdkfd: Implement create_map_queues() for Carrizo
        drm/amdkfd: fix runlist length calculation
        drm/amdkfd: Add support for VI in DQM
        drm/amdkfd: add support for VI in MQD manager
        drm/amdkfd: add CP HWS packet headers for VI
        drm/amdkfd: add supported CZ devices PCI IDs to amdkfd
        drm/amdkfd: Add dependency of DRM_AMDGPU to Kconfig
        drm/amdgpu: Add amdgpu <--> amdkfd gfx8 interface
        drm/amdgpu: add amdgpu <--> amdkfd gfx7 interface
        drm/amdgpu: Add H/W agnostic amdgpu <--> amdkfd interface
        drm/radeon: Modify kgd_engine_type enum to match CZ
      5da612fa
  2. 20 7月, 2015 18 次提交
  3. 19 7月, 2015 10 次提交
    • M
      MIPS: fpu.h: Allow 64-bit FPU on a 64-bit MIPS R6 CPU · fcc53b5f
      Markos Chandras 提交于
      Commit 6134d949 ("MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6")
      added support for 64-bit FPU on a 32-bit MIPS R6 processor but it missed
      the 64-bit CPU case leading to FPU failures when requesting FR=1 mode
      (which is always the case for MIPS R6 userland) when running a 32-bit
      kernel on a 64-bit CPU. We also fix the MIPS R2 case.
      Signed-off-by: NMarkos Chandras <markos.chandras@imgtec.com>
      Fixes: 6134d949 ("MIPS: asm: fpu: Allow 64-bit FPU on MIPS32 R6")
      Reviewed-by: NPaul Burton <paul.burton@imgtec.com>
      Cc: <stable@vger.kernel.org> # 4.0+
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/10734/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      fcc53b5f
    • C
      parisc: mm: Fix a memory leak related to pmd not attached to the pgd · 4c4ac9a4
      Christophe Jaillet 提交于
      Commit 0e0da48d ("parisc: mm: don't count preallocated pmds")
      introduced a memory leak.
      
      After this commit, the 'return' statement in pmd_free is executed in all
      cases. Even for pmd that are not attached to the pgd.  So 'free_pages'
      can never be called anymore, leading to a memory leak.
      Signed-off-by: NChristophe JAILLET <christophe.jaillet@wanadoo.fr>
      Acked-by: NKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Acked-by: NMikulas Patocka <mpatocka@redhat.com>
      Acked-by: NHelge Deller <deller@gmx.de>
      Cc: stable@vger.kernel.org  # v4.0+
      Signed-off-by: NHelge Deller <deller@gmx.de>
      4c4ac9a4
    • O
      Merge tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux into fixesD · 3eae03da
      Olof Johansson 提交于
      Merge "pxa fixes for v4.2" from Robert Jarzmik:
      
      ARM: pxa: fixes for v4.2-rc2
      
      This single fix reenables ethernet cards for several pxa boards,
      broken by regulator addition to dm9000 driver.
      
      * tag 'pxa-fixes-v4.2-rc2' of https://github.com/rjarzmik/linux:
        ARM: pxa: fix dm9000 platform data regression
      3eae03da
    • L
      Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 9d37e667
      Linus Torvalds 提交于
      Pull ARM fixes from Russell King:
       "A small set of ARM fixes for -rc3, most of them not far off
        one-liners, with the exception of fixing the V7 cache invalidation for
        incoming SMP processors which was causing problems for SoCFPGA
        devices"
      
      * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        ARM: fix __virt_to_idmap build error on !MMU
        ARM: invalidate L1 before enabling coherency
        ARM: 8404/1: dma-mapping: fix off-by-one error in bitmap size check
        ARM: 8402/1: perf: Don't use of_node after putting it
        ARM: 8400/1: use virt_to_idmap to get phys_reset address
      9d37e667
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0e1dbccd
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "Two families of fixes:
      
         - Fix an FPU context related boot crash on newer x86 hardware with
           larger context sizes than what most people test.  To fix this
           without ugly kludges or extensive reverts we had to touch core task
           allocator, to allow x86 to determine the task size dynamically, at
           boot time.
      
           I've tested it on a number of x86 platforms, and I cross-built it
           to a handful of architectures:
      
                                              (warns)               (warns)
             testing     x86-64:  -git:  pass (    0),  -tip:  pass (    0)
             testing     x86-32:  -git:  pass (    0),  -tip:  pass (    0)
             testing        arm:  -git:  pass ( 1359),  -tip:  pass ( 1359)
             testing       cris:  -git:  pass ( 1031),  -tip:  pass ( 1031)
             testing       m32r:  -git:  pass ( 1135),  -tip:  pass ( 1135)
             testing       m68k:  -git:  pass ( 1471),  -tip:  pass ( 1471)
             testing       mips:  -git:  pass ( 1162),  -tip:  pass ( 1162)
             testing    mn10300:  -git:  pass ( 1058),  -tip:  pass ( 1058)
             testing     parisc:  -git:  pass ( 1846),  -tip:  pass ( 1846)
             testing      sparc:  -git:  pass ( 1185),  -tip:  pass ( 1185)
      
           ... so I hope the cross-arch impact 'none', as intended.
      
           (by Dave Hansen)
      
         - Fix various NMI handling related bugs unearthed by the big asm code
           rewrite and generally make the NMI code more robust and more
           maintainable while at it.  These changes are a bit late in the
           cycle, I hope they are still acceptable.
      
           (by Andy Lutomirski)"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86
        x86/fpu, sched: Dynamically allocate 'struct fpu'
        x86/entry/64, x86/nmi/64: Add CONFIG_DEBUG_ENTRY NMI testing code
        x86/nmi/64: Make the "NMI executing" variable more consistent
        x86/nmi/64: Minor asm simplification
        x86/nmi/64: Use DF to avoid userspace RSP confusing nested NMI detection
        x86/nmi/64: Reorder nested NMI checks
        x86/nmi/64: Improve nested NMI comments
        x86/nmi/64: Switch stacks on userspace NMI entry
        x86/nmi/64: Remove asm code that saves CR2
        x86/nmi: Enable nested do_nmi() handling for 64-bit kernels
      0e1dbccd
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · dae57fb6
      Linus Torvalds 提交于
      Pull timer fix from Ingo Molnar:
       "Fix for a misplaced export that can cause build failures in certain
        (rare) Kconfig situations"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tick: Move the export of tick_broadcast_oneshot_control to the proper place
      dae57fb6
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d65b78f5
      Linus Torvalds 提交于
      Pull scheduler fix from Ingo Molnar:
       "A oneliner rq throttling fix"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/fair: Test list head instead of list entry in throttle_cfs_rq()
      d65b78f5
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f79a17bf
      Linus Torvalds 提交于
      Pull perf fixes from Ingo Molnar:
       "Mostly tooling fixes, plus a static key fix fixing /sys/devices/cpu/rdpmc"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools: Really allow to specify custom CC, AR or LD
        perf auxtrace: Fix misplaced check for HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT
        perf hists browser: Take the --comm, --dsos, etc filters into account
        perf symbols: Store if there is a filter in place
        x86, perf: Fix static_key bug in load_mm_cr4()
        tools: Copy lib/hweight.c from the kernel sources
        perf tools: Fix the detached tarball wrt rbtree copy
        perf thread_map: Fix the sizeof() calculation for map entries
        tools lib: Improve clean target
        perf stat: Fix shadow declaration of close
        perf tools: Fix lockup using 32-bit compat vdso
      f79a17bf
    • L
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 59ee7621
      Linus Torvalds 提交于
      Pull irq fixes from Ingo Molnar:
       "Misc irq fixes:
      
         - two driver fixes
         - a Xen regression fix
         - a nested irq thread crash fix"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/gicv3-its: Fix mapping of LPIs to collections
        genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD
        genirq: Revert sparse irq locking around __cpu_up() and move it to x86 for now
        gpio/davinci: Fix race in installing chained irq handler
      59ee7621
    • L
      Merge branch 'akpm' (patches from Andrew) · 3a26a5b1
      Linus Torvalds 提交于
      Merge fixes from Andrew Morton:
       "25 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (25 commits)
        lib/decompress: set the compressor name to NULL on error
        mm/cma_debug: correct size input to bitmap function
        mm/cma_debug: fix debugging alloc/free interface
        mm/page_owner: set correct gfp_mask on page_owner
        mm/page_owner: fix possible access violation
        fsnotify: fix oops in fsnotify_clear_marks_by_group_flags()
        /proc/$PID/cmdline: fixup empty ARGV case
        dma-debug: skip debug_dma_assert_idle() when disabled
        hexdump: fix for non-aligned buffers
        checkpatch: fix long line messages about patch context
        mm: clean up per architecture MM hook header files
        MAINTAINERS: uclinux-h8-devel is moderated for non-subscribers
        mailmap: update Sudeep Holla's email id
        Update Viresh Kumar's email address
        mm, meminit: suppress unused memory variable warning
        configfs: fix kernel infoleak through user-controlled format string
        include, lib: add __printf attributes to several function prototypes
        s390/hugetlb: add hugepages_supported define
        mm: hugetlb: allow hugepages_supported to be architecture specific
        revert "s390/mm: make hugepages_supported a boot time decision"
        ...
      3a26a5b1
  4. 18 7月, 2015 9 次提交