This is the last piece that is keeping us from matching the atomic
helper commit function. By removing this (now unused) hook, we can
switch to drm_atomic_helper_commit()
Change-Id: I081056a6e1689807871f5deedc76499bb91b6969
Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx>
---
drivers/gpu/drm/msm/msm_atomic.c | 10 ----------
drivers/gpu/drm/msm/msm_kms.h | 2 --
2 files changed, 12 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index 1f53262ea46b..204c66cbfd31 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -169,16 +169,6 @@ int msm_atomic_commit(struct drm_device *dev,
*/
BUG_ON(drm_atomic_helper_swap_state(state, false) < 0);
- /*
- * Provide the driver a chance to prepare for output fences. This is
- * done after the point of no return, but before asynchronous commits
- * are dispatched to work queues, so that the fence preparation is
- * finished before the .atomic_commit returns.
- */
- if (priv && priv->kms && priv->kms->funcs &&
- priv->kms->funcs->prepare_fence)
- priv->kms->funcs->prepare_fence(priv->kms, state);
-
/*
* Everything below can be run asynchronously without the need to grab
* any modeset locks at all under one conditions: It must be guaranteed
diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h
index 4c5a69258c42..25800c046bd1 100644
--- a/drivers/gpu/drm/msm/msm_kms.h
+++ b/drivers/gpu/drm/msm/msm_kms.h
@@ -60,8 +60,6 @@ struct msm_kms_funcs {
void *(*duplicate_state)(void *state);
void (*destroy_state)(void *state);
/* modeset, bracketing atomic_commit(): */
- void (*prepare_fence)(struct msm_kms *kms,
- struct drm_atomic_state *state);
void (*prepare_commit)(struct msm_kms *kms,
struct drm_atomic_state *state);
void (*commit)(struct msm_kms *kms, struct drm_atomic_state *state);
--
Sean Paul, Software Engineer, Google / Chromium OS
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
