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

Commit e8355e0d authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

drm/rcar-du: Split features and quirks 



128-byte pitch alignement is not a hardware feature, it's a hardware
bug. Split it from the features field into a new quirks field. New
quirks will be added to support the R8A7791 SoC.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -249,8 +249,8 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = { 
};



static const struct rcar_du_device_info rcar_du_r8a7790_info = {

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_ALIGN_128B

		  | RCAR_DU_FEATURE_DEFR8,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK | RCAR_DU_FEATURE_DEFR8,

	.quirks = RCAR_DU_QUIRK_ALIGN_128B,

	.num_crtcs = 3,

	.routes = {

		/* R8A7790 has one RGB output, two LVDS outputs and one

drivers/gpu/drm/rcar-du/rcar_du_drv.h

+11 −2
Original line number Diff line number Diff line
@@ -28,8 +28,9 @@ struct rcar_du_device; 
struct rcar_du_lvdsenc;



#define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK	(1 << 0)	/* Per-CRTC IRQ and clock */

#define RCAR_DU_FEATURE_ALIGN_128B	(1 << 1)	/* Align pitches to 128 bytes */

#define RCAR_DU_FEATURE_DEFR8		(1 << 2)	/* Has DEFR8 register */

#define RCAR_DU_FEATURE_DEFR8		(1 << 1)	/* Has DEFR8 register */



#define RCAR_DU_QUIRK_ALIGN_128B	(1 << 0)	/* Align pitches to 128 bytes */



/*

 * struct rcar_du_output_routing - Output routing specification
@@ -48,12 +49,14 @@ struct rcar_du_output_routing { 
/*

 * struct rcar_du_device_info - DU model-specific information

 * @features: device features (RCAR_DU_FEATURE_*)

 * @quirks: device quirks (RCAR_DU_QUIRK_*)

 * @num_crtcs: total number of CRTCs

 * @routes: array of CRTC to output routes, indexed by output (RCAR_DU_OUTPUT_*)

 * @num_lvds: number of internal LVDS encoders

 */

struct rcar_du_device_info {

	unsigned int features;

	unsigned int quirks;

	unsigned int num_crtcs;

	struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX];

	unsigned int num_lvds;
@@ -84,6 +87,12 @@ static inline bool rcar_du_has(struct rcar_du_device *rcdu, 
	return rcdu->info->features & feature;

}



static inline bool rcar_du_needs(struct rcar_du_device *rcdu,

				 unsigned int quirk)

{

	return rcdu->info->quirks & quirk;

}



static inline u32 rcar_du_read(struct rcar_du_device *rcdu, u32 reg)

{

	return ioread32(rcdu->mmio + reg);

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

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int rcar_du_dumb_create(struct drm_file *file, struct drm_device *dev, 
	/* The R8A7779 DU requires a 16 pixels pitch alignment as documented,

	 * but the R8A7790 DU seems to require a 128 bytes pitch alignment.

	 */

	if (rcar_du_has(rcdu, RCAR_DU_FEATURE_ALIGN_128B))

	if (rcar_du_needs(rcdu, RCAR_DU_QUIRK_ALIGN_128B))

		align = 128;

	else

		align = 16 * args->bpp / 8;
@@ -144,7 +144,7 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv, 
		return ERR_PTR(-EINVAL);

	}



	if (rcar_du_has(rcdu, RCAR_DU_FEATURE_ALIGN_128B))

	if (rcar_du_needs(rcdu, RCAR_DU_QUIRK_ALIGN_128B))

		align = 128;

	else

		align = 16 * format->bpp / 8;