1. 14 Aug, 2015 5 commits
    • Archit Taneja's avatar
      drm/msm: mdp4: Fix drm_framebuffer dereference crash · 507d71b1
      Archit Taneja authored
      mdp4_get_frame_format() can dereference a drm_framebuffer when it's NULL.
      Call it in mdp4_plane_mode_set only when we know fb is non-NULL.
      Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      507d71b1
    • Rob Clark's avatar
      drm/msm: fix msm_gem_prime_get_sg_table() · bbcc7187
      Rob Clark authored
      We need to return a new sgt, since the caller takes ownership of it.
      Reported-by: default avatarStanimir Varbanov <svarbanov@mm-sol.com>
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      bbcc7187
    • 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
  2. 12 Aug, 2015 15 commits
  3. 11 Aug, 2015 9 commits
  4. 10 Aug, 2015 7 commits
  5. 07 Aug, 2015 1 commit
  6. 06 Aug, 2015 3 commits
    • Archit Taneja's avatar
      drm: Add top level Kconfig option for DRM fbdev emulation · a03fdcb1
      Archit Taneja authored
      Legacy fbdev emulation support via DRM is achieved through KMS FB helpers.
      Most modesetting drivers enable provide fbdev emulation by default by
      selecting KMS FB helpers. A few provide a separate Kconfig option for the
      user to enable or disbale fbdev emulation.
      
      Enabling fbdev emulation is finally a distro-level decision. Having a top
      level Kconfig option for fbdev emulation helps by providing a uniform way
      to enable/disable fbdev emulation for any modesetting driver. It also lets
      us remove unnecessary driver specific Kconfig options that causes bloat.
      
      With a top level Kconfig in place, we can stub out the fb helper functions
      when not needed without breaking functionality. Having stub functions also
      prevents drivers to require wrapping fb helper function calls with #ifdefs.
      
      DRM_FBDEV_EMULATION defaults to y since many drivers enable fbdev
      emulation by default and majority of distributions expect the fbdev
      interface in the kernel.
      Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      a03fdcb1
    • Geert Uytterhoeven's avatar
      drm/fb-helper: Move drm_fb_helper_force_kernel_mode() inside #ifdef · 2c4124fd
      Geert Uytterhoeven authored
      If CONFIG_MAGIC_SYSRQ is not set:
      
          drivers/gpu/drm/drm_fb_helper.c:390:13: warning: 'drm_fb_helper_force_kernel_mode' defined but not used [-Wunused-function]
           static bool drm_fb_helper_force_kernel_mode(void)
      		 ^
      
      Move drm_fb_helper_force_kernel_mode() inside the existing #ifdef to fix
      this.
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      2c4124fd
    • Geert Uytterhoeven's avatar
      drm/fb-helper: Clarify drm_fb_helper_restore_fbdev_mode*() · 3d9e35a9
      Geert Uytterhoeven authored
      As of commit 5ea1f752 ("drm: add
      drm_fb_helper_restore_fbdev_mode_unlocked()"),
      drm_fb_helper_restore_fbdev_mode() is no longer public, and drivers
      should call drm_fb_helper_restore_fbdev_mode_unlocked() from their
      ->lastclose callbacks instead.
      
      Update the documentation to reflect this, and absorb the one liner
      drm_fb_helper_restore_fbdev_mode() into its single caller.
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      3d9e35a9