Commit 88beb8cc authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm: xlnx: zynqmp_dpsub: Move planes to zynqmp_dpsub structure 



Decouple the zynqmp_disp, which handles the hardware configuration, from
the DRM planes by moving the planes to the zynqmp_dpsub structure. The
planes handling code will be moved to a separate file in a subsequent
step.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 68dcffea

drivers/gpu/drm/xlnx/zynqmp_disp.c

+13 −19
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
#define ZYNQMP_DISP_AV_BUF_NUM_VID_GFX_BUFFERS		4

#define ZYNQMP_DISP_AV_BUF_NUM_BUFFERS			6



#define ZYNQMP_DISP_NUM_LAYERS				2

#define ZYNQMP_DISP_MAX_NUM_SUB_PLANES			3



/**
@@ -134,8 +133,7 @@ struct zynqmp_disp_layer_info { 
};



/**

 * struct zynqmp_disp_layer - Display layer (DRM plane)

 * @plane: DRM plane

 * struct zynqmp_disp_layer - Display layer

 * @id: Layer ID

 * @disp: Back pointer to struct zynqmp_disp

 * @info: Static layer information
@@ -145,7 +143,6 @@ struct zynqmp_disp_layer_info { 
 * @mode: Current operation mode

 */

struct zynqmp_disp_layer {

	struct drm_plane plane;

	enum zynqmp_disp_layer_id id;

	struct zynqmp_disp *disp;

	const struct zynqmp_disp_layer_info *info;
@@ -182,7 +179,7 @@ struct zynqmp_disp { 
		void __iomem *base;

	} audio;



	struct zynqmp_disp_layer layers[ZYNQMP_DISP_NUM_LAYERS];

	struct zynqmp_disp_layer layers[ZYNQMP_DPSUB_NUM_LAYERS];

};



/* -----------------------------------------------------------------------------
@@ -1091,11 +1088,6 @@ static int zynqmp_disp_layer_update(struct zynqmp_disp_layer *layer, 
	return 0;

}



static inline struct zynqmp_disp_layer *plane_to_layer(struct drm_plane *plane)

{

	return container_of(plane, struct zynqmp_disp_layer, plane);

}



static int

zynqmp_disp_plane_atomic_check(struct drm_plane *plane,

			       struct drm_atomic_state *state)
@@ -1124,7 +1116,8 @@ zynqmp_disp_plane_atomic_disable(struct drm_plane *plane, 
{

	struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,

									   plane);

	struct zynqmp_disp_layer *layer = plane_to_layer(plane);

	struct zynqmp_dpsub *dpsub = to_zynqmp_dpsub(plane->dev);

	struct zynqmp_disp_layer *layer = &dpsub->disp->layers[plane->index];



	if (!old_state->fb)

		return;
@@ -1142,7 +1135,8 @@ zynqmp_disp_plane_atomic_update(struct drm_plane *plane, 
{

	struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state, plane);

	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane);

	struct zynqmp_disp_layer *layer = plane_to_layer(plane);

	struct zynqmp_dpsub *dpsub = to_zynqmp_dpsub(plane->dev);

	struct zynqmp_disp_layer *layer = &dpsub->disp->layers[plane->index];

	bool format_changed = false;



	if (!old_state->fb ||
@@ -1194,6 +1188,7 @@ static int zynqmp_disp_create_planes(struct zynqmp_disp *disp) 


	for (i = 0; i < ARRAY_SIZE(disp->layers); i++) {

		struct zynqmp_disp_layer *layer = &disp->layers[i];

		struct drm_plane *plane = &disp->dpsub->planes[i];

		enum drm_plane_type type;

		unsigned int num_formats;

		u32 *formats;
@@ -1205,7 +1200,7 @@ static int zynqmp_disp_create_planes(struct zynqmp_disp *disp) 
		/* Graphics layer is primary, and video layer is overlay. */

		type = zynqmp_disp_layer_is_video(layer)

		     ? DRM_PLANE_TYPE_OVERLAY : DRM_PLANE_TYPE_PRIMARY;

		ret = drm_universal_plane_init(disp->drm, &layer->plane, 0,

		ret = drm_universal_plane_init(disp->drm, plane, 0,

					       &zynqmp_disp_plane_funcs,

					       formats, num_formats,

					       NULL, type, NULL);
@@ -1213,12 +1208,11 @@ static int zynqmp_disp_create_planes(struct zynqmp_disp *disp) 
		if (ret)

			return ret;



		drm_plane_helper_add(&layer->plane,

				     &zynqmp_disp_plane_helper_funcs);

		drm_plane_helper_add(plane, &zynqmp_disp_plane_helper_funcs);



		drm_plane_create_zpos_immutable_property(&layer->plane, i);

		drm_plane_create_zpos_immutable_property(plane, i);

		if (zynqmp_disp_layer_is_gfx(layer))

			drm_plane_create_alpha_property(&layer->plane);

			drm_plane_create_alpha_property(plane);

	}



	return 0;
@@ -1538,7 +1532,7 @@ static const struct drm_crtc_funcs zynqmp_disp_crtc_funcs = { 


static int zynqmp_disp_create_crtc(struct zynqmp_disp *disp)

{

	struct drm_plane *plane = &disp->layers[ZYNQMP_DISP_LAYER_GFX].plane;

	struct drm_plane *plane = &disp->dpsub->planes[ZYNQMP_DISP_LAYER_GFX];

	struct drm_crtc *crtc = &disp->dpsub->crtc;

	int ret;
@@ -1561,7 +1555,7 @@ static void zynqmp_disp_map_crtc_to_plane(struct zynqmp_disp *disp) 
	unsigned int i;



	for (i = 0; i < ARRAY_SIZE(disp->layers); i++)

		disp->layers[i].plane.possible_crtcs = possible_crtcs;

		disp->dpsub->planes[i].possible_crtcs = possible_crtcs;

}



/* -----------------------------------------------------------------------------

drivers/gpu/drm/xlnx/zynqmp_dpsub.h

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <drm/drm_crtc.h>

#include <drm/drm_encoder.h>

#include <drm/drm_plane.h>



struct clk;

struct device;
@@ -22,6 +23,8 @@ struct drm_device; 
struct zynqmp_disp;

struct zynqmp_dp;



#define ZYNQMP_DPSUB_NUM_LAYERS				2



enum zynqmp_dpsub_format {

	ZYNQMP_DPSUB_FORMAT_RGB,

	ZYNQMP_DPSUB_FORMAT_YCRCB444,
@@ -38,6 +41,7 @@ enum zynqmp_dpsub_format { 
 * @vid_clk_from_ps: True of the video clock comes from PS, false from PL

 * @aud_clk: Audio clock

 * @aud_clk_from_ps: True of the audio clock comes from PS, false from PL

 * @planes: The DRM planes

 * @crtc: The DRM CRTC

 * @encoder: The dummy DRM encoder

 * @bridge: The DP encoder bridge
@@ -55,6 +59,7 @@ struct zynqmp_dpsub { 
	struct clk *aud_clk;

	bool aud_clk_from_ps;



	struct drm_plane planes[ZYNQMP_DPSUB_NUM_LAYERS];

	struct drm_crtc crtc;

	struct drm_encoder encoder;

	struct drm_bridge *bridge;