aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-12-02 11:50:26 +0100
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-12-04 12:32:04 +0100
commit011f2c26f1b62e309f2eac6a3101bfe0a3c76c7e (patch)
treebe53d4f11f7625508ee3aea9889e854ab5b5f263 /target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch
parent4257f6548b9480cdb436115b63d5c134c5e91303 (diff)
downloadupstream-011f2c26f1b62e309f2eac6a3101bfe0a3c76c7e.tar.gz
upstream-011f2c26f1b62e309f2eac6a3101bfe0a3c76c7e.tar.bz2
upstream-011f2c26f1b62e309f2eac6a3101bfe0a3c76c7e.zip
brcm2708: update linux 4.4 patches to latest version
As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.4.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch44
1 files changed, 0 insertions, 44 deletions
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
deleted file mode 100644
index 39f74e907d..0000000000
--- a/target/linux/brcm2708/patches-4.4/0461-drm-vc4-Return-EBUSY-if-there-s-already-a-pending-fl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From bc27882bfefac9a1596aaed387ac01a844765e6c Mon Sep 17 00:00:00 2001
-From: Robert Foss <robert.foss@collabora.com>
-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 <robert.foss@collabora.com>
-Reviewed-by: Eric Anholt <eric@anholt.net>
-(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);