1. 07 Feb, 2015 5 commits
  2. 05 Feb, 2015 2 commits
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of... · 2f899790
      Dave Airlie authored
      Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo/linux into drm-next
      
      - Fixing accounting of active queues
      - Preserving a register internal state
      
      * tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: Preserve CP_MQD_IQ_RPTR internal state
        drm/amdkfd: Fix dqm->queue_count tracking
      2f899790
    • Dave Airlie's avatar
      Merge branch 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel into drm-next · 225963dd
      Dave Airlie authored
      drm-intel-next-2015-01-30:
      - chv rps improvements from Ville
      - atomic state handling prep work from Ander
      - execlist request tracking refactoring from Nick Hoath
      - forcewake code consolidation from Chris&Mika
      - fastboot plane config refactoring and skl support from Damien
      - some more skl pm patches all over (Damien)
      - refactor dsi code to use drm dsi helpers and drm_panel infrastructure (Jani)
      - first cut at experimental atomic plane updates (Matt Roper)
      - piles of smaller things all over, as usual
      
      * 'drm-intel-next' of git://anongit.freedesktop.org/drm-intel: (102 commits)
        drm/i915: Remove bogus locking check in the hangcheck code
        drm/i915: Update DRIVER_DATE to 20150130
        drm/i915: Use pipe_config's cpu_transcoder for reading encoder hw state
        drm/i915: Fix a use-after-free in intel_execlists_retire_requests
        drm/i915: Split shared dpll setup out of __intel_set_mode()
        drm/i915: Don't do posting reads on getting forcewake
        drm/i915: Do uncore early sanitize after domain init
        drm/i915: Handle CHV in vlv_set_rps_idle()
        drm/i915: Remove nested work in gpu error handling
        drm/i915/documentation: Add intel_uncore.c to drm.tmpl
        drm/i915/dsi: remove intel_dsi_cmd.c and the unused functions therein
        drm/i915/dsi: move dpi_send_cmd() to intel_dsi.c and make it static
        drm/i915/dsi: remove old read/write functions in favor of new stuff
        drm/i915/dsi: make the vbt panel driver use mipi_dsi_device for transfers
        drm/i915/dsi: add drm mipi dsi host support
        drm/i915/dsi: switch to drm_panel interface
        drm/i915/skl: Enabling PSR on Skylake
        Revert "drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES"
        drm/i915: Be consistent on printing seqnos
        drm/i915: Display current hangcheck status in debugfs
        ...
      225963dd
  3. 03 Feb, 2015 3 commits
    • Daniel Vetter's avatar
      drm/i915: Remove bogus locking check in the hangcheck code · b838cbee
      Daniel Vetter authored
      You can _never_ assert that a lock is not held, except in some very
      restricted corner cases where it's guranteed that your code is running
      single-threade (e.g. driver load before you've published any pointers
      leading to that lock).
      
      In addition the early return breaks a bunch of testcases since with
      highly concurrent hangcheck stress tests the reset fails to work and
      the test doesn't recover and time out.
      
      This regression has been introduced in
      
      commit b8d24a06
      Author: Mika Kuoppala <mika.kuoppala@linux.intel.com>
      Date:   Wed Jan 28 17:03:14 2015 +0200
      
          drm/i915: Remove nested work in gpu error handling
      
      Aside: It is possible to check whether a given task doesn't hold a
      lock, but only when lockdep is enabled, using the lockdep_assert_held
      stuff.
      
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Cc: Mika Kuoppala <mika.kuoppala@intel.com>
      Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88908Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      b838cbee
    • Ville Syrjälä's avatar
      drm/modes: Print the mode status in human readable form · e4bf44b3
      Ville Syrjälä authored
      Currently when a mode is rejected the reason is printed as a raw number.
      Having to manually decode that to a enum drm_mode_status value is
      tiresome. Have the code do the decoding instead and print the result
      in a human readable format.
      
      Just having an array of strings indexed with the mode status doesn't
      work since the enum includes negative values. So we offset the status
      by +3 which makes all the indexes non-negative. Also add a bit of
      paranoia into the code to catch out of bounds accesses in case
      someone adds more enum values but forgets to update the code.
      Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e4bf44b3
    • Chen Gang S's avatar
      drm: Kconfig: Let all DRM_GEM_CMA_HELPER related macros depend on HAVE_DMA_ATTRS · db88c8f4
      Chen Gang S authored
      DRM_GEM_CMA_HELPER is depend on HAVE_DMA_ATTRS, or it will break the
      building. The related error (with allmodconfig under xtensa):
      
          CC [M]  drivers/gpu/drm/drm_gem_cma_helper.o
        drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_create':
        drivers/gpu/drm/drm_gem_cma_helper.c:110:19: error: implicit declaration of function 'dma_alloc_writecombine' [-Werror=implicit-function-declaration]
          cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size,
                           ^
        drivers/gpu/drm/drm_gem_cma_helper.c:110:17: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
          cma_obj->vaddr = dma_alloc_writecombine(drm->dev, size,
                         ^
        drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_free_object':
        drivers/gpu/drm/drm_gem_cma_helper.c:193:3: error: implicit declaration of function 'dma_free_writecombine' [-Werror=implicit-function-declaration]
           dma_free_writecombine(gem_obj->dev->dev, cma_obj->base.size,
           ^
        drivers/gpu/drm/drm_gem_cma_helper.c: In function 'drm_gem_cma_mmap_obj':
        drivers/gpu/drm/drm_gem_cma_helper.c:330:8: error: implicit declaration of function 'dma_mmap_writecombine' [-Werror=implicit-function-declaration]
          ret = dma_mmap_writecombine(cma_obj->base.dev->dev, vma,
                ^
      Signed-off-by: default avatarChen Gang <gang.chen.5i5j@gmail.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      db88c8f4
  4. 02 Feb, 2015 1 commit
    • Dave Airlie's avatar
      Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next · 44df9c41
      Dave Airlie authored
      Rebase of main pull for 3.20.  There was a mid-air collision between
      the bridge changes and msm eDP support.  And atomic dpms support broke
      msm somewhat, due to using prepare/commit hooks in a different way.
      Compared to the initial pull req, this fixes up a memory leak caused
      by the bridge changes, rebases the eDP support on the bridge changes,
      and migrates to the atomic dpms hooks to fix the dpms breakage.
      
      Highlights (from original pull req):
      
      1) YUV support for mdp4 and mdp5
      2) eDP support
      3) hw cursor support for mdp5[*]
      4) additional hdmi support for apq8084 (snapdragon 805)
      5) few bug fixes
      
      Note that I may have a later pull to enable hdmi hpd irqs.. but
      (un)fortunately I seem to have a particularly troublesome monitor..  I
      managed to figure out a workaround for spurious hpd disconnect irqs
      that works with some of my boards but not others, so holding off on
      that patch for now.  There are also patches for HDCP support, but
      those are waiting on some scm patches outside of drm so I think
      waiting until 3.21 at this point.
      
      * 'msm-next' of git://people.freedesktop.org/~robclark/linux: (22 commits)
        drm/msm: add moduleparam to disable fbdev
        drm/msm: fix build error with W=1
        drm/msm/mdp5: Fix negative SMP block allocation
        drm/msm/hdmi: disallow interlaced
        drm/msm/atomic: fix issue with gnome-shell wayland
        drm/msm/mdp5: Add hardware cursor support
        drm/msm/hdmi: rework hdmi configurations, using dt_match[]
        drm/msm/hdmi: Add HDMI platform config for apq8084
        drm/msm/hdmi: use dynamic allocation for hdmi resources
        drm/msm/mdp5: fix parameter type for mdp5_ctl_set_intf()
        drm/msm/dp: use link power helpers
        drm/msm: Add the eDP connector in msm drm driver (V2)
        drm/msm: Initial add eDP support in msm drm driver (v5)
        drm/msm/mdp4: add YUV format support
        drm/msm/mdp5: add NV12 support for MDP5
        drm/msm/mdp: add common YUV information for MDP4/MDP5
        drm/msm: update generated headers
        drm/msm: Do not BUG_ON(!spin_is_locked()) on UP
        drm/msm/hdmi: fix memory leak after bridge changes
        drm/msm: fix fallout of atomic dpms changes
        ...
      44df9c41
  5. 01 Feb, 2015 22 commits
  6. 31 Jan, 2015 7 commits