1. 03 Feb, 2015 2 commits
    • 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
  2. 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
  3. 01 Feb, 2015 22 commits
  4. 31 Jan, 2015 9 commits
  5. 29 Jan, 2015 3 commits
    • Wang, Yalin's avatar
      agp: change agp_free_page_array to use kvfree · e4100553
      Wang, Yalin authored
      Change agp_free_page_array to use kvfree function,
      remove the duplicated code.
      Signed-off-by: default avatarYalin Wang <yalin.wang@sonymobile.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e4100553
    • Dave Airlie's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next · b3869b17
      Dave Airlie authored
      This backmerges drm-fixes into drm-next mainly for the amdkfd
      stuff, I'm not 100% confident, but it builds and the amdkfd
      folks can fix anything up.
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      Conflicts:
      	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
      	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
      b3869b17
    • Dave Airlie's avatar
      Merge tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next · 7b83741b
      Dave Airlie authored
      drm/panel: Changes for v3.20-rc1
      
      This contains the long-awaited drm_bridge series that makes Chromebooks
      work for people. I had thought this would've been perfect by now, but
      then I go and build test it and the first thing it does is yell about a
      recursive dependency. I fixed that up because I was feeling bad for not
      getting around to look at this earlier.
      
      Biseds that there is new support for two more panels, a couple of fixup
      patches to the Sharp LQ101R1SX01 dual-channel DSI panel driver and a
      potential NULL pointer dereference fix.
      
      * tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/linux: (23 commits)
        drm/bridge: dw-hdmi: Adapt to bridge API change
        drm/sti: fixup for bridge interface
        drm/bridge: dw-hdmi: Fix return error path
        drm: Check the right variable when setting formats
        Documentation: bridge: Add documentation for ps8622 DT properties
        Documentation: devicetree: Add vendor prefix for parade
        Documentation: drm: bridge: move to video/bridge
        drm/bridge: ptn3460: use gpiod interface
        drm/bridge: ptn3460: probe connector at the end of bridge attach
        drm/bridge: ptn3460: support drm_panel
        drm/exynos: dp: support drm_bridge
        drm/bridge: ptn3460: Convert to I2C driver model
        drm/bridge: make bridge registration independent of drm flow
        drm/bridge: do not pass drm_bridge_funcs to drm_bridge_init
        drm/bridge: ptn3460: Few trivial cleanups
        drm/panel: simple: Add AVIC TM070DDH03 panel support
        of: Add vendor prefix for Shanghai AVIC Optoelectronics Co., Ltd.
        drm/panel: sharp: lq101r1sx01: Remove unneeded include
        drm/panel: sharp: lq101r1sx01: Respect power timings
        drm/panel: sharp: lq101r1sx01: Add delay after display on
        ...
      7b83741b
  6. 28 Jan, 2015 3 commits