Skip to content

Commit

Permalink
drm/msm: Switch to atomic_helper_commit()
Browse files Browse the repository at this point in the history 
Now that all of the msm-specific goo is tucked safely away we can switch
over to using the atomic helper commit directly. \o/

Changes in v2:
- None
Changes in v3:
- Rebased on Archit's private_obj set
Changes in v4:
- None

Cc: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
  • Loading branch information
Sean Paul authored and Rob Clark committed Jun 4, 2018
1 parent 70db18d commit d14659f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 141 deletions.
139 changes: 1 addition & 138 deletions drivers/gpu/drm/msm/msm_atomic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
#include "msm_drv.h"
#include "msm_gem.h"
#include "msm_kms.h"
#include "msm_gem.h"
#include "msm_fence.h"

static void msm_atomic_wait_for_commit_done(struct drm_device *dev,
struct drm_atomic_state *old_state)
Expand Down Expand Up @@ -59,7 +57,7 @@ int msm_atomic_prepare_fb(struct drm_plane *plane,
return msm_framebuffer_prepare(new_state->fb, kms->aspace);
}

static void msm_atomic_commit_tail(struct drm_atomic_state *state)
void msm_atomic_commit_tail(struct drm_atomic_state *state)
{
struct drm_device *dev = state->dev;
struct msm_drm_private *priv = dev->dev_private;
Expand All @@ -73,19 +71,6 @@ static void msm_atomic_commit_tail(struct drm_atomic_state *state)

drm_atomic_helper_commit_modeset_enables(dev, state);

/* NOTE: _wait_for_vblanks() only waits for vblank on
* enabled CRTCs. So we end up faulting when disabling
* due to (potentially) unref'ing the outgoing fb's
* before the vblank when the disable has latched.
*
* But if it did wait on disabled (or newly disabled)
* CRTCs, that would be racy (ie. we could have missed
* the irq. We need some way to poll for pipe shut
* down. Or just live with occasionally hitting the
* timeout in the CRTC disable path (which really should
* not be critical path)
*/

msm_atomic_wait_for_commit_done(dev, state);

kms->funcs->complete_commit(kms, state);
Expand All @@ -96,125 +81,3 @@ static void msm_atomic_commit_tail(struct drm_atomic_state *state)

drm_atomic_helper_cleanup_planes(dev, state);
}

/* The (potentially) asynchronous part of the commit. At this point
* nothing can fail short of armageddon.
*/
static void commit_tail(struct drm_atomic_state *state)
{
drm_atomic_helper_wait_for_fences(state->dev, state, false);

drm_atomic_helper_wait_for_dependencies(state);

msm_atomic_commit_tail(state);

drm_atomic_helper_commit_cleanup_done(state);

drm_atomic_state_put(state);
}

static void commit_work(struct work_struct *work)
{
struct drm_atomic_state *state = container_of(work,
struct drm_atomic_state,
commit_work);
commit_tail(state);
}

/**
* drm_atomic_helper_commit - commit validated state object
* @dev: DRM device
* @state: the driver state object
* @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.
*
* RETURNS
* Zero for success or -errno.
*/
int msm_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state, bool nonblock)
{
struct msm_drm_private *priv = dev->dev_private;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
struct drm_plane *plane;
struct drm_plane_state *old_plane_state, *new_plane_state;
int i, ret;

/*
* Note that plane->atomic_async_check() should fail if we need
* to re-assign hwpipe or anything that touches global atomic
* state, so we'll never go down the async update path in those
* cases.
*/
if (state->async_update) {
ret = drm_atomic_helper_prepare_planes(dev, state);
if (ret)
return ret;

drm_atomic_helper_async_commit(dev, state);
drm_atomic_helper_cleanup_planes(dev, state);
return 0;
}

ret = drm_atomic_helper_setup_commit(state, nonblock);
if (ret)
return ret;

INIT_WORK(&state->commit_work, commit_work);

ret = drm_atomic_helper_prepare_planes(dev, state);
if (ret)
return ret;

if (!nonblock) {
ret = drm_atomic_helper_wait_for_fences(dev, state, true);
if (ret)
goto error;
}

/*
* This is the point of no return - everything below never fails except
* when the hw goes bonghits. Which means we can commit the new state on
* the software side now.
*
* swap driver private state while still holding state_lock
*/
BUG_ON(drm_atomic_helper_swap_state(state, true) < 0);

/*
* This is the point of no return - everything below never fails except
* when the hw goes bonghits. Which means we can commit the new state on
* the software side now.
*/

/*
* Everything below can be run asynchronously without the need to grab
* any modeset locks at all under one conditions: It must be guaranteed
* that the asynchronous work has either been cancelled (if the driver
* supports it, which at least requires that the framebuffers get
* cleaned up with drm_atomic_helper_cleanup_planes()) or completed
* before the new state gets committed on the software side with
* drm_atomic_helper_swap_state().
*
* This scheme allows new atomic state updates to be prepared and
* checked in parallel to the asynchronous completion of the previous
* update. Which is important since compositors need to figure out the
* composition of the next frame right after having submitted the
* current layout.
*/

drm_atomic_state_get(state);
if (nonblock)
queue_work(system_unbound_wq, &state->commit_work);
else
commit_tail(state);

return 0;

error:
drm_atomic_helper_cleanup_planes(dev, state);
return ret;
}
7 changes: 6 additions & 1 deletion drivers/gpu/drm/msm/msm_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ static const struct drm_mode_config_funcs mode_config_funcs = {
.fb_create = msm_framebuffer_create,
.output_poll_changed = drm_fb_helper_output_poll_changed,
.atomic_check = drm_atomic_helper_check,
.atomic_commit = msm_atomic_commit,
.atomic_commit = drm_atomic_helper_commit,
};

static const struct drm_mode_config_helper_funcs mode_config_helper_funcs = {
.atomic_commit_tail = msm_atomic_commit_tail,
};

#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING
Expand Down Expand Up @@ -438,6 +442,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv)
}

ddev->mode_config.funcs = &mode_config_funcs;
ddev->mode_config.helper_private = &mode_config_helper_funcs;

ret = drm_vblank_init(ddev, priv->num_crtcs);
if (ret < 0) {
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/msm/msm_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,7 @@ struct msm_format {

int msm_atomic_prepare_fb(struct drm_plane *plane,
struct drm_plane_state *new_state);
int msm_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state, bool nonblock);
void msm_atomic_commit_tail(struct drm_atomic_state *state);
struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev);
void msm_atomic_state_clear(struct drm_atomic_state *state);
void msm_atomic_state_free(struct drm_atomic_state *state);
Expand Down

0 comments on commit d14659f

Please sign in to comment.