[Intel-gfx] [PULL] drm-misc-fixes

[Daniel Vetter]

On Fri, Aug 18, 2017 at 11:57:34AM -0400, Sean Paul wrote:
> Hi Dave,
> Here's the latest and greatest from drm-misc-fixes. We have a couple nice
> cleanups from Maarten centered around properly handling errors (and specifically
> EDEADLK) in atomic_check.

They're not cleanups, stuff actually blows up in our CI (hooray for
finally running like all the igts we have). Hence cc: stable.
-Daniel

> 
> I probably would have liked Mark's DRM_ERROR patch to go through -misc-next, but
> hopefully it's harmless enough to not lose sleep over.
> 
> 
> drm-misc-fixes-2017-08-18:
> Core Changes:
> - Fix framebuffer leak in setplane error condition (Nikil)
> - Prevent BUG in atomic_ioctl by properly resetting state on EDEADLK (Maarten)
> - Add missing return in atomic_check_only if atomic_check fails (Maarten)
> 
> Driver Changes:
> - rockchip: Don't try to suspend if device not initialized (Jeffy)
> 
> Cc: Jeffy Chen <jeffy.chen at rock-chips.com>
> Cc: Nikhil Mahale <nmahale at nvidia.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> 
> Cheers, Daniel ;-)
> 
> 
> The following changes since commit ef954844c7ace62f773f4f23e28d2d915adc419f:
> 
>   Linux 4.13-rc5 (2017-08-13 16:01:32 -0700)
> 
> are available in the git repository at:
> 
>   git://anongit.freedesktop.org/git/drm-misc tags/drm-misc-fixes-2017-08-18
> 
> for you to fetch changes up to a0ffc51e20e90e0c1c2491de2b4b03f48b6caaba:
> 
>   drm/atomic: If the atomic check fails, return its value first (2017-08-15 12:38:05 +0200)
> 
> ----------------------------------------------------------------
> Core Changes:
> - Fix framebuffer leak in setplane error condition (Nikil)
> - Prevent BUG in atomic_ioctl by properly resetting state on EDEADLK (Maarten)
> - Add missing return in atomic_check_only if atomic_check fails (Maarten)
> 
> Driver Changes:
> - rockchip: Don't try to suspend if device not initialized (Jeffy)
> 
> Cc: Jeffy Chen <jeffy.chen at rock-chips.com>
> Cc: Nikhil Mahale <nmahale at nvidia.com>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> 
> ----------------------------------------------------------------
> Jeffy Chen (1):
>       drm/rockchip: Fix suspend crash when drm is not bound
> 
> Maarten Lankhorst (2):
>       drm/atomic: Handle -EDEADLK with out-fences correctly
>       drm/atomic: If the atomic check fails, return its value first
> 
> Nikhil Mahale (1):
>       drm: Fix framebuffer leak
> 
> Sean Paul (1):
>       Merge origin/master into drm-misc-fixes
> 
>  drivers/gpu/drm/drm_atomic.c                | 11 ++++++++---
>  drivers/gpu/drm/drm_plane.c                 |  1 +
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++++++++--
>  3 files changed, 19 insertions(+), 5 deletions(-)
> 
> -- 
> Sean Paul, Software Engineer, Google / Chromium OS

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch