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

drm: rcar-du: Replace EXT_CTRL_REGS feature flag with generation check 



The RCAR_DU_FEATURE_EXT_CTRL_REGS feature flag is missing for H1 only,
which is a first generation device, not a second generation device as
reported in the device information table. Fix the H1 generation and use
generation checks to replace the feature flag.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
parent f41cb153

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

+1 −13
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
static const struct rcar_du_device_info rzg1_du_r8a7743_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -59,7 +58,6 @@ static const struct rcar_du_device_info rzg1_du_r8a7743_info = { 
static const struct rcar_du_device_info rzg1_du_r8a7745_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -81,7 +79,6 @@ static const struct rcar_du_device_info rzg1_du_r8a7745_info = { 
static const struct rcar_du_device_info rzg1_du_r8a77470_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -132,7 +129,7 @@ static const struct rcar_du_device_info rcar_du_r8a774c0_info = { 
};



static const struct rcar_du_device_info rcar_du_r8a7779_info = {

	.gen = 2,

	.gen = 1,

	.features = RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -155,7 +152,6 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = { 
static const struct rcar_du_device_info rcar_du_r8a7790_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.quirks = RCAR_DU_QUIRK_ALIGN_128B,
@@ -185,7 +181,6 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = { 
static const struct rcar_du_device_info rcar_du_r8a7791_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -209,7 +204,6 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = { 
static const struct rcar_du_device_info rcar_du_r8a7792_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -229,7 +223,6 @@ static const struct rcar_du_device_info rcar_du_r8a7792_info = { 
static const struct rcar_du_device_info rcar_du_r8a7794_info = {

	.gen = 2,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,

	.channels_mask = BIT(1) | BIT(0),
@@ -252,7 +245,6 @@ static const struct rcar_du_device_info rcar_du_r8a7794_info = { 
static const struct rcar_du_device_info rcar_du_r8a7795_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_VSP1_SOURCE

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,
@@ -286,7 +278,6 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = { 
static const struct rcar_du_device_info rcar_du_r8a7796_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_VSP1_SOURCE

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,
@@ -316,7 +307,6 @@ static const struct rcar_du_device_info rcar_du_r8a7796_info = { 
static const struct rcar_du_device_info rcar_du_r8a77965_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_VSP1_SOURCE

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,
@@ -346,7 +336,6 @@ static const struct rcar_du_device_info rcar_du_r8a77965_info = { 
static const struct rcar_du_device_info rcar_du_r8a77970_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_VSP1_SOURCE

		  | RCAR_DU_FEATURE_INTERLACED

		  | RCAR_DU_FEATURE_TVM_SYNC,
@@ -368,7 +357,6 @@ static const struct rcar_du_device_info rcar_du_r8a77970_info = { 
static const struct rcar_du_device_info rcar_du_r8a7799x_info = {

	.gen = 3,

	.features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK

		  | RCAR_DU_FEATURE_EXT_CTRL_REGS

		  | RCAR_DU_FEATURE_VSP1_SOURCE,

	.channels_mask = BIT(1) | BIT(0),

	.routes = {

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

+3 −4
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ struct drm_device; 
struct rcar_du_device;



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

#define RCAR_DU_FEATURE_EXT_CTRL_REGS	BIT(1)	/* Has extended control registers */

#define RCAR_DU_FEATURE_VSP1_SOURCE	BIT(2)	/* Has inputs from VSP1 */

#define RCAR_DU_FEATURE_INTERLACED	BIT(3)	/* HW supports interlaced */

#define RCAR_DU_FEATURE_TVM_SYNC	BIT(4)	/* Has TV switch/sync modes */

#define RCAR_DU_FEATURE_VSP1_SOURCE	BIT(1)	/* Has inputs from VSP1 */

#define RCAR_DU_FEATURE_INTERLACED	BIT(2)	/* HW supports interlaced */

#define RCAR_DU_FEATURE_TVM_SYNC	BIT(3)	/* Has TV switch/sync modes */



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

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

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static void rcar_du_group_setup(struct rcar_du_group *rgrp) 


	rcar_du_group_setup_pins(rgrp);



	if (rcar_du_has(rgrp->dev, RCAR_DU_FEATURE_EXT_CTRL_REGS)) {

	if (rcdu->info->gen >= 2) {

		rcar_du_group_setup_defr8(rgrp);

		rcar_du_group_setup_didsr(rgrp);

	}
@@ -262,7 +262,7 @@ int rcar_du_set_dpad0_vsp1_routing(struct rcar_du_device *rcdu) 
	unsigned int index;

	int ret;



	if (!rcar_du_has(rcdu, RCAR_DU_FEATURE_EXT_CTRL_REGS))

	if (rcdu->info->gen < 2)

		return 0;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE