1. 04 Jun, 2015 35 commits
  2. 03 Jun, 2015 5 commits
    • Dave Airlie's avatar
      Merge branch 'virtio-gpu-drm-next' of git://git.kraxel.org/linux into drm-next · 63e14561
      Dave Airlie authored
      Yay, thanks to Gerd for pull this together.
      
      * 'virtio-gpu-drm-next' of git://git.kraxel.org/linux:
        Add MAINTAINERS entry for virtio-gpu.
        Add virtio gpu driver.
        drm_vblank_get: don't WARN_ON in case vblanks are not initialized
        break kconfig dependency loop
      63e14561
    • Dave Airlie's avatar
      Merge branch 'linux-4.1.0-rc5-tilcdc-refactor' of https://github.com/jsarha/linux into drm-next · 6aa62725
      Dave Airlie authored
      Please pull the contents of "Use DRM component API in tilcdc to
      connect to tda998x" patch series.
      
      * 'linux-4.1.0-rc5-tilcdc-refactor' of https://github.com/jsarha/linux:
        drm/tilcdc: Force building of DRM_TILCDC_SLAVE_COMPAT
        drm/tilcdc: Add DRM_TILCDC_SLAVE_COMPAT for ti,tilcdc,slave binding support
        drm/tilcdc: use pm_runtime_irq_safe()
        drm/tilcdc: Add support for external tda998x encoder
        drm/tilcdc: Remove tilcdc slave support for tda998x driver
        drm/tilcdc: Fix module unloading
      6aa62725
    • Dave Airlie's avatar
      Merge tag 'v4.1-rc6' into drm-next · a8a50fce
      Dave Airlie authored
      Linux 4.1-rc6
      
      backmerge 4.1-rc6 as some of the later pull reqs are based on newer bases
      and I'd prefer to do the fixup myself.
      a8a50fce
    • Maarten Lankhorst's avatar
      drm/atomic: Clear crtc_state->active in drm_atomic_helper_set_config. · 9b5edbf7
      Maarten Lankhorst authored
      This fixes some regressions in i915 when converting to atomic.
      set_config failed with -EINVAL, and I received the following warning
      in dmesg:
      
      [drm:drm_atomic_crtc_check] [CRTC:20] active without enabled
      
      Solve this by clearing active when a crtc is disabled.
      
      Because crtc_state->enable implies that connectors are active the
      change from disabled->enabled can only happen for the crtc that's
      being set_config'd, and checking for !crtc_state->enable is sufficient
      here.
      
      Cc: dri-devel@lists.freedesktop.org
      Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
      Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      9b5edbf7
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-05-27' of git://anongit.freedesktop.org/drm-intel into drm-next · 531e63e1
      Dave Airlie authored
      One more round of drm-misc, again mostly atomic. Big thing is the
      userspace blob code from Daniel Stone, with support for the mode_id blob
      now added to the atomic ioctl. Finally we can do atomic modesets!
      
      Note that the atomic ioctl is still behind the module knob since the
      weston patches aren't quite ready yet imo - they lack TEST_ONLY support,
      which is a fairly crucial bit of the atomic api. But besides that I think
      it's all good to go. That's also why we didn't bother to hide the new blob
      ioctls behind the knob, that part won't need to change. And if weston
      patches get in shape in time we could throw the "atomic by default patch"
      on top for 4.2.
      
      * tag 'topic/drm-misc-2015-05-27' of git://anongit.freedesktop.org/drm-intel:
        drm: Fix off-by-one in vblank hardware counter wraparound handling
        drm/atomic: fix out of bounds read in for_each_*_in_state helpers
        drm/atomic: Add MODE_ID property
        drm/atomic: Add current-mode blob to CRTC state
        drm: Add drm_atomic_set_mode_for_crtc
        drm: check for garbage in unused addfb2 fields
        drm: Retain reference to blob properties in lookup
        drm/mode: Add user blob-creation ioctl
        drm: Return error value from blob creation
        drm: Allow creating blob properties without copy
        drm/mode: Unstatic kernel-userspace mode conversion
        drm/mode: Validate modes inside drm_crtc_convert_umode
        drm/crtc_helper: Replace open-coded CRTC state helpers
        drm: kerneldoc fixes for blob properties
        drm/DocBook: Add more drm_bridge documentation
        drm: bridge: Allow daisy chaining of bridges
        drm/atomic: add all affected planes in drm_atomic_helper_check_modeset
        drm/atomic: add drm_atomic_add_affected_planes
        drm/atomic: add commit_planes_on_crtc helper
      531e63e1