| Message ID | 20230803204521.928582-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | drm/msm/mdp5: Don't leak some plane state | expand |
On Thu, Aug 3, 2023 at 1:45 PM Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > Apparently no one noticed that mdp5 plane states leak like a sieve > ever since we introduced plane_state->commit refcount a few years ago > in 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too > early by tracking commits, v3.") > > Fix it by using the right helpers. > > Fixes: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.") > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Cc: linux-arm-msm@vger.kernel.org > Cc: freedreno@lists.freedesktop.org > Reported-and-tested-by: dorum@noisolation.com > Cc: dorum@noisolation.com > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Rob Clark <robdclark@gmail.com> > --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > index bd2c4ac45601..0d5ff03cb091 100644 > --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c > @@ -130,8 +130,7 @@ static void mdp5_plane_destroy_state(struct drm_plane *plane, > { > struct mdp5_plane_state *pstate = to_mdp5_plane_state(state); > > - if (state->fb) > - drm_framebuffer_put(state->fb); > + __drm_atomic_helper_plane_destroy_state(state); > > kfree(pstate); > } > -- > 2.40.1 >
On Thu, 3 Aug 2023 at 23:45, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > > Apparently no one noticed that mdp5 plane states leak like a sieve > ever since we introduced plane_state->commit refcount a few years ago > in 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too > early by tracking commits, v3.") > > Fix it by using the right helpers. > > Fixes: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.") > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Cc: linux-arm-msm@vger.kernel.org > Cc: freedreno@lists.freedesktop.org > Reported-and-tested-by: dorum@noisolation.com > Cc: dorum@noisolation.com > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On 8/3/2023 1:45 PM, Daniel Vetter wrote: > Apparently no one noticed that mdp5 plane states leak like a sieve > ever since we introduced plane_state->commit refcount a few years ago > in 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too > early by tracking commits, v3.") > > Fix it by using the right helpers. > > Fixes: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.") > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: Rob Clark <robdclark@gmail.com> > Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Cc: linux-arm-msm@vger.kernel.org > Cc: freedreno@lists.freedesktop.org > Reported-and-tested-by: dorum@noisolation.com > Cc: dorum@noisolation.com > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
On Thu, 03 Aug 2023 22:45:21 +0200, Daniel Vetter wrote: > Apparently no one noticed that mdp5 plane states leak like a sieve > ever since we introduced plane_state->commit refcount a few years ago > in 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too > early by tracking commits, v3.") > > Fix it by using the right helpers. > > [...] Applied, thanks! [1/1] drm/msm/mdp5: Don't leak some plane state https://gitlab.freedesktop.org/lumag/msm/-/commit/fd0ad3b2365c Best regards,
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c index bd2c4ac45601..0d5ff03cb091 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c @@ -130,8 +130,7 @@ static void mdp5_plane_destroy_state(struct drm_plane *plane, { struct mdp5_plane_state *pstate = to_mdp5_plane_state(state); - if (state->fb) - drm_framebuffer_put(state->fb); + __drm_atomic_helper_plane_destroy_state(state); kfree(pstate); }
Apparently no one noticed that mdp5 plane states leak like a sieve ever since we introduced plane_state->commit refcount a few years ago in 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.") Fix it by using the right helpers. Fixes: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.") Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Rob Clark <robdclark@gmail.com> Cc: Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Reported-and-tested-by: dorum@noisolation.com Cc: dorum@noisolation.com Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)