Commit 0c9c7fd0 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/simple-kms-helper: Plumb plane state to the enable hook 



tinydrm enable hook wants to play around with the new fb in
.atomic_enable(), thus we'll need access to the plane state.

Performed with coccinelle:
@r1@
identifier F =~ ".*enable$";
identifier P, CS;
@@
F(
	struct drm_simple_display_pipe *P
	,struct drm_crtc_state *CS
+	,struct drm_plane_state *plane_state
	)
{
...
}

@@
struct drm_simple_display_pipe *P;
expression E;
@@
{
+ struct drm_plane *plane;
...
+ plane = &P->plane;
P->funcs->enable(P
		,E
+		,plane->state
	);
...
}

@@
identifier P, CS;
@@
struct drm_simple_display_pipe_funcs {
...
        void (*enable)(struct drm_simple_display_pipe *P
	     		,struct drm_crtc_state *CS
+			,struct drm_plane_state *plane_state
		);
...
};

v2: Pimp the commit message (David)

Cc: Marek Vasut <marex@denx.de>
Cc: Eric Anholt <eric@anholt.net>
Cc: David Lechner <david@lechnology.com>
Cc: "Noralf Trønnes" <noralf@tronnes.org>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180322202738.25817-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarNoralf Trønnes <noralf@tronnes.org>
parent ae358dac

drivers/gpu/drm/drm_simple_kms_helper.c

+3 −1
Original line number Diff line number Diff line
@@ -64,13 +64,15 @@ static int drm_simple_kms_crtc_check(struct drm_crtc *crtc, 
static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,

				       struct drm_crtc_state *old_state)

{

	struct drm_plane *plane;

	struct drm_simple_display_pipe *pipe;



	pipe = container_of(crtc, struct drm_simple_display_pipe, crtc);

	if (!pipe->funcs || !pipe->funcs->enable)

		return;



	pipe->funcs->enable(pipe, crtc->state);

	plane = &pipe->plane;

	pipe->funcs->enable(pipe, crtc->state, plane->state);

}



static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc,

drivers/gpu/drm/mxsfb/mxsfb_drv.c

+2 −1
Original line number Diff line number Diff line
@@ -99,7 +99,8 @@ static const struct drm_mode_config_funcs mxsfb_mode_config_funcs = { 
};



static void mxsfb_pipe_enable(struct drm_simple_display_pipe *pipe,

			      struct drm_crtc_state *crtc_state)

			      struct drm_crtc_state *crtc_state,

			      struct drm_plane_state *plane_state)

{

	struct mxsfb_drm_private *mxsfb = drm_pipe_to_mxsfb_drm_private(pipe);

drivers/gpu/drm/pl111/pl111_display.c

+2 −1
Original line number Diff line number Diff line
@@ -120,7 +120,8 @@ static int pl111_display_check(struct drm_simple_display_pipe *pipe, 
}



static void pl111_display_enable(struct drm_simple_display_pipe *pipe,

				 struct drm_crtc_state *cstate)

				 struct drm_crtc_state *cstate,

				 struct drm_plane_state *plane_state)

{

	struct drm_crtc *crtc = &pipe->crtc;

	struct drm_plane *plane = &pipe->plane;

drivers/gpu/drm/tinydrm/ili9225.c

+2 −1
Original line number Diff line number Diff line
@@ -176,7 +176,8 @@ static const struct drm_framebuffer_funcs ili9225_fb_funcs = { 
};



static void ili9225_pipe_enable(struct drm_simple_display_pipe *pipe,

				struct drm_crtc_state *crtc_state)

				struct drm_crtc_state *crtc_state,

				struct drm_plane_state *plane_state)

{

	struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);

	struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);

drivers/gpu/drm/tinydrm/mi0283qt.c

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 
#define ILI9341_MADCTL_MY	BIT(7)



static void mi0283qt_enable(struct drm_simple_display_pipe *pipe,

			    struct drm_crtc_state *crtc_state)

			    struct drm_crtc_state *crtc_state,

			    struct drm_plane_state *plane_state)

{

	struct tinydrm_device *tdev = pipe_to_tinydrm(pipe);

	struct mipi_dbi *mipi = mipi_dbi_from_tinydrm(tdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE