[v2,2/6] drm/msm: Refactor complete_commit() to look more the helpers

Submitted by Sean Paul on March 28, 2018, 7:06 p.m.

Details

Message ID 20180328190657.218661-3-seanpaul@chromium.org
State New
Headers show
Series "drm/msm: Switch to atomic helpers" ( rev: 2 ) in DRI devel

Not browsing as part of any series.

Commit Message

Sean Paul March 28, 2018, 7:06 p.m.
Factor out the commit_tail() portions of complete_commit() into a
separate function to facilitate moving to the atomic helpers in future
patches.

Changes in v2:
- None

Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/msm/msm_atomic.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
index e792158676aa..671a18ee977d 100644
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@ -97,18 +97,12 @@  static void msm_atomic_wait_for_commit_done(struct drm_device *dev,
 	}
 }
 
-/* The (potentially) asynchronous part of the commit.  At this point
- * nothing can fail short of armageddon.
- */
-static void complete_commit(struct msm_commit *c, bool async)
+static void msm_atomic_commit_tail(struct drm_atomic_state *state)
 {
-	struct drm_atomic_state *state = c->state;
 	struct drm_device *dev = state->dev;
 	struct msm_drm_private *priv = dev->dev_private;
 	struct msm_kms *kms = priv->kms;
 
-	drm_atomic_helper_wait_for_fences(dev, state, false);
-
 	kms->funcs->prepare_commit(kms, state);
 
 	drm_atomic_helper_commit_modeset_disables(dev, state);
@@ -135,6 +129,19 @@  static void complete_commit(struct msm_commit *c, bool async)
 	drm_atomic_helper_cleanup_planes(dev, state);
 
 	kms->funcs->complete_commit(kms, state);
+}
+
+/* The (potentially) asynchronous part of the commit.  At this point
+ * nothing can fail short of armageddon.
+ */
+static void complete_commit(struct msm_commit *c)
+{
+	struct drm_atomic_state *state = c->state;
+	struct drm_device *dev = state->dev;
+
+	drm_atomic_helper_wait_for_fences(dev, state, false);
+
+	msm_atomic_commit_tail(state);
 
 	drm_atomic_state_put(state);
 
@@ -143,7 +150,7 @@  static void complete_commit(struct msm_commit *c, bool async)
 
 static void commit_worker(struct work_struct *work)
 {
-	complete_commit(container_of(work, struct msm_commit, work), true);
+	complete_commit(container_of(work, struct msm_commit, work));
 }
 
 /**
@@ -242,7 +249,7 @@  int msm_atomic_commit(struct drm_device *dev,
 		return 0;
 	}
 
-	complete_commit(c, false);
+	complete_commit(c);
 
 	return 0;
 

Comments

On Thursday 29 March 2018 12:36 AM, Sean Paul wrote:
> Factor out the commit_tail() portions of complete_commit() into a
> separate function to facilitate moving to the atomic helpers in future
> patches.
> 

Reviewed-by: Archit Taneja <architt@codeaurora.org>

> Changes in v2:
> - None
> 
> Cc: Jeykumar Sankaran <jsanka@codeaurora.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
>   drivers/gpu/drm/msm/msm_atomic.c | 25 ++++++++++++++++---------
>   1 file changed, 16 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c
> index e792158676aa..671a18ee977d 100644
> --- a/drivers/gpu/drm/msm/msm_atomic.c
> +++ b/drivers/gpu/drm/msm/msm_atomic.c
> @@ -97,18 +97,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev,
>   	}
>   }
>   
> -/* The (potentially) asynchronous part of the commit.  At this point
> - * nothing can fail short of armageddon.
> - */
> -static void complete_commit(struct msm_commit *c, bool async)
> +static void msm_atomic_commit_tail(struct drm_atomic_state *state)
>   {
> -	struct drm_atomic_state *state = c->state;
>   	struct drm_device *dev = state->dev;
>   	struct msm_drm_private *priv = dev->dev_private;
>   	struct msm_kms *kms = priv->kms;
>   
> -	drm_atomic_helper_wait_for_fences(dev, state, false);
> -
>   	kms->funcs->prepare_commit(kms, state);
>   
>   	drm_atomic_helper_commit_modeset_disables(dev, state);
> @@ -135,6 +129,19 @@ static void complete_commit(struct msm_commit *c, bool async)
>   	drm_atomic_helper_cleanup_planes(dev, state);
>   
>   	kms->funcs->complete_commit(kms, state);
> +}
> +
> +/* The (potentially) asynchronous part of the commit.  At this point
> + * nothing can fail short of armageddon.
> + */
> +static void complete_commit(struct msm_commit *c)
> +{
> +	struct drm_atomic_state *state = c->state;
> +	struct drm_device *dev = state->dev;
> +
> +	drm_atomic_helper_wait_for_fences(dev, state, false);
> +
> +	msm_atomic_commit_tail(state);
>   
>   	drm_atomic_state_put(state);
>   
> @@ -143,7 +150,7 @@ static void complete_commit(struct msm_commit *c, bool async)
>   
>   static void commit_worker(struct work_struct *work)
>   {
> -	complete_commit(container_of(work, struct msm_commit, work), true);
> +	complete_commit(container_of(work, struct msm_commit, work));
>   }
>   
>   /**
> @@ -242,7 +249,7 @@ int msm_atomic_commit(struct drm_device *dev,
>   		return 0;
>   	}
>   
> -	complete_commit(c, false);
> +	complete_commit(c);
>   
>   	return 0;
>   
>