plane_state can't be NULL anywhere in this function, so the NULL check
at the end is redundant, remove it.

Cc: [email protected]
Signed-off-by: Imre Deak <[email protected]>
---
 drivers/gpu/drm/drm_plane_helper.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/drm_plane_helper.c 
b/drivers/gpu/drm/drm_plane_helper.c
index 9854a50..2c27f6f 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -511,12 +511,10 @@ int drm_plane_helper_commit(struct drm_plane *plane,
        if (plane_funcs->cleanup_fb)
                plane_funcs->cleanup_fb(plane, plane_state);
 out:
-       if (plane_state) {
-               if (plane->funcs->atomic_destroy_state)
-                       plane->funcs->atomic_destroy_state(plane, plane_state);
-               else
-                       drm_atomic_helper_plane_destroy_state(plane, 
plane_state);
-       }
+       if (plane->funcs->atomic_destroy_state)
+               plane->funcs->atomic_destroy_state(plane, plane_state);
+       else
+               drm_atomic_helper_plane_destroy_state(plane, plane_state);
 
        return ret;
 }
-- 
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to