Unverified Commit 6bad4774 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: crtc: Move debugfs_name to crtc_data 



All the CRTCs, including the TXP, have a debugfs file and name so we can
consolidate it into vc4_crtc_data.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-21-maxime@cerno.tech
parent 9872c7a3

drivers/gpu/drm/vc4/vc4_crtc.c

+9 −9
Original line number Diff line number Diff line
@@ -1084,10 +1084,10 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { 


static const struct vc4_pv_data bcm2835_pv0_data = {

	.base = {

		.debugfs_name = "crtc0_regs",

		.hvs_available_channels = BIT(0),

		.hvs_output = 0,

	},

	.debugfs_name = "crtc0_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 1,

	.encoder_types = {
@@ -1098,10 +1098,10 @@ static const struct vc4_pv_data bcm2835_pv0_data = { 


static const struct vc4_pv_data bcm2835_pv1_data = {

	.base = {

		.debugfs_name = "crtc1_regs",

		.hvs_available_channels = BIT(2),

		.hvs_output = 2,

	},

	.debugfs_name = "crtc1_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 1,

	.encoder_types = {
@@ -1112,10 +1112,10 @@ static const struct vc4_pv_data bcm2835_pv1_data = { 


static const struct vc4_pv_data bcm2835_pv2_data = {

	.base = {

		.debugfs_name = "crtc2_regs",

		.hvs_available_channels = BIT(1),

		.hvs_output = 1,

	},

	.debugfs_name = "crtc2_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 1,

	.encoder_types = {
@@ -1126,10 +1126,10 @@ static const struct vc4_pv_data bcm2835_pv2_data = { 


static const struct vc4_pv_data bcm2711_pv0_data = {

	.base = {

		.debugfs_name = "crtc0_regs",

		.hvs_available_channels = BIT(0),

		.hvs_output = 0,

	},

	.debugfs_name = "crtc0_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 1,

	.encoder_types = {
@@ -1140,10 +1140,10 @@ static const struct vc4_pv_data bcm2711_pv0_data = { 


static const struct vc4_pv_data bcm2711_pv1_data = {

	.base = {

		.debugfs_name = "crtc1_regs",

		.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),

		.hvs_output = 3,

	},

	.debugfs_name = "crtc1_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 1,

	.encoder_types = {
@@ -1154,10 +1154,10 @@ static const struct vc4_pv_data bcm2711_pv1_data = { 


static const struct vc4_pv_data bcm2711_pv2_data = {

	.base = {

		.debugfs_name = "crtc2_regs",

		.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),

		.hvs_output = 4,

	},

	.debugfs_name = "crtc2_regs",

	.fifo_depth = 256,

	.pixels_per_clock = 2,

	.encoder_types = {
@@ -1167,10 +1167,10 @@ static const struct vc4_pv_data bcm2711_pv2_data = { 


static const struct vc4_pv_data bcm2711_pv3_data = {

	.base = {

		.debugfs_name = "crtc3_regs",

		.hvs_available_channels = BIT(1),

		.hvs_output = 1,

	},

	.debugfs_name = "crtc3_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 1,

	.encoder_types = {
@@ -1180,10 +1180,10 @@ static const struct vc4_pv_data bcm2711_pv3_data = { 


static const struct vc4_pv_data bcm2711_pv4_data = {

	.base = {

		.debugfs_name = "crtc4_regs",

		.hvs_available_channels = BIT(0) | BIT(1) | BIT(2),

		.hvs_output = 5,

	},

	.debugfs_name = "crtc4_regs",

	.fifo_depth = 64,

	.pixels_per_clock = 2,

	.encoder_types = {
@@ -1320,7 +1320,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) 


	platform_set_drvdata(pdev, vc4_crtc);



	vc4_debugfs_add_regset32(drm, pv_data->debugfs_name,

	vc4_debugfs_add_regset32(drm, pv_data->base.debugfs_name,

				 &vc4_crtc->regset);



	return 0;

drivers/gpu/drm/vc4/vc4_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -459,6 +459,8 @@ to_vc4_encoder(struct drm_encoder *encoder) 
}



struct vc4_crtc_data {

	const char *debugfs_name;



	/* Bitmask of channels (FIFOs) of the HVS that the output can source from */

	unsigned int hvs_available_channels;
@@ -476,8 +478,6 @@ struct vc4_pv_data { 
	u8 pixels_per_clock;



	enum vc4_encoder_type encoder_types[4];

	const char *debugfs_name;



};



struct vc4_crtc {

drivers/gpu/drm/vc4/vc4_txp.c

+1 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data) 
}



static const struct vc4_crtc_data vc4_txp_crtc_data = {

	.debugfs_name = "txp_regs",

	.hvs_available_channels = BIT(2),

	.hvs_output = 2,

};