target/linux/brcm2708/patches-4.4/0334-drm-vc4-Rename-async-to-nonblock.patch

   1 From db48b84381e9cc7c4cc559bad3e5210db3b13c4e Mon Sep 17 00:00:00 2001
   2 From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
   3 Date: Tue, 26 Apr 2016 16:11:44 +0200
   4 Subject: [PATCH] drm/vc4: Rename async to nonblock.
   5
   6 The async name is deprecated and should be changed to nonblocking.
   7
   8 Cc: Eric Anholt <eric@anholt.net>
   9 Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
  10 Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  11 Link: http://patchwork.freedesktop.org/patch/msgid/1461679905-30177-12-git-send-email-maarten.lankhorst@linux.intel.com
  12 (cherry picked from commit eb63961ba52ba545f5b7ebeeeefe1c98704e1a79)
  13 ---
  14  drivers/gpu/drm/vc4/vc4_kms.c | 6 +++---
  15  1 file changed, 3 insertions(+), 3 deletions(-)
  16
  17 --- a/drivers/gpu/drm/vc4/vc4_kms.c
  18 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
  19 @@ -93,7 +93,7 @@ static struct vc4_commit *commit_init(st
  20   * vc4_atomic_commit - commit validated state object
  21   * @dev: DRM device
  22   * @state: the driver state object
  23 - * @async: asynchronous commit
  24 + * @nonblock: nonblocking commit
  25   *
  26   * This function commits a with drm_atomic_helper_check() pre-validated state
  27   * object. This can still fail when e.g. the framebuffer reservation fails. For
  28 @@ -104,7 +104,7 @@ static struct vc4_commit *commit_init(st
  29   */
  30  static int vc4_atomic_commit(struct drm_device *dev,
  31                              struct drm_atomic_state *state,
  32 -                            bool async)
  33 +                            bool nonblock)
  34  {
  35         struct vc4_dev *vc4 = to_vc4_dev(dev);
  36         int ret;
  37 @@ -170,7 +170,7 @@ static int vc4_atomic_commit(struct drm_
  38          * current layout.
  39          */
  40
  41 -       if (async) {
  42 +       if (nonblock) {
  43                 vc4_queue_seqno_cb(dev, &c->cb, wait_seqno,
  44                                    vc4_atomic_complete_commit_seqno_cb);
  45         } else {