1. 18 7月, 2015 25 次提交
  2. 17 7月, 2015 15 次提交
    • J
      drm/ttm: improve uncached page deallocation. · e9308884
      Jérôme Glisse 提交于
      Calls to set_memory_wb() incure heavy TLB flush and IPI cost. To
      minimize those wait until pool grow beyond batch size before
      draining the pool.
      Signed-off-by: NJérôme Glisse <jglisse@redhat.com>
      Reviewed-by: NMario Kleiner <mario.kleiner.de@gmail.com>
      Reviewed-and-Tested-by: NMichel Dänzer <michel@daenzer.net>
      Reviewed-by: NKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Thomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e9308884
    • J
      drm/ttm: fix uncached page deallocation to properly fill page pool v3. · ef2b7317
      Jérôme Glisse 提交于
      Current code never allowed the page pool to actualy fill in anyway.
      This fix it, so that we only start freeing page from the pool when
      we go over the pool size.
      
      Changed since v1:
        - Move the page batching optimization to its separate patch.
      
      Changed since v2:
        - Do not remove code part of the batching optimization with
          this patch.
        - Better commit message.
      Signed-off-by: NJérôme Glisse <jglisse@redhat.com>
      Reviewed-by: NMario Kleiner <mario.kleiner.de@gmail.com>
      Reviewed-and-Tested-by: NMichel Dänzer <michel.daenzer@amd.com>
      Reviewed-by: NKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Thomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: NAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      ef2b7317
    • L
      Merge tag 'pm+acpi-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 21bdb584
      Linus Torvalds 提交于
      Pull power management and ACPI fixes from Rafael Wysocki:
       "These fix two bugs in the cpufreq core (including one recent
        regression), fix a 4.0 PCI regression related to the ACPI resources
        management and quieten an RCU-related lockdep complaint about a
        tracepoint in the suspend-to-idle code.
      
        Specifics:
      
         - Fix a recently introduced issue in the cpufreq policy object
           reinitialization that leads to CPU offline/online breakage (Viresh
           Kumar)
      
         - Make it possible to access frequency tables of offline CPUs which
           is needed by thermal management code among other things (Viresh
           Kumar)
      
         - Fix an ACPI resource management regression introduced during the
           4.0 cycle that may cause incorrect resource validation results to
           appear in 32-bit x86 kernels due to silent truncation of 64-bit
           values to 32-bit (Jiang Liu)
      
         - Fix up an RCU-related lockdep complaint about suspicious RCU usage
           in idle caused by using a suspend tracepoint in the core suspend-
           to-idle code (Rafael J Wysocki)"
      
      * tag 'pm+acpi-4.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PCI: Fix regressions caused by resource_size_t overflow with 32-bit kernel
        cpufreq: Allow freq_table to be obtained for offline CPUs
        cpufreq: Initialize the governor again while restoring policy
        suspend-to-idle: Prevent RCU from complaining about tick_freeze()
      21bdb584
    • L
      Merge tag 'platform-drivers-x86-v4.2-3' of... · 3e87ee06
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v4.2-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver fixes from Darren Hart:
       "Fix SMBIOS call handling and hwswitch state coherency in the
        dell-laptop driver.  Cleanups for intel_*_ipc drivers.  Details:
      
        dell-laptop:
         - Do not cache hwswitch state
         - Check return value of each SMBIOS call
         - Clear buffer before each SMBIOS call
      
        intel_scu_ipc:
         - Move local memory initialization out of a mutex
      
        intel_pmc_ipc:
         - Update kerneldoc formatting
         - Fix compiler casting warnings"
      
      * tag 'platform-drivers-x86-v4.2-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        intel_scu_ipc: move local memory initialization out of a mutex
        intel_pmc_ipc: Update kerneldoc formatting
        dell-laptop: Do not cache hwswitch state
        dell-laptop: Check return value of each SMBIOS call
        dell-laptop: Clear buffer before each SMBIOS call
        intel_pmc_ipc: Fix compiler casting warnings
      3e87ee06
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · f85c7124
      Linus Torvalds 提交于
      Pull m68knommu/coldfire fixes from Greg Ungerer:
       "Contains build fixes and updates for the ColdFire defconfigs.
      
        Specifically there is a couple of fixes that address problems building
        allnoconfig.  Also fix for enabling PCI bus on the M54xx family of
        ColdFire"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: enable PCI support for m5475evb defconfig
        m68k: fix io functions for ColdFire/MMU/PCI case
        m68knommu: update defconfig for ColdFire m5475evb
        m68knommu: update defconfig for ColdFire m5407c3
        m68knommu: update defconfig for ColdFire m5307c3
        m68knommu: update defconfig for ColdFire m5275evb
        m68knommu: update defconfig for ColdFire m5272c3
        m68knommu: update defconfig for ColdFire m5249evb
        m68knommu: update defconfig for m5208evb
        m68knommu: make ColdFire SoC selection a choice
        m68knommu: improve the clock configuration defaults
        m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire
      f85c7124
    • D
      Merge branch 'drm-rockchip-2015-07-13' of... · aaab3bba
      Dave Airlie 提交于
      Merge branch 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes
      
      misc rockchip fixes.
      
      * 'drm-rockchip-2015-07-13' of https://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: vop: remove hardware cursor window
        drm/rockchip: vop: switch cursor plane to window 3
        drm/rockchip: Drop owner assignment from platform_driver
        drm/rockchip: use drm_gem_mmap helpers
        drm/rockchip: only call drm_fb_helper_hotplug_event if fb_helper present
        drm/rockchip: Add BGR formats to VOP
      aaab3bba
    • D
      Merge tag 'imx-drm-fixes-2015-07-14' of git://git.pengutronix.de/git/pza/linux into drm-fixes · e1e50e1e
      Dave Airlie 提交于
      imx-drm: fixes for parallel-display, imx-tve, and ipu-common
      
      These patches fix the parallel-display driver to use the standard OF
      graph bindings for connecting a drm_panel via device tree instead of
      an undocumented, driver specific device tree property, take care to
      disable all IPU interrupts before setting up the irq chip to fix a
      kexec lockup, and fix VGA output on i.MX53-QSB boards by correcting
      the media bus format set by the imx-tve driver.
      
      * tag 'imx-drm-fixes-2015-07-14' of git://git.pengutronix.de/git/pza/linux:
        drm/imx: tve: fix media bus format for VGA output
        GPU: ipu: fix lockup caused by pending chained interrupts
        drm/imx: parallel-display: fix drm_panel support
      e1e50e1e
    • D
      Merge branch 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-fixes · 8f6644ca
      Dave Airlie 提交于
      A range of fixes for the Armada DRM driver:
      - A missing wakeup could result in overlay frames being delayed, causing
        video playback to hiccup.
      - Avoid unmapping a dma-buf attachment which was never mapped
      - Fix the overlay when partially off the screen by switching to the
        drm_plane_helper_check_update() helper and using the calculated
        coordinates to set the start address.
      - Remove an incorrect assignment to crtc->mode - which should be the
        unadjusted mode.
      - Fix a missing call to drm_plane_cleanup() in the overlay code.
      
      * 'drm-armada-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
        drm/armada: avoid saving the adjusted mode to crtc->mode
        drm/armada: fix overlay when partially off-screen
        drm/armada: convert overlay to use drm_plane_helper_check_update()
        drm/armada: fix gem object free after failed prime import
        drm/armada: fix incorrect overlay plane cleanup
        drm/armada: fix missing overlay wake-up
      8f6644ca
    • D
      Merge tag 'drm-intel-fixes-2015-07-15' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 61f2669f
      Dave Airlie 提交于
      Next batch of i915 fixes. Note that the compat32 patch here needs the drm
      core one to be actually useful, I'll send you that one with a separate
      drm-fixes pull request. One revert because a fix in -rc2 did break
      existing userspace.
      
      * tag 'drm-intel-fixes-2015-07-15' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Do not call intel_crtc_disable if the crtc is already disabled.
        Revert "drm/i915: Declare the swizzling unknown for L-shaped configurations"
        drm/i915: Forward all core DRM ioctls to core compat handling
        drm/i915: fix oops in primary_check_plane
        drm/i915: remove unused has_dma_mapping flag
        drm/i915: Fix missing return warning for !CONFIG_DEBUGFS
        drm/i915: avoid leaking DMA mappings
        drm/i915: Snapshot seqno of most recently submitted request.
        drm/i915: Store device pointer in contexts for late tracepoint usafe
      61f2669f
    • D
      Merge tag 'topic/drm-fixes-2015-07-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 37553983
      Dave Airlie 提交于
      Ok next attempt at drm-fixes pull. Big thing really is just the compat32
      one for addfb2.1.
      
      * tag 'topic/drm-fixes-2015-07-16' of git://anongit.freedesktop.org/drm-intel:
        drm: Provide compat ioctl for addfb2.1
        Documentation: drm: Fix tablulation in KMS properties table
        drm: add a check for x/y in drm_mode_setcrtc
        drm/rockchip: use drm_gem_mmap helpers
      37553983
    • D
      Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 90438ac8
      Dave Airlie 提交于
      More radeon and amdgpu fixes for 4.2.  Mostly amdgpu bug fixes.
      
      * 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu/dce8: Re-set VBLANK interrupt state when enabling a CRTC
        drm/radeon/ci: silence a harmless PCC warning
        drm/amdgpu/cz: silence some dpm debug output
        drm/amdgpu/cz: store the forced dpm level
        drm/amdgpu/cz: unforce dpm levels before forcing to low/high
        drm/amdgpu: remove bogus check in gfx8 rb setup
        drm/amdgpu: set proper index/data pair for smc regs on CZ (v2)
        drm/amdgpu: disable the IP module if early_init returns -ENOENT (v2)
        drm/amdgpu: stop context leak in the error path
        drm/amdgpu: validate the context id in the dependencies
        drm/radeon: fix user ptr race condition
        drm/radeon: Don't flush the GART TLB if rdev->gart.ptr == NULL
        drm/radeon: add a dpm quirk for Sapphire Radeon R9 270X 2GB GDDR5
      90438ac8
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 761ab766
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "A collection of fixes from the last few weeks that should go into the
        current series.  This contains:
      
         - Various fixes for the per-blkcg policy data, fixing regressions
           since 4.1.  From Arianna and Tejun
      
         - Code cleanup for bcache closure macros from me.  Really just
           flushing this out, it's been sitting in another branch for months
      
         - FIELD_SIZEOF cleanup from Maninder Singh
      
         - bio integrity oops fix from Mike
      
         - Timeout regression fix for blk-mq from Ming Lei"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: set default timeout as 30 seconds
        NVMe: Reread partitions on metadata formats
        bcache: don't embed 'return' statements in closure macros
        blkcg: fix blkcg_policy_data allocation bug
        blkcg: implement all_blkcgs list
        blkcg: blkcg_css_alloc() should grab blkcg_pol_mutex while iterating blkcg_policy[]
        blkcg: allow blkcg_pol_mutex to be grabbed from cgroup [file] methods
        block/blk-cgroup.c: free per-blkcg data when freeing the blkcg
        block: use FIELD_SIZEOF to calculate size of a field
        bio integrity: do not assume bio_integrity_pool exists if bioset exists
      761ab766
    • L
      Merge tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy · f76d94de
      Linus Torvalds 提交于
      Pull jfs fixes from David Kleikamp:
       "A couple trivial fixes and an error path fix"
      
      * tag 'jfs-4.2' of git://github.com/kleikamp/linux-shaggy:
        jfs: clean up jfs_rename and fix out of order unlock
        jfs: fix indentation on if statement
        jfs: removed a prohibited space after opening parenthesis
      f76d94de
    • R
      Merge branches 'pm-cpuidle', 'pm-cpufreq' and 'acpi-resources' · 17ffc8b0
      Rafael J. Wysocki 提交于
      * pm-cpuidle:
        suspend-to-idle: Prevent RCU from complaining about tick_freeze()
      
      * pm-cpufreq:
        cpufreq: Allow freq_table to be obtained for offline CPUs
        cpufreq: Initialize the governor again while restoring policy
      
      * acpi-resources:
        ACPI / PCI: Fix regressions caused by resource_size_t overflow with 32-bit kernel
      17ffc8b0
    • M
      drm/amdgpu/dce8: Re-set VBLANK interrupt state when enabling a CRTC · 1002d718
      Michel Dänzer 提交于
      Something (ATOM BIOS?) seems to be clobbering the LB_INTERRUPT_MASK
      register while the CRTC is off, which caused e.g. glxgears or
      gnome-shell to hang after a modeset.
      Signed-off-by: NMichel Dänzer <michel.daenzer@amd.com>
      Reviewed-by: NJammy Zhou <Jammy.Zhou@amd.com>
      1002d718