The vc4_crtc_data structure is currently storing data related to both the general CRTC information needed by the rest of the vc4 driver (like HVS output and available FIFOs) and some related to the pixelvalve attached to that CRTC. Let's split this into two structures so that we can reuse the CRTC part into the TXP later on.
Signed-off-by: Maxime Ripard maxime@cerno.tech --- drivers/gpu/drm/vc4/vc4_crtc.c | 84 +++++++++++++++++++++-------------- drivers/gpu/drm/vc4/vc4_drv.h | 25 ++++++++-- 2 files changed, 74 insertions(+), 35 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 4df8cc5387a0..f82e3b0e11bd 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -208,7 +208,9 @@ void vc4_crtc_destroy(struct drm_crtc *crtc)
static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format) { - u32 fifo_len_bytes = vc4_crtc->data->fifo_depth; + const struct vc4_crtc_data *crtc_data = vc4_crtc_to_vc4_crtc_data(vc4_crtc); + const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc); + u32 fifo_len_bytes = pv_data->fifo_depth;
/* * Pixels are pulled from the HVS if the number of bytes is @@ -233,7 +235,7 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format) * For some reason, the pixelvalve4 doesn't work with * the usual formula and will only work with 32. */ - if (vc4_crtc->data->hvs_output == 5) + if (crtc_data->hvs_output == 5) return 32;
return fifo_len_bytes - 3 * HVS_FIFO_LATENCY_PIX; @@ -294,6 +296,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc); struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); + const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc); struct drm_crtc_state *state = crtc->state; struct drm_display_mode *mode = &state->adjusted_mode; bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE; @@ -301,7 +304,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc) bool is_dsi = (vc4_encoder->type == VC4_ENCODER_TYPE_DSI0 || vc4_encoder->type == VC4_ENCODER_TYPE_DSI1); u32 format = is_dsi ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24; - u8 ppc = vc4_crtc->data->pixels_per_clock; + u8 ppc = pv_data->pixels_per_clock; bool debug_dump_regs = false;
if (debug_dump_regs) { @@ -885,9 +888,11 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { .get_scanout_position = vc4_crtc_get_scanout_position, };
-static const struct vc4_crtc_data bcm2835_pv0_data = { - .hvs_available_channels = BIT(0), - .hvs_output = 0, +static const struct vc4_pv_data bcm2835_pv0_data = { + .base = { + .hvs_available_channels = BIT(0), + .hvs_output = 0, + }, .debugfs_name = "crtc0_regs", .fifo_depth = 64, .pixels_per_clock = 1, @@ -897,9 +902,11 @@ static const struct vc4_crtc_data bcm2835_pv0_data = { }, };
-static const struct vc4_crtc_data bcm2835_pv1_data = { - .hvs_available_channels = BIT(2), - .hvs_output = 2, +static const struct vc4_pv_data bcm2835_pv1_data = { + .base = { + .hvs_available_channels = BIT(2), + .hvs_output = 2, + }, .debugfs_name = "crtc1_regs", .fifo_depth = 64, .pixels_per_clock = 1, @@ -909,9 +916,11 @@ static const struct vc4_crtc_data bcm2835_pv1_data = { }, };
-static const struct vc4_crtc_data bcm2835_pv2_data = { - .hvs_available_channels = BIT(1), - .hvs_output = 1, +static const struct vc4_pv_data bcm2835_pv2_data = { + .base = { + .hvs_available_channels = BIT(1), + .hvs_output = 1, + }, .debugfs_name = "crtc2_regs", .fifo_depth = 64, .pixels_per_clock = 1, @@ -921,10 +930,12 @@ static const struct vc4_crtc_data bcm2835_pv2_data = { }, };
-static const struct vc4_crtc_data bcm2711_pv0_data = { +static const struct vc4_pv_data bcm2711_pv0_data = { + .base = { + .hvs_available_channels = BIT(0), + .hvs_output = 0, + }, .debugfs_name = "crtc0_regs", - .hvs_available_channels = BIT(0), - .hvs_output = 0, .fifo_depth = 64, .pixels_per_clock = 1, .encoder_types = { @@ -933,10 +944,12 @@ static const struct vc4_crtc_data bcm2711_pv0_data = { }, };
-static const struct vc4_crtc_data bcm2711_pv1_data = { +static const struct vc4_pv_data bcm2711_pv1_data = { + .base = { + .hvs_available_channels = BIT(0) | BIT(1) | BIT(2), + .hvs_output = 3, + }, .debugfs_name = "crtc1_regs", - .hvs_available_channels = BIT(0) | BIT(1) | BIT(2), - .hvs_output = 3, .fifo_depth = 64, .pixels_per_clock = 1, .encoder_types = { @@ -945,10 +958,12 @@ static const struct vc4_crtc_data bcm2711_pv1_data = { }, };
-static const struct vc4_crtc_data bcm2711_pv2_data = { +static const struct vc4_pv_data bcm2711_pv2_data = { + .base = { + .hvs_available_channels = BIT(0) | BIT(1) | BIT(2), + .hvs_output = 4, + }, .debugfs_name = "crtc2_regs", - .hvs_available_channels = BIT(0) | BIT(1) | BIT(2), - .hvs_output = 4, .fifo_depth = 256, .pixels_per_clock = 2, .encoder_types = { @@ -956,10 +971,12 @@ static const struct vc4_crtc_data bcm2711_pv2_data = { }, };
-static const struct vc4_crtc_data bcm2711_pv3_data = { +static const struct vc4_pv_data bcm2711_pv3_data = { + .base = { + .hvs_available_channels = BIT(1), + .hvs_output = 1, + }, .debugfs_name = "crtc3_regs", - .hvs_available_channels = BIT(1), - .hvs_output = 1, .fifo_depth = 64, .pixels_per_clock = 1, .encoder_types = { @@ -967,10 +984,12 @@ static const struct vc4_crtc_data bcm2711_pv3_data = { }, };
-static const struct vc4_crtc_data bcm2711_pv4_data = { +static const struct vc4_pv_data bcm2711_pv4_data = { + .base = { + .hvs_available_channels = BIT(0) | BIT(1) | BIT(2), + .hvs_output = 5, + }, .debugfs_name = "crtc4_regs", - .hvs_available_channels = BIT(0) | BIT(1) | BIT(2), - .hvs_output = 5, .fifo_depth = 64, .pixels_per_clock = 2, .encoder_types = { @@ -994,8 +1013,9 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm, struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - const struct vc4_crtc_data *crtc_data = vc4_crtc->data; - const enum vc4_encoder_type *encoder_types = crtc_data->encoder_types; + const struct vc4_crtc_data *crtc_data = vc4_crtc_to_vc4_crtc_data(vc4_crtc); + const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc); + const enum vc4_encoder_type *encoder_types = pv_data->encoder_types; struct drm_encoder *encoder;
drm_for_each_encoder(encoder, drm) { @@ -1010,7 +1030,7 @@ static void vc4_set_crtc_possible_masks(struct drm_device *drm, }
vc4_encoder = to_vc4_encoder(encoder); - for (i = 0; i < ARRAY_SIZE(crtc_data->encoder_types); i++) { + for (i = 0; i < ARRAY_SIZE(pv_data->encoder_types); i++) { if (vc4_encoder->type == encoder_types[i]) { vc4_encoder->clock_select = i; encoder->possible_crtcs |= drm_crtc_mask(crtc); @@ -1025,7 +1045,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) struct platform_device *pdev = to_platform_device(dev); struct drm_device *drm = dev_get_drvdata(master); struct vc4_dev *vc4 = to_vc4_dev(drm); - const struct vc4_crtc_data *pv_data; + const struct vc4_pv_data *pv_data; struct vc4_crtc *vc4_crtc; struct drm_crtc *crtc; struct drm_plane *primary_plane, *destroy_plane, *temp; @@ -1039,7 +1059,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) pv_data = of_device_get_match_data(dev); if (!pv_data) return -ENODEV; - vc4_crtc->data = pv_data; + vc4_crtc->data = &pv_data->base; vc4_crtc->pdev = pdev;
vc4_crtc->regs = vc4_ioremap_regs(pdev, 0); diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index da4d2391a4ba..ed09acbc5660 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -458,20 +458,25 @@ to_vc4_encoder(struct drm_encoder *encoder) }
struct vc4_crtc_data { - /* Depth of the PixelValve FIFO in bytes */ - unsigned int fifo_depth; - /* Which channels of the HVS can the output source from */ unsigned int hvs_available_channels;
/* Which output of the HVS this pixelvalve sources from. */ int hvs_output; +}; + +struct vc4_pv_data { + struct vc4_crtc_data base; + + /* Depth of the PixelValve FIFO in bytes */ + unsigned int fifo_depth;
/* Number of pixels output per clock period */ u8 pixels_per_clock;
enum vc4_encoder_type encoder_types[4]; const char *debugfs_name; + };
struct vc4_crtc { @@ -498,6 +503,20 @@ to_vc4_crtc(struct drm_crtc *crtc) return (struct vc4_crtc *)crtc; }
+static inline const struct vc4_crtc_data * +vc4_crtc_to_vc4_crtc_data(const struct vc4_crtc *crtc) +{ + return crtc->data; +} + +static inline const struct vc4_pv_data * +vc4_crtc_to_vc4_pv_data(const struct vc4_crtc *crtc) +{ + const struct vc4_crtc_data *data = vc4_crtc_to_vc4_crtc_data(crtc); + + return container_of(data, struct vc4_pv_data, base); +} + struct vc4_crtc_state { struct drm_crtc_state base; /* Dlist area for this CRTC configuration. */