diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-09-10 14:54:26 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-09-10 14:54:26 +0200 |
| commit | 2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14 (patch) | |
| tree | ba6d48b4fec219d07110f5d55afc19bc309d2bdb /target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch | |
| parent | ac08cb06f6734ebf73ed855cbc836c566f80eaca (diff) | |
| download | upstream-2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14.tar.gz upstream-2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14.tar.bz2 upstream-2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14.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
Also adds support for Raspberry Pi Compute Module 3 (untested).
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch b/target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch new file mode 100644 index 0000000000..698dd34355 --- /dev/null +++ b/target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch @@ -0,0 +1,45 @@ +From db48b84381e9cc7c4cc559bad3e5210db3b13c4e Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> +Date: Tue, 26 Apr 2016 16:11:44 +0200 +Subject: [PATCH] drm/vc4: Rename async to nonblock. + +The async name is deprecated and should be changed to nonblocking. + +Cc: Eric Anholt <eric@anholt.net> +Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> +Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> +Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-12-git-send-email-maarten.lankhorst@linux.intel.com +(cherry picked from commit eb63961ba52ba545f5b7ebeeeefe1c98704e1a79) +--- + drivers/gpu/drm/vc4/vc4_kms.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_kms.c ++++ b/drivers/gpu/drm/vc4/vc4_kms.c +@@ -93,7 +93,7 @@ static struct vc4_commit *commit_init(st + * vc4_atomic_commit - commit validated state object + * @dev: DRM device + * @state: the driver state object +- * @async: asynchronous commit ++ * @nonblock: nonblocking commit + * + * This function commits a with drm_atomic_helper_check() pre-validated state + * object. This can still fail when e.g. the framebuffer reservation fails. For +@@ -104,7 +104,7 @@ static struct vc4_commit *commit_init(st + */ + static int vc4_atomic_commit(struct drm_device *dev, + struct drm_atomic_state *state, +- bool async) ++ bool nonblock) + { + struct vc4_dev *vc4 = to_vc4_dev(dev); + int ret; +@@ -170,7 +170,7 @@ static int vc4_atomic_commit(struct drm_ + * current layout. + */ + +- if (async) { ++ if (nonblock) { + vc4_queue_seqno_cb(dev, &c->cb, wait_seqno, + vc4_atomic_complete_commit_seqno_cb); + } else { |