From 2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 10 Sep 2016 14:54:26 +0200 Subject: brcm2708: update linux 4.4 patches to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.4.y Also adds support for Raspberry Pi Compute Module 3 (untested). Signed-off-by: Álvaro Fernández Rojas --- ...urn-EBUSY-if-there-s-already-a-pending-fl.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch (limited to 'target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch') diff --git a/target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch b/target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch new file mode 100644 index 0000000000..39f74e907d --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch @@ -0,0 +1,44 @@ +From bc27882bfefac9a1596aaed387ac01a844765e6c Mon Sep 17 00:00:00 2001 +From: Robert Foss +Date: Tue, 3 May 2016 13:48:20 -0400 +Subject: [PATCH] drm/vc4: Return -EBUSY if there's already a pending flip + event. + +As per the documentation in drm_crtc.h, atomic_commit should return +-EBUSY if an asynchronous update is requested and there is an earlier +update pending. + +v2: Rebase on the s/async/nonblock/ change. + +Signed-off-by: Robert Foss +Reviewed-by: Eric Anholt +(cherry picked from commit e7c31f6f25b84fed961dc0dce6248878527693ae) +--- + drivers/gpu/drm/vc4/vc4_kms.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -119,10 +119,18 @@ static int vc4_atomic_commit(struct drm_ + return -ENOMEM; + + /* Make sure that any outstanding modesets have finished. */ +- ret = down_interruptible(&vc4->async_modeset); +- if (ret) { +- kfree(c); +- return ret; ++ if (nonblock) { ++ ret = down_trylock(&vc4->async_modeset); ++ if (ret) { ++ kfree(c); ++ return -EBUSY; ++ } ++ } else { ++ ret = down_interruptible(&vc4->async_modeset); ++ if (ret) { ++ kfree(c); ++ return ret; ++ } + } + + ret = drm_atomic_helper_prepare_planes(dev, state); -- cgit v1.2.3