Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336d04a1 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: rcar-du: Switch plane update to atomic helpers 



This removes the legacy plane update code. Wire up the default atomic
check and atomic commit mode config helpers as needed by the plane
update atomic helpers.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
parent beff155a

drivers/gpu/drm/rcar-du/rcar_du_kms.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

 */





#include <drm/drmP.h>

#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fb_cma_helper.h>

#include <drm/drm_fb_cma_helper.h>
@@ -188,6 +189,8 @@ static void rcar_du_output_poll_changed(struct drm_device *dev) 
static const struct drm_mode_config_funcs rcar_du_mode_config_funcs = {

static const struct drm_mode_config_funcs rcar_du_mode_config_funcs = {

	.fb_create = rcar_du_fb_create,

	.fb_create = rcar_du_fb_create,

	.output_poll_changed = rcar_du_output_poll_changed,

	.output_poll_changed = rcar_du_output_poll_changed,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};

};





static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,

static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu,

drivers/gpu/drm/rcar-du/rcar_du_plane.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -480,8 +480,8 @@ static int rcar_du_plane_set_property(struct drm_plane *plane, 
}

}





static const struct drm_plane_funcs rcar_du_plane_funcs = {

static const struct drm_plane_funcs rcar_du_plane_funcs = {

	.update_plane = drm_plane_helper_update,

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_plane_helper_disable,

	.disable_plane = drm_atomic_helper_disable_plane,

	.reset = drm_atomic_helper_plane_reset,

	.reset = drm_atomic_helper_plane_reset,

	.set_property = rcar_du_plane_set_property,

	.set_property = rcar_du_plane_set_property,

	.destroy = drm_plane_cleanup,

	.destroy = drm_plane_cleanup,