Commit 1f920175 authored by Rob Clark's avatar Rob Clark

drm/msm/atomic: switch to drm_atomic_helper_check

Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 9d9ea7a9
...@@ -146,35 +146,6 @@ static void commit_worker(struct work_struct *work) ...@@ -146,35 +146,6 @@ 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), true);
} }
/*
* this func is identical to the drm_atomic_helper_check, but we keep this
* because we might eventually need to have a more finegrained check
* sequence without using the atomic helpers.
*
* In the past, we first called drm_atomic_helper_check_planes, and then
* drm_atomic_helper_check_modeset. We needed this because the MDP5 plane's
* ->atomic_check could update ->mode_changed for pixel format changes.
* This, however isn't needed now because if there is a pixel format change,
* we just assign a new hwpipe for it with a new SMP allocation. We might
* eventually hit a condition where we would need to do a full modeset if
* we run out of planes. There, we'd probably need to set mode_changed.
*/
int msm_atomic_check(struct drm_device *dev,
struct drm_atomic_state *state)
{
int ret;
ret = drm_atomic_helper_check_modeset(dev, state);
if (ret)
return ret;
ret = drm_atomic_helper_check_planes(dev, state);
if (ret)
return ret;
return ret;
}
/** /**
* drm_atomic_helper_commit - commit validated state object * drm_atomic_helper_commit - commit validated state object
* @dev: DRM device * @dev: DRM device
......
...@@ -47,7 +47,7 @@ static void msm_fb_output_poll_changed(struct drm_device *dev) ...@@ -47,7 +47,7 @@ static void msm_fb_output_poll_changed(struct drm_device *dev)
static const struct drm_mode_config_funcs mode_config_funcs = { static const struct drm_mode_config_funcs mode_config_funcs = {
.fb_create = msm_framebuffer_create, .fb_create = msm_framebuffer_create,
.output_poll_changed = msm_fb_output_poll_changed, .output_poll_changed = msm_fb_output_poll_changed,
.atomic_check = msm_atomic_check, .atomic_check = drm_atomic_helper_check,
.atomic_commit = msm_atomic_commit, .atomic_commit = msm_atomic_commit,
.atomic_state_alloc = msm_atomic_state_alloc, .atomic_state_alloc = msm_atomic_state_alloc,
.atomic_state_clear = msm_atomic_state_clear, .atomic_state_clear = msm_atomic_state_clear,
......
...@@ -161,8 +161,6 @@ struct msm_format { ...@@ -161,8 +161,6 @@ struct msm_format {
uint32_t pixel_format; uint32_t pixel_format;
}; };
int msm_atomic_check(struct drm_device *dev,
struct drm_atomic_state *state);
int msm_atomic_commit(struct drm_device *dev, int msm_atomic_commit(struct drm_device *dev,
struct drm_atomic_state *state, bool nonblock); struct drm_atomic_state *state, bool nonblock);
struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev); struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment