1. 31 12月, 2015 18 次提交
  2. 30 12月, 2015 1 次提交
    • D
      Merge branch 'drm-rockchip-next-2015-12-28' of... · df83690e
      Dave Airlie 提交于
      Merge branch 'drm-rockchip-next-2015-12-28' of https://github.com/markyzq/kernel-drm-rockchip into drm-next
      
      These patches convert drm/rockchip to atomic API and add rk3036 vop support.
      
      * 'drm-rockchip-next-2015-12-28' of https://github.com/markyzq/kernel-drm-rockchip:
        dt-bindings: add document for rk3036-vop
        drm/rockchip: vop: add rk3036 vop support
        drm/rockchip: vop: spilt scale regsters
        drm/rockchip: vop: spilt register related into rockchip_reg_vop.c
        drm/rockchip: vop: move interrupt registers into vop_data
        drm/rockchip: vop: merge vop cfg_done into vop_data
        drm/rockchip: dw_hdmi: use encoder enable function
        drm: bridge/dw_hdmi: add atomic API support
        drm/rockchip: direct config connecter gate and out_mode
        drm/rockchip: support atomic asynchronous commit
        drm/rockchip: Optimization vop mode set
        drm/rockchip: Convert to support atomic API
        drm/rockchip: vop: replace dpms with enable/disable
        drm/rockchip: Use new vblank api drm_crtc_vblank_*
      df83690e
  3. 28 12月, 2015 14 次提交
  4. 24 12月, 2015 3 次提交
    • D
      Backmerge drm-fixes merge into Linus's tree into drm-next. · 20f8e032
      Dave Airlie 提交于
      This merges '5b726e06' into drm-next
      
      Just to resolve some merges to make Daniel's life easier.
      Signed-off-by: NDAve Airlie <airlied@redhat.com>
      20f8e032
    • L
      Merge tag 'drm-intel-fixes-2015-12-23' of git://anongit.freedesktop.org/drm-intel · 5b726e06
      Linus Torvalds 提交于
      Pull i915 drm fixes from Jani Nikula:
       "Here's a batch of i915 fixes all around.  It may be slightly bigger
        than one would hope for at this stage, but they've all been through
        testing in our -next before being picked up for v4.4.  Also, I missed
        Dave's fixes pull earlier today just because I wanted an extra testing
        round on this.  So I'm fairly confident.
      
        Wishing you all the things it is customary to wish this time of the
        year"
      
      * tag 'drm-intel-fixes-2015-12-23' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Correct max delay for HDMI hotplug live status checking
        drm/i915: mdelay(10) considered harmful
        drm/i915: Kill intel_crtc->cursor_bo
        drm/i915: Workaround CHV pipe C cursor fail
        drm/i915: Only spin whilst waiting on the current request
        drm/i915: Limit the busy wait on requests to 5us not 10ms!
        drm/i915: Break busywaiting for requests on pending signals
        drm/i915: Disable primary plane if we fail to reconstruct BIOS fb (v2)
        drm/i915: Set the map-and-fenceable flag for preallocated objects
        drm/i915: Drop the broken cursor base==0 special casing
      5b726e06
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 2bfd43d8
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Not much happening, should have dequeued this lot earlier.
      
        One amdgpu, one nouveau and one exynos fix"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/exynos: atomic check only enabled crtc states
        drm/nouveau/bios/fan: hardcode the fan mode to linear
        drm/amdgpu: fix user fence handling
      2bfd43d8
  5. 23 12月, 2015 4 次提交
    • D
      Merge tag 'drm-intel-next-2015-12-18' of git://anongit.freedesktop.org/drm-intel into drm-next · ade1ba73
      Dave Airlie 提交于
      - fix atomic watermark recomputation logic (Maarten)
      - modeset sequence fixes for LPT (Ville)
      - more kbl enabling&prep work (Rodrigo, Wayne)
      - first bits for mst audio
      - page dirty tracking fixes from Dave Gordon
      - new get_eld hook from Takashi, also included in the sound tree
      - fixup cursor handling when placed at address 0 (Ville)
      - refactor VBT parsing code (Jani)
      - rpm wakelock debug infrastructure ( Imre)
      - fbdev is pinned again (Chris)
      - tune the busywait logic to avoid wasting cpu cycles (Chris)
      
      * tag 'drm-intel-next-2015-12-18' of git://anongit.freedesktop.org/drm-intel: (81 commits)
        drm/i915: Update DRIVER_DATE to 20151218
        drm/i915/skl: Default to noncoherent access up to F0
        drm/i915: Only spin whilst waiting on the current request
        drm/i915: Limit the busy wait on requests to 5us not 10ms!
        drm/i915: Break busywaiting for requests on pending signals
        drm/i915: don't enable autosuspend on platforms without RPM support
        drm/i915/backlight: prefer dev_priv over dev pointer
        drm/i915: Disable primary plane if we fail to reconstruct BIOS fb (v2)
        drm/i915: Pin the ifbdev for the info->system_base GGTT mmapping
        drm/i915: Set the map-and-fenceable flag for preallocated objects
        drm/i915: mdelay(10) considered harmful
        drm/i915: check that we are in an RPM atomic section in GGTT PTE updaters
        drm/i915: add support for checking RPM atomic sections
        drm/i915: check that we hold an RPM wakelock ref before we put it
        drm/i915: add support for checking if we hold an RPM reference
        drm/i915: use assert_rpm_wakelock_held instead of opencoding it
        drm/i915: add assert_rpm_wakelock_held helper
        drm/i915: remove HAS_RUNTIME_PM check from RPM get/put/assert helpers
        drm/i915: get a permanent RPM reference on platforms w/o RPM support
        drm/i915: refactor RPM disabling due to RC6 being disabled
        ...
      ade1ba73
    • D
      Merge branch 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux into drm-next · fd3e14ff
      Dave Airlie 提交于
      [airlied: fixup build problems on arm - added errno.h include]
      * 'drm-next-4.5' of git://people.freedesktop.org/~agd5f/linux: (152 commits)
        amd/powerplay: fix copy paste typo in hardwaremanager.c
        amd/powerplay: disable powerplay by default initially
        amd/powerplay: don't enable ucode fan control if vbios has no fan table
        drm/amd/powerplay: show gpu load when print gpu performance for Cz. (v2)
        drm/amd/powerplay: check whether need to enable thermal control. (v2)
        drm/amd/powerplay: add point check to avoid NULL point hang.
        drm/amdgpu/powerplay: Program a calculated value as Deep Sleep clock.
        drm/amd/powerplay: Don't return an error if fan table is missing
        drm/powerplay/hwmgr: log errors in tonga_hwmgr_backend_init
        drm/powerplay: add debugging output to processpptables.c
        drm/powerplay: add debugging output to tonga_processpptables.c
        amd/powerplay: Add structures required to report configuration change
        amd/powerplay: Fix get dal power level
        amd\powerplay Implement get dal power level
        drm/amd/powerplay: display gpu load when print performance for tonga.
        drm/amdgpu/powerplay: enable sysfs and debugfs interfaces late
        drm/amd/powerplay: move shared function of vi to hwmgr. (v2)
        drm/amd/powerplay: check whether enable dpm in powerplay.
        drm/amd/powerplay: fix bug that dpm funcs in debugfs/sysfs missing.
        drm/amd/powerplay: fix boolreturn.cocci warnings
        ...
      fd3e14ff
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 24bc3ea5
      Linus Torvalds 提交于
      Pull block layer fixes from Jens Axboe:
       "Three small fixes for 4.4 final. Specifically:
      
         - The segment issue fix from Junichi, where the old IO path does a
           bio limit split before potentially bouncing the pages.  We need to
           do that in the right order, to ensure that limitations are met.
      
         - A NVMe surprise removal IO hang fix from Keith.
      
         - A use-after-free in null_blk, introduced by a previous patch in
           this series.  From Mike Krinkin"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        null_blk: fix use-after-free error
        block: ensure to split after potentially bouncing a bio
        NVMe: IO ending fixes on surprise removal
      24bc3ea5
    • L
      Merge tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux · 0bee6ec8
      Linus Torvalds 提交于
      Pull nfsd fix from Bruce Fields:
       "Just one fix for a NFSv4 callback bug introduced in 4.4"
      
      * tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux:
        nfsd: don't hold ls_mutex across a layout recall
      0bee6ec8