1. 17 Mar, 2015 20 commits
  2. 11 Mar, 2015 1 commit
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-03-10' of git://anongit.freedesktop.org/drm-intel into drm-next · 03be7005
      Dave Airlie authored
      Another pile of misc drm patches all over, mostly polish for atomic. Last
      minute rebase was to avoid the broken merge.
      
      * tag 'topic/drm-misc-2015-03-10' of git://anongit.freedesktop.org/drm-intel:
        drm: Check in setcrtc if the primary plane supports the fb pixel format
        drm: Lighten sysfs connector 'status'
        drm/plane-helper: unexport drm_primary_helper_create_plane
        drm: Share plane pixel format check code between legacy and atomic
        drm: Fix trivial typos in comments
        drm/dp: add DPCD definitions from eDP 1.4
        drm/dp: add DPCD definitions from DP 1.1 and 1.2a
        drm: Fixup racy refcounting in plane_force_disable
        drm/i915: Rotation property is now handled in DRM core
        drm: Complete moving rotation property to core
        drm/dp: add DPCD definitions from eDP 1.2
        drm/dp: indentation and ordering cleanups
        drm/atomic-helper: Fix kerneldoc for prepare_planes
        drm: Remove redundant code in the getencoder ioctl
      03be7005
  3. 10 Mar, 2015 14 commits
  4. 09 Mar, 2015 3 commits
    • Ville Syrjälä's avatar
      drm/i915: Fix struct_mutex deadlock due to merge fumble · 3a656b54
      Ville Syrjälä authored
      commit a8c6ecb3
      Merge: 8dd0eb35 9eccca08
      Author: Dave Airlie <airlied@redhat.com>
      Date:   Mon Mar 9 19:58:30 2015 +1000
      
          Merge tag 'v4.0-rc3' into drm-next
      
      managed to pick the wrong code to resolve the conflict and left us with
      a mutex_lock(struct_mutex) without the mutex_unlock(struct_mutex) leading
      to a deadlock. Fix the problem by recovering the correct code which doesn't
      need the lock.
      
      Cc: Dave Airlie <airlied@redhat.com>
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      3a656b54
    • Dave Airlie's avatar
      Merge tag 'v4.0-rc3' into drm-next · a8c6ecb3
      Dave Airlie authored
      Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
      some mainline bug fixes needed for my testing box
      
      Conflicts:
      	drivers/gpu/drm/i915/i915_drv.h
      	drivers/gpu/drm/i915/intel_display.c
      a8c6ecb3
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-intel into drm-next · 8dd0eb35
      Dave Airlie authored
      - Y tiling support for scanout from Tvrtko&Damien
      - Remove more UMS support
      - some small prep patches for OLR removal from John Harrison
      - first few patches for dynamic pagetable allocation from Ben Widawsky, rebased
        by tons of other people
      - DRRS support patches (Sonika&Vandana)
      - fbc patches from Paulo
      - make sure our vblank callbacks aren't called when the pipes are off
      - various patches all over
      
      * tag 'drm-intel-next-2015-02-27' of git://anongit.freedesktop.org/drm-intel: (61 commits)
        drm/i915: Update DRIVER_DATE to 20150227
        drm/i915: Clarify obj->map_and_fenceable
        drm/i915/skl: Allow Y (and Yf) frame buffer creation
        drm/i915/skl: Update watermarks for Y tiling
        drm/i915/skl: Updated watermark programming
        drm/i915/skl: Adjust get_plane_config() to support Yb/Yf tiling
        drm/i915/skl: Teach pin_and_fence_fb_obj() about Y tiling constraints
        drm/i915/skl: Adjust intel_fb_align_height() for Yb/Yf tiling
        drm/i915/skl: Allow scanning out Y and Yf fbs
        drm/i915/skl: Add new displayable tiling formats
        drm/i915: Remove DRIVER_MODESET checks from modeset code
        drm/i915: Remove regfile code&data for UMS suspend/resume
        drm/i915: Remove DRIVER_MODESET checks from gem code
        drm/i915: Remove DRIVER_MODESET checks in the gpu reset code
        drm/i915: Remove DRIVER_MODESET checks from suspend/resume code
        drm/i915: Remove DRIVER_MODESET checks in load/unload/close code
        drm/i915: fix a printk format
        drm/i915: Add media rc6 residency file to sysfs
        drm/i915: Add missing description to parameter in alloc_pt_range
        drm/i915: Removed the read of RP_STATE_CAP from sysfs/debugfs functions
        ...
      8dd0eb35
  5. 08 Mar, 2015 2 commits