drm/msm: remove redundant private plane cleanup
authorRob Clark <robdclark@gmail.com>
Mon, 2 Jun 2014 11:22:29 +0000 (07:22 -0400)
committerRob Clark <robdclark@gmail.com>
Mon, 2 Jun 2014 11:36:29 +0000 (07:36 -0400)
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>
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c

index ef9957dbac943bdda6a1e6fd9bca142ebb202cef..74cebb51e8c285e23475c6df40ae64a271857b9f 100644 (file)
@@ -217,8 +217,6 @@ static void mdp4_crtc_destroy(struct drm_crtc *crtc)
 {
        struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
 
-       mdp4_crtc->plane->funcs->destroy(mdp4_crtc->plane);
-
        drm_crtc_cleanup(crtc);
        drm_flip_work_cleanup(&mdp4_crtc->unref_fb_work);
        drm_flip_work_cleanup(&mdp4_crtc->unref_cursor_work);
index 6ea10bdb6e8fc60d7691ba5ff6338177023e94ac..ebe2e60f3ab1147826e49a79b9772f4115635040 100644 (file)
@@ -195,8 +195,6 @@ static void mdp5_crtc_destroy(struct drm_crtc *crtc)
 {
        struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc);
 
-       mdp5_crtc->plane->funcs->destroy(mdp5_crtc->plane);
-
        drm_crtc_cleanup(crtc);
        drm_flip_work_cleanup(&mdp5_crtc->unref_fb_work);