diff options
author | Rob Clark <robdclark@gmail.com> | 2014-06-02 07:22:29 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2014-06-02 07:36:29 -0400 |
commit | 814cb96fdc91495e13be7569dca43b7c1043ad2a (patch) | |
tree | e2618dac1ecb2957991213ee4bba20275243a3b4 | |
parent | 70c70f091b1ffd16b3e1a439bd595f7d539b1d5d (diff) |
drm/msm: remove redundant private plane cleanup
Now that drm core knows about private planes, it cleans them up for us.
Trying to do this twice results in badness.
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c index ef9957dbac94..74cebb51e8c2 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | |||
@@ -217,8 +217,6 @@ static void mdp4_crtc_destroy(struct drm_crtc *crtc) | |||
217 | { | 217 | { |
218 | struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); | 218 | struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); |
219 | 219 | ||
220 | mdp4_crtc->plane->funcs->destroy(mdp4_crtc->plane); | ||
221 | |||
222 | drm_crtc_cleanup(crtc); | 220 | drm_crtc_cleanup(crtc); |
223 | drm_flip_work_cleanup(&mdp4_crtc->unref_fb_work); | 221 | drm_flip_work_cleanup(&mdp4_crtc->unref_fb_work); |
224 | drm_flip_work_cleanup(&mdp4_crtc->unref_cursor_work); | 222 | drm_flip_work_cleanup(&mdp4_crtc->unref_cursor_work); |
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c index 6ea10bdb6e8f..ebe2e60f3ab1 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | |||
@@ -195,8 +195,6 @@ static void mdp5_crtc_destroy(struct drm_crtc *crtc) | |||
195 | { | 195 | { |
196 | struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc); | 196 | struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc); |
197 | 197 | ||
198 | mdp5_crtc->plane->funcs->destroy(mdp5_crtc->plane); | ||
199 | |||
200 | drm_crtc_cleanup(crtc); | 198 | drm_crtc_cleanup(crtc); |
201 | drm_flip_work_cleanup(&mdp5_crtc->unref_fb_work); | 199 | drm_flip_work_cleanup(&mdp5_crtc->unref_fb_work); |
202 | 200 | ||