drm/msm: Don't subclass drm_atomic_state anymore
With the addition of "private_objs" in drm_atomic_state, we no longer need to subclass drm_atomic_state to store state of share resources that don't perfectly fit within planes/crtc/connector state information. We can now save this state within drm_atomic_state itself using the private objects. Remove the infrastructure that allowed subclassing of drm_atomic_state in the driver. Changes in v3: - Added to the msm atomic helper patch set Changes in v4: - None Signed-off-by: Archit Taneja <architt@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com> Signed-off-by: Sean Paul <seanpaul@chromium.org>
This commit is contained in:
@@ -224,11 +224,7 @@ int msm_atomic_commit(struct drm_device *dev,
|
||||
* 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
|
||||
*/
|
||||
if (to_kms_state(state)->state)
|
||||
priv->kms->funcs->swap_state(priv->kms, state);
|
||||
|
||||
/*
|
||||
* Everything below can be run asynchronously without the need to grab
|
||||
@@ -262,30 +258,3 @@ error:
|
||||
drm_atomic_helper_cleanup_planes(dev, state);
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct drm_atomic_state *msm_atomic_state_alloc(struct drm_device *dev)
|
||||
{
|
||||
struct msm_kms_state *state = kzalloc(sizeof(*state), GFP_KERNEL);
|
||||
|
||||
if (!state || drm_atomic_state_init(dev, &state->base) < 0) {
|
||||
kfree(state);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return &state->base;
|
||||
}
|
||||
|
||||
void msm_atomic_state_clear(struct drm_atomic_state *s)
|
||||
{
|
||||
struct msm_kms_state *state = to_kms_state(s);
|
||||
drm_atomic_state_default_clear(&state->base);
|
||||
kfree(state->state);
|
||||
state->state = NULL;
|
||||
}
|
||||
|
||||
void msm_atomic_state_free(struct drm_atomic_state *state)
|
||||
{
|
||||
kfree(to_kms_state(state)->state);
|
||||
drm_atomic_state_default_release(state);
|
||||
kfree(state);
|
||||
}
|
||||
|
Reference in New Issue
Block a user