Commit 8ebb2cf0 authored by Maxime Ripard's avatar Maxime Ripard

drm/vc4: crtc: Rename HVS channel to output

In vc5, the HVS has 6 outputs and 3 FIFOs (or channels), with
pixelvalves each being assigned to a given output, but each output can
then be muxed to feed from multiple FIFOs.

Since vc4 had that entirely static, both were probably equivalent, but
since that changes, let's rename hvs_channel to hvs_output in the
vc4_crtc_data, since a pixelvalve is really connected to an output, and
not to a FIFO.
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Tested-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Tested-by: default avatarHoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b7618bb17b1c435c5d6ce50bcde2fe9243281d02.1599120059.git-series.maxime@cerno.tech
parent 78cbcc38
...@@ -775,7 +775,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { ...@@ -775,7 +775,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
static const struct vc4_pv_data bcm2835_pv0_data = { static const struct vc4_pv_data bcm2835_pv0_data = {
.base = { .base = {
.hvs_channel = 0, .hvs_output = 0,
}, },
.debugfs_name = "crtc0_regs", .debugfs_name = "crtc0_regs",
.pixels_per_clock = 1, .pixels_per_clock = 1,
...@@ -787,7 +787,7 @@ static const struct vc4_pv_data bcm2835_pv0_data = { ...@@ -787,7 +787,7 @@ static const struct vc4_pv_data bcm2835_pv0_data = {
static const struct vc4_pv_data bcm2835_pv1_data = { static const struct vc4_pv_data bcm2835_pv1_data = {
.base = { .base = {
.hvs_channel = 2, .hvs_output = 2,
}, },
.debugfs_name = "crtc1_regs", .debugfs_name = "crtc1_regs",
.pixels_per_clock = 1, .pixels_per_clock = 1,
...@@ -799,7 +799,7 @@ static const struct vc4_pv_data bcm2835_pv1_data = { ...@@ -799,7 +799,7 @@ static const struct vc4_pv_data bcm2835_pv1_data = {
static const struct vc4_pv_data bcm2835_pv2_data = { static const struct vc4_pv_data bcm2835_pv2_data = {
.base = { .base = {
.hvs_channel = 1, .hvs_output = 1,
}, },
.debugfs_name = "crtc2_regs", .debugfs_name = "crtc2_regs",
.pixels_per_clock = 1, .pixels_per_clock = 1,
...@@ -862,7 +862,7 @@ int vc4_crtc_init(struct drm_device *drm, struct vc4_crtc *vc4_crtc, ...@@ -862,7 +862,7 @@ int vc4_crtc_init(struct drm_device *drm, struct vc4_crtc *vc4_crtc,
drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL, drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL,
crtc_funcs, NULL); crtc_funcs, NULL);
drm_crtc_helper_add(crtc, crtc_helper_funcs); drm_crtc_helper_add(crtc, crtc_helper_funcs);
vc4_crtc->channel = vc4_crtc->data->hvs_channel; vc4_crtc->channel = vc4_crtc->data->hvs_output;
drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r)); drm_mode_crtc_set_gamma_size(crtc, ARRAY_SIZE(vc4_crtc->lut_r));
drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size); drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
......
...@@ -447,8 +447,8 @@ to_vc4_encoder(struct drm_encoder *encoder) ...@@ -447,8 +447,8 @@ to_vc4_encoder(struct drm_encoder *encoder)
} }
struct vc4_crtc_data { struct vc4_crtc_data {
/* Which channel of the HVS this pixelvalve sources from. */ /* Which output of the HVS this pixelvalve sources from. */
int hvs_channel; int hvs_output;
}; };
struct vc4_pv_data { struct vc4_pv_data {
......
...@@ -419,7 +419,7 @@ void vc4_hvs_mode_set_nofb(struct drm_crtc *crtc) ...@@ -419,7 +419,7 @@ void vc4_hvs_mode_set_nofb(struct drm_crtc *crtc)
struct drm_display_mode *mode = &crtc->state->adjusted_mode; struct drm_display_mode *mode = &crtc->state->adjusted_mode;
bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE; bool interlace = mode->flags & DRM_MODE_FLAG_INTERLACE;
if (vc4_crtc->data->hvs_channel == 2) { if (vc4_crtc->data->hvs_output == 2) {
u32 dispctrl; u32 dispctrl;
u32 dsp3_mux; u32 dsp3_mux;
......
...@@ -452,7 +452,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data) ...@@ -452,7 +452,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data)
} }
static const struct vc4_crtc_data vc4_txp_crtc_data = { static const struct vc4_crtc_data vc4_txp_crtc_data = {
.hvs_channel = 2, .hvs_output = 2,
}; };
static int vc4_txp_bind(struct device *dev, struct device *master, void *data) static int vc4_txp_bind(struct device *dev, struct device *master, void *data)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment