1. 29 Oct, 2015 2 commits
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next · f1a04d82
      Dave Airlie authored
      More amdgpu and radeon stuff for drm-next.  Stoney support is the big change.
      The rest is just bug fixes and code cleanups.  The Stoney stuff is pretty
      low impact with respect to existing chips.
      
      * 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu: change VM size default to 64GB
        drm/amdgpu: add Stoney pci ids
        drm/amdgpu: update the core VI support for Stoney
        drm/amdgpu: add VCE support for Stoney (v2)
        drm/amdgpu: add UVD support for Stoney
        drm/amdgpu: add GFX support for Stoney (v2)
        drm/amdgpu: add SDMA support for Stoney (v2)
        drm/amdgpu: add DCE support for Stoney
        drm/amdgpu: Update SMC/DPM for Stoney
        drm/amdgpu: add GMC support for Stoney
        drm/amdgpu: add Stoney chip family
        drm/amdgpu: fix the broken vm->mutex V2
        drm/amdgpu: remove the unnecessary parameter adev for amdgpu_fence_wait_any()
        drm/amdgpu: remove the exclusive lock
        drm/amdgpu: remove old lockup detection infrastructure
        drm: fix trivial typos
        drm/amdgpu/dce: simplify suspend/resume
        drm/amdgpu/gfx8: set TC_WB_ACTION_EN in RELEASE_MEM packet
        drm/radeon: Use rdev->gem.mutex to protect hyperz/cmask owners
      f1a04d82
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2015-10-22' of... · 974e59ba
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2015-10-22' of git://anongit.freedesktop.org/drm-intel into drm-next
      
      Bunch of -fixes for 4.4. Well not just, I've left the mmio/register work
      from Ville in here since it's low-risk but lots of churn all over.
      
      * tag 'drm-intel-next-fixes-2015-10-22' of git://anongit.freedesktop.org/drm-intel: (23 commits)
        drm/i915: Use round to closest when computing the CEA 1.001 pixel clocks
        drm/i915: Kill the leftover RMW from ivb_sprite_disable()
        drm/i915: restore ggtt double-bind avoidance
        drm/i915/skl: Enable pipe gamma for sprite planes.
        drm/i915/skl+: Enable pipe CSC on cursor planes. (v2)
        MAINTAINERS: add link to the Intel Graphics for Linux web site
        drm/i915: Move skl/bxt gt specific workarounds to ring init
        drm/i915: Drop i915_gem_obj_is_pinned() from set-cache-level
        drm/i915: revert a few more watermark commits
        drm/i915: Remove dev_priv argument from NEEDS_FORCE_WAKE
        drm/i915: Clean up LVDS register handling
        drm/i915: Throw out some useless variables
        drm/i915: Parametrize and fix SWF registers
        drm/i915: s/PIPE_FRMCOUNT_GM45/PIPE_FRMCOUNT_G4X/ etc.
        drm/i915: Turn GEN5_ASSERT_IIR_IS_ZERO() into a function
        drm/i915: Fix a few bad hex numbers in register defines
        drm/i915: Protect register macro arguments
        drm/i915: Include gpio_mmio_base in GMBUS reg defines
        drm/i915: Parametrize HSW video DIP data registers
        drm/i915: Eliminate weird parameter inversion from BXT PPS registers
        ...
      974e59ba
  2. 23 Oct, 2015 1 commit
    • Dave Airlie's avatar
      Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next · d7e1bc3f
      Dave Airlie authored
      A bit smaller pull this time.  Few minor things, plus initial support
      for msm8996 (snapdragon 820)..  Sorry, a bit latish, was hoping to get
      some 8960/8064 DSI stuff included.  But still waiting on the v2 of the
      patchset (just pending some minor review comments).  It would be nice
      to get the DSI patches merged since it would help some folks trying to
      get upstream kernel running on n4/n7 and xperia z and wanting to write
      some more panel drivers.  Also, waiting for OCMEM driver to get merged
      via other trees and then I have a small bit to go along with that to
      make the gpu actually work on devices w/ OCMEM (snapdragon 800, 805,
      etc).  So maybe a second later pull req, time permitting.
      
      * 'msm-next' of git://people.freedesktop.org/~robclark/linux:
        drm/msm: Remove local fbdev emulation Kconfig option
        drm/msm/mdp5: Basic support for MDP5 v1.7 (MSM8996)
        drm/msm/mdp: Add Software Pixel Extension support
        drm/msm/mdp5: Use the newly introduced enum mdp_component_type
        drm/msm/hdmi: Add basic HDMI support for msm8996
        drm/msm/mdp5: Avoid printing error messages for optional clocks
        drm/msm: Fix IOMMU clean up path in case msm_iommu_new() fails
        drm/msm/mdp5: remove the cfg pointer from SMP struct
        drm/msm/dsi: Updata LNn_CFG4 register settings for 28nm PHY
        drm: msm: dsi: Don't attempt changing voltage of switches
        drm/msm: update generated headers
      d7e1bc3f
  3. 22 Oct, 2015 13 commits
  4. 21 Oct, 2015 22 commits
  5. 19 Oct, 2015 2 commits
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-10-19' of git://anongit.freedesktop.org/drm-intel into drm-next · affa0e03
      Dave Airlie authored
      More drm-misc for 4.4.
      - fb refcount fix in atomic fbdev
      - various locking reworks to reduce drm_global_mutex and dev->struct_mutex
      - rename docbook to gpu.tmpl and include vga_switcheroo stuff, plus more
        vga_switcheroo (Lukas Wunner)
      - viewport check fixes for atomic drivers from Ville
      - DRM_DEBUG_VBL from Ville
      - non-contentious header fixes from Mikko Rapeli
      - small things all over
      
      * tag 'topic/drm-misc-2015-10-19' of git://anongit.freedesktop.org/drm-intel: (31 commits)
        drm/fb-helper: Fix fb refcounting in pan_display_atomic
        drm/fb-helper: Set plane rotation directly
        drm: fix mutex leak in drm_dp_get_mst_branch_device
        drm: Check plane src coordinates correctly during page flip for atomic drivers
        drm: Check crtc viewport correctly with rotated primary plane on atomic drivers
        drm: Refactor plane src coordinate checks
        drm: Swap w/h when converting the mode to src coordidates for a rotated primary plane
        drm: Don't leak fb when plane crtc coodinates are bad
        ALSA: hda - Spell vga_switcheroo consistently
        drm/gem: Use kref_get_unless_zero for the weak mmap references
        drm/vgem: Drop vgem_drm_gem_mmap
        drm: Fix return value of drm_framebuffer_init()
        drm/gem: Use container_of in drm_gem_object_free
        drm/gem: Check locking in drm_gem_object_unreference
        drm/gem: Drop struct_mutex requirement from drm_gem_mmap_obj
        drm/i810_drm.h: include drm/drm.h
        r128_drm.h: include drm/drm.h
        savage_drm.h: include <drm/drm.h>
        gpu/doc: Convert to markdown harder
        gpu/doc: Add vga_switcheroo documentation
        ...
      affa0e03
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2015-10-10' of git://anongit.freedesktop.org/drm-intel into drm-next · 2dd3a88a
      Dave Airlie authored
      - dmc fixes from Animesh (not yet all) for deeper sleep states
      - piles of prep patches from Ville to make mmio functions type-safe
      - more fbc work from Paulo all over
      - w/a shuffling from Arun Siluvery
      - first part of atomic watermark updates from Matt and Ville (later parts had to
        be dropped again unfortunately)
      - lots of patches to prepare bxt dsi support ( Shashank Sharma)
      - userptr fixes from Chris
      - audio rate interface between i915/snd_hda plus kerneldoc (Libin Yang)
      - shrinker improvements and fixes (Chris Wilson)
      - lots and lots of small patches all over
      
      * tag 'drm-intel-next-2015-10-10' of git://anongit.freedesktop.org/drm-intel: (134 commits)
        drm/i915: Update DRIVER_DATE to 20151010
        drm/i915: Partial revert of atomic watermark series
        drm/i915: Early exit from semaphore_waits_for for execlist mode.
        drm/i915: Remove wrong warning from i915_gem_context_clean
        drm/i915: Determine the stolen memory base address on gen2
        drm/i915: fix FBC buffer size checks
        drm/i915: fix CFB size calculation
        drm/i915: remove pre-atomic check from SKL update_primary_plane
        drm/i915: don't allocate fbcon from stolen memory if it's too big
        Revert "drm/i915: Call encoder hotplug for init and resume cases"
        Revert "drm/i915: Add hot_plug hook for hdmi encoder"
        drm/i915: use error path
        drm/i915/irq: Fix misspelled word register in kernel-doc
        drm/i915/irq: Fix kernel-doc warnings
        drm/i915: Hook up ring workaround writes at context creation time on Gen6-7.
        drm/i915: Don't warn if the workaround list is empty.
        drm/i915: Resurrect golden context on gen6/7
        drm/i915/chv: remove pre-production hardware workarounds
        drm/i915/snb: remove pre-production hardware workaround
        drm/i915/bxt: Set time interval unit to 0.833us
        ...
      2dd3a88a