1. 16 Aug, 2015 18 commits
  2. 14 Aug, 2015 3 commits
    • Dave Airlie's avatar
      Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of... · 8f9cb507
      Dave Airlie authored
      Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo/linux into drm-next
      
      Two small bug fixes for the code you pulled for 4.3:
      
      - Used a SHIFT define instead of a MASK define to check if a bit is turned on
        when destroying hqd. Luckily, this is in gfx7 interface file with amdgpu,
        which was used only for bring-up purposes of amdgpu, so no real effect on
        a running system
      
      - Used a logical AND instead of a bitwise AND operator, when initializing
        sdma virtual memory when using SDMA queues
      
      * tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo/linux:
        drm/amdkfd: fix bug when initializing sdma vm
        drm/amdgpu: fix bug when amdkfd destroys hqd
      8f9cb507
    • Dave Airlie's avatar
      Merge branch 'drm-sti-next-atomic-2015-08-11' of... · e1474e7b
      Dave Airlie authored
      Merge branch 'drm-sti-next-atomic-2015-08-11' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
      
      This serie of patches fix minor bugs around how driver sub-components are
      bind and planes z-ordering.
      The main part is about atomic support: using more atomic helpers allow us
      to simplify the code (~300 lines removed) and to ahve a better match between
      drm concepts (planes and crtc) and hardware split.
      
      [airlied: fixed up conflict in atomic code]
      
      * 'drm-sti-next-atomic-2015-08-11' of http://git.linaro.org/people/benjamin.gaignard/kernel:
        drm/sti: atomic crtc/plane update
        drm/sti: rename files and functions
        drm/sti: code clean up
        drm/sti: fix dynamic z-ordering
        drm: sti: fix sub-components bind
      e1474e7b
    • Dave Airlie's avatar
      Merge tag 'topic/drm-misc-2015-08-13' of git://anongit.freedesktop.org/drm-intel into drm-next · 1ce4200d
      Dave Airlie authored
      Final drm-misc pull for 4.3:
      - fbdev emulation Kconfig option for everyone thanks to Archit. It's not
        everything yet bit this is fairly tricky since it spawns all drivers.
      - vgaarb & vgaswitcheroo polish from Thierry
      - some drm_irq.c cleanups (Thierry)
      - struct_mutex crusade from me
      - more fbdev panic handling removal
      - various things all over in drm core&helpers
      
      * tag 'topic/drm-misc-2015-08-13' of git://anongit.freedesktop.org/drm-intel: (65 commits)
        drm/atomic: Use KMS VBLANK API
        drm/irq: Document return values more consistently
        drm/irq: Make pipe unsigned and name consistent
        drm/irq: Check for valid VBLANK before dereference
        drm/irq: Remove negative CRTC index special-case
        drm/plane: Remove redundant extern
        drm/plane: Use consistent data types for format count
        vga_switcheroo: Remove unnecessary checks
        vga_switcheroo: Wrap overly long lines
        vga_switcheroo: Use pr_fmt()
        vga_switcheroo: Cleanup header comment
        vga_switcheroo: Use pr_*() instead of printk()
        vgaarb: Fix a few checkpatch errors and warnings
        vgaarb: Use vgaarb: prefix consistently in messages
        vgaarb: Stop complaining about absent devices
        drm/atomic: fix null pointer access to mode_fixup callback
        drm/i915: Use CONFIG_DRM_FBDEV_EMULATION
        drm/core: Set mode to NULL when connectors in a set drops to 0.
        drm/atomic: Call ww_acquire_done after check phase is complete
        drm/atomic: Paper over locking WARN in default_state_clear
        ...
      1ce4200d
  3. 12 Aug, 2015 15 commits
  4. 11 Aug, 2015 4 commits
    • Inki Dae's avatar
      drm/atomic: fix null pointer access to mode_fixup callback · 84524917
      Inki Dae authored
      This patch fixes null pointer access incurred when
      encoder driver didn't set its own mode_fixup callback.
      
      mode_fixup callback shoudn't be called if the callback
      of drm_encoder_helper_funcs is NULL.
      
      Changelog v2:
      - change it to else if
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      84524917
    • Daniel Vetter's avatar
      drm/i915: Use CONFIG_DRM_FBDEV_EMULATION · 0695726e
      Daniel Vetter authored
      Instead of our own duplicated one. This fixes a bug in the driver
      unload code if DRM_FBDEV_EMULATION=n but DRM_I915_FBDEV=y because we
      try to unregister the nonexistent fbdev drm_framebuffer.
      
      Cc: Archit Taneja <architt@codeaurora.org>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Reported-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      0695726e
    • Maarten Lankhorst's avatar
      drm/core: Set mode to NULL when connectors in a set drops to 0. · cebbb739
      Maarten Lankhorst authored
      Without this when a MST connector is removed drm_atomic_helper_set_config
      can complain about set->mode && !set->num_connectors.
      
      ------------[ cut here ]------------
      WARNING: CPU: 2 PID: 2403 at drivers/gpu/drm/drm_atomic_helper.c:1673 drm_atomic_helper_set_config+0x22e/0x420()
      CPU: 2 PID: 2403 Comm: kms_flip Not tainted 4.2.0-rc5 #4233
      Hardware name: NUC5i7RYB, BIOS RYBDWi35.86A.0246.2015.0309.1355 03/09/2015
       ffffffff81ac75e8 ffff88004e4ffbf8 ffffffff81714c34 0000000080000000
       0000000000000000 ffff88004e4ffc38 ffffffff8107bf81 ffff88004e4ffc48
       ffff8800d8ca0690 ffff8800d8d7a080 ffff8800d8cc2290 ffff8800d07bc9f0
      Call Trace:
       [<ffffffff81714c34>] dump_stack+0x4f/0x7b
       [<ffffffff8107bf81>] warn_slowpath_common+0x81/0xc0
       [<ffffffff8107c065>] warn_slowpath_null+0x15/0x20
       [<ffffffff813d9e3e>] drm_atomic_helper_set_config+0x22e/0x420
       [<ffffffff813da174>] ? drm_atomic_helper_plane_set_property+0x84/0xc0
       [<ffffffff813ee101>] drm_mode_set_config_internal+0x61/0x100
       [<ffffffff813dc4ed>] restore_fbdev_mode+0xbd/0xe0
       [<ffffffff813de1e4>] drm_fb_helper_restore_fbdev_mode_unlocked+0x24/0x70
       [<ffffffffc0123d11>] intel_fbdev_restore_mode+0x21/0x80 [i915]
       [<ffffffffc014bf69>] i915_driver_lastclose+0x9/0x10 [i915]
       [<ffffffff813e2429>] drm_lastclose+0x29/0x130
       [<ffffffff813e2844>] drm_release+0x314/0x500
       [<ffffffff81194795>] __fput+0xe5/0x1f0
       [<ffffffff811948d9>] ____fput+0x9/0x10
       [<ffffffff810968d8>] task_work_run+0x88/0xb0
       [<ffffffff8107d53f>] do_exit+0x37f/0xa90
       [<ffffffff8127e258>] ? selinux_file_ioctl+0x48/0xc0
       [<ffffffff81277dfe>] ? security_file_ioctl+0x3e/0x60
       [<ffffffff8107ec80>] do_group_exit+0x40/0xa0
       [<ffffffff8107ecef>] SyS_exit_group+0xf/0x10
       [<ffffffff8171bdd7>] entry_SYSCALL_64_fastpath+0x12/0x6a
      ---[ end trace 0daf358c49351567 ]---
      Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      cebbb739
    • Daniel Vetter's avatar
      drm/atomic: Call ww_acquire_done after check phase is complete · 992cbf19
      Daniel Vetter authored
      We want to make sure that no one tries to acquire more locks and
      states, and ww mutexes provide debug facilities for that. So use them.
      
      v2: Only call acquire_done when ->atomic_check was successful to avoid
      falling over an -EDEADLK (spotted by Maarten).
      
      Cc: Rob Clark <robdclark@gmail.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      992cbf19