xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915: Rename async to nonblock.

Browse Source 
The async name is deprecated and should be changed to nonblocking.

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-13-git-send-email-maarten.lankhorst@linux.intel.com
This commit is contained in:
Maarten Lankhorst
2016-04-26 16:11:45 +02:00
committed by Daniel Vetter
parent eb63961ba5
commit 81072bfd13
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/drm/i915/intel_display.c
View File

@@ -13386,7 +13386,7 @@ static int intel_atomic_check(struct drm_device *dev,
static int intel_atomic_prepare_commit(struct drm_device *dev, static int intel_atomic_prepare_commit(struct drm_device *dev,
struct drm_atomic_state *state, struct drm_atomic_state *state,
bool async) bool nonblock)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
struct drm_plane_state *plane_state; struct drm_plane_state *plane_state;
@@ -13395,8 +13395,8 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
struct drm_crtc *crtc; struct drm_crtc *crtc;
int i, ret; int i, ret;
if (async) { if (nonblock) {
DRM_DEBUG_KMS("i915 does not yet support async commit\n"); DRM_DEBUG_KMS("i915 does not yet support nonblocking commit\n");
return -EINVAL; return -EINVAL;
} }
@@ -13414,7 +13414,7 @@ static int intel_atomic_prepare_commit(struct drm_device *dev,
return ret; return ret;
ret = drm_atomic_helper_prepare_planes(dev, state); ret = drm_atomic_helper_prepare_planes(dev, state);
if (!ret && !async && !i915_reset_in_progress(&dev_priv->gpu_error)) { if (!ret && !nonblock && !i915_reset_in_progress(&dev_priv->gpu_error)) {
u32 reset_counter; u32 reset_counter;
reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter); reset_counter = atomic_read(&dev_priv->gpu_error.reset_counter);
@@ -13519,21 +13519,21 @@ static bool needs_vblank_wait(struct intel_crtc_state *crtc_state)
* intel_atomic_commit - commit validated state object * intel_atomic_commit - commit validated state object
* @dev: DRM device * @dev: DRM device
* @state: the top-level driver state object * @state: the top-level driver state object
* @async: asynchronous commit * @nonblock: nonblocking commit
* *
* This function commits a top-level state object that has been validated * This function commits a top-level state object that has been validated
* with drm_atomic_helper_check(). * with drm_atomic_helper_check().
* *
* FIXME: Atomic modeset support for i915 is not yet complete. At the moment * FIXME: Atomic modeset support for i915 is not yet complete. At the moment
* we can only handle plane-related operations and do not yet support * we can only handle plane-related operations and do not yet support
* asynchronous commit. * nonblocking commit.
* *
* RETURNS * RETURNS
* Zero for success or -errno. * Zero for success or -errno.
*/ */
static int intel_atomic_commit(struct drm_device *dev, static int intel_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state, struct drm_atomic_state *state,
bool async) bool nonblock)
{ {
struct intel_atomic_state *intel_state = to_intel_atomic_state(state); struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
@@ -13545,7 +13545,7 @@ static int intel_atomic_commit(struct drm_device *dev,
unsigned long put_domains[I915_MAX_PIPES] = {}; unsigned long put_domains[I915_MAX_PIPES] = {};
unsigned crtc_vblank_mask = 0; unsigned crtc_vblank_mask = 0;
ret = intel_atomic_prepare_commit(dev, state, async); ret = intel_atomic_prepare_commit(dev, state, nonblock);
if (ret) { if (ret) {
DRM_DEBUG_ATOMIC("Preparing state failed with %i\n", ret); DRM_DEBUG_ATOMIC("Preparing state failed with %i\n", ret);
return ret; return ret;