Skip to content

Commit 33505f7

Browse files
committed
drm: renesas: shmobile: Remove custom plane destroy callback
There is no need to call drm_plane_force_disable() from the plane's .destroy() callback, as the plane should have been disabled already before. See also commit 3c858a3 ("drm/plane_helper: don't disable plane in destroy function") for the generic plane helper case. After removing this call, shmob_drm_plane_destroy() becomes a simple wrapper around shmob_drm_plane_destroy(), hence replace it by the latter. Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/8d7a3f250612085fdf4e06d377843e8f874b22d9.1694767209.git.geert+renesas@glider.be
1 parent 901500a commit 33505f7

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,10 @@ static int shmob_drm_plane_disable(struct drm_plane *plane,
176176
return 0;
177177
}
178178

179-
static void shmob_drm_plane_destroy(struct drm_plane *plane)
180-
{
181-
drm_plane_force_disable(plane);
182-
drm_plane_cleanup(plane);
183-
}
184-
185179
static const struct drm_plane_funcs shmob_drm_plane_funcs = {
186180
.update_plane = shmob_drm_plane_update,
187181
.disable_plane = shmob_drm_plane_disable,
188-
.destroy = shmob_drm_plane_destroy,
182+
.destroy = drm_plane_cleanup,
189183
};
190184

191185
static const uint32_t formats[] = {

0 commit comments

Comments
 (0)