aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibby Hsieh <bibby.hsieh@mediatek.com>2016-08-03 22:59:54 -0400
committerSean Paul <seanpaul@chromium.org>2016-08-08 14:20:01 -0400
commit903daff60fc5629d39ceb5f870afecdc477bcd6c (patch)
treef27a86ab8aa6d5ed4cee0a3fd3bf4a9cb573563f
parent5bfafad8059b40be3ab60be26d3270b74303639a (diff)
drm/mediatek: Use drm_atomic destroy_state helpers
Use the core destroy_state helpers to destroy core state to ensure we don't leak if/when more fields get added later. Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: http://patchwork.freedesktop.org/patch/msgid/1470279597-60453-5-git-send-email-bibby.hsieh@mediatek.com
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_crtc.c3
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_plane.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index d6fbefa65619..733b2a3643de 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -112,8 +112,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc *crtc)
112 struct mtk_crtc_state *state; 112 struct mtk_crtc_state *state;
113 113
114 if (crtc->state) { 114 if (crtc->state) {
115 if (crtc->state->mode_blob) 115 __drm_atomic_helper_crtc_destroy_state(crtc->state);
116 drm_property_unreference_blob(crtc->state->mode_blob);
117 116
118 state = to_mtk_crtc_state(crtc->state); 117 state = to_mtk_crtc_state(crtc->state);
119 memset(state, 0, sizeof(*state)); 118 memset(state, 0, sizeof(*state));
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
index 86b7aedcb2c1..17172ba40959 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
@@ -73,8 +73,7 @@ static void mtk_plane_reset(struct drm_plane *plane)
73 struct mtk_plane_state *state; 73 struct mtk_plane_state *state;
74 74
75 if (plane->state) { 75 if (plane->state) {
76 if (plane->state->fb) 76 __drm_atomic_helper_plane_destroy_state(plane->state);
77 drm_framebuffer_unreference(plane->state->fb);
78 77
79 state = to_mtk_plane_state(plane->state); 78 state = to_mtk_plane_state(plane->state);
80 memset(state, 0, sizeof(*state)); 79 memset(state, 0, sizeof(*state));