diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-07-08 11:22:23 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-12-08 13:19:58 +0100 |
| commit | c93dfdcd0521cbdfccab147c5c5a615ba9977a89 (patch) | |
| tree | c7c5fbd191c422e8ffe4508c54d7b783ea529231 /drivers/gpu/drm/armada/armada_crtc.c | |
| parent | drm/armada: use drm_plane_helper_check_state() (diff) | |
| download | linux-c93dfdcd0521cbdfccab147c5c5a615ba9977a89.tar.xz linux-c93dfdcd0521cbdfccab147c5c5a615ba9977a89.zip | |
drm/armada: allow armada_drm_plane_work_queue() to silently fail
Avoid printing an error message when armada_drm_plane_work_queue() is
unable to get the vblank (eg, because we're doing a modeset.) Continue
to report the failure to the caller, so the caller can handle this.
Move the error message into armada_ovl_plane_update().
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_crtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index 401ad854d751..2f8e45976444 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -254,10 +254,8 @@ int armada_drm_plane_work_queue(struct armada_crtc *dcrtc, int ret; ret = drm_crtc_vblank_get(&dcrtc->crtc); - if (ret) { - DRM_ERROR("failed to acquire vblank counter\n"); + if (ret) return ret; - } ret = cmpxchg(&plane->work, NULL, work) ? -EBUSY : 0; if (ret) |