lkml.org 
[lkml]   [2017]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 12/23] drm/sun4i: sun8i: properly support UI channels
在 2017-10-17 17:06,Maxime Ripard 写道:
> The current code has the wrong macro to get the registers offsets of
> the
> UI-registers, with an off-by-0x1000 error.
>
> It works so far by accident, since the UI channel used everywhere else
> is
> the number of VI planes, which has always been 1 so far, and the offset
> between two UI channels is 0x1000.

No, I number the VI channels and UI channels in the same sequence, as
it's
also what Allwinner does -- VI channels and UI channels all have the
size
0x1000.

On H3/A64/A83T, the sequence is: 0 - VI, 1 - UI0(, 2 - UI1, 3 - UI2);
on V3s, the sequence is: 0 - VI0, 1 - VI1, 2 - UI.

This patch assumes that there's only one VI channel, which breaks V3s
support.

>
> Let's correct that behaviour by setting the UI chan number in the
> sun8i_ui
> structure, and remove the hardcoded values pretty much everywhere. Once
> we
> have sane values, we can convert the macros to their actual definition.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> drivers/gpu/drm/sun4i/sun8i_mixer.c | 50
> ++++++++++++------------------
> drivers/gpu/drm/sun4i/sun8i_mixer.h | 32 ++++++++++---------
> drivers/gpu/drm/sun4i/sun8i_ui.c | 12 ++++---
> drivers/gpu/drm/sun4i/sun8i_ui.h | 1 +-
> 4 files changed, 46 insertions(+), 49 deletions(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c
> b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> index 1955b2a36ac5..5afe8ef709a5 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> @@ -37,14 +37,12 @@ static void sun8i_mixer_commit(struct sunxi_engine
> *engine)
> SUN8I_MIXER_GLOBAL_DBUFF_ENABLE);
> }
>
> -void sun8i_mixer_layer_enable(struct sun8i_mixer *mixer,
> - int layer, bool enable)
> +void sun8i_mixer_layer_enable(struct sun8i_mixer *mixer, struct
> sun8i_ui *ui,
> + bool enable)
> {
> u32 val;
> - /* Currently the first UI channel is used */
> - int chan = mixer->cfg->vi_num;
>
> - DRM_DEBUG_DRIVER("Enabling layer %d in channel %d\n", layer, chan);
> + DRM_DEBUG_DRIVER("Enabling layer %d in channel %d\n", ui->id,
> ui->chan);
>
> if (enable)
> val = SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN;
> @@ -52,16 +50,16 @@ void sun8i_mixer_layer_enable(struct sun8i_mixer
> *mixer,
> val = 0;
>
> regmap_update_bits(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_ATTR(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ui->chan, ui->id),
> SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN, val);
>
> /* Set the alpha configuration */
> regmap_update_bits(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_ATTR(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ui->chan, ui->id),
> SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_MASK,
> SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_DEF);
> regmap_update_bits(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_ATTR(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ui->chan, ui->id),
> SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MASK,
> SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_DEF);
> }
> @@ -90,14 +88,13 @@ static int sun8i_mixer_drm_format_to_layer(struct
> drm_plane *plane,
> }
>
> int sun8i_mixer_update_layer_coord(struct sun8i_mixer *mixer,
> - int layer, struct drm_plane *plane)
> + struct sun8i_ui *ui)
> {
> + struct drm_plane *plane = &ui->plane;
> struct drm_plane_state *state = plane->state;
> struct drm_framebuffer *fb = state->fb;
> - /* Currently the first UI channel is used */
> - int chan = mixer->cfg->vi_num;
>
> - DRM_DEBUG_DRIVER("Updating layer %d\n", layer);
> + DRM_DEBUG_DRIVER("Updating layer %d\n", ui->id);
>
> if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
> DRM_DEBUG_DRIVER("Primary layer, updating global size W: %u H:
> %u\n",
> @@ -115,7 +112,7 @@ int sun8i_mixer_update_layer_coord(struct
> sun8i_mixer *mixer,
> state->crtc_h));
> DRM_DEBUG_DRIVER("Updating channel size\n");
> regmap_write(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_OVL_SIZE(chan),
> + SUN8I_MIXER_CHAN_UI_OVL_SIZE(ui->chan),
> SUN8I_MIXER_SIZE(state->crtc_w,
> state->crtc_h));
> }
> @@ -123,35 +120,34 @@ int sun8i_mixer_update_layer_coord(struct
> sun8i_mixer *mixer,
> /* Set the line width */
> DRM_DEBUG_DRIVER("Layer line width: %d bytes\n", fb->pitches[0]);
> regmap_write(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_PITCH(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_PITCH(ui->chan, ui->id),
> fb->pitches[0]);
>
> /* Set height and width */
> DRM_DEBUG_DRIVER("Layer size W: %u H: %u\n",
> state->crtc_w, state->crtc_h);
> regmap_write(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_SIZE(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_SIZE(ui->chan, ui->id),
> SUN8I_MIXER_SIZE(state->crtc_w, state->crtc_h));
>
> /* Set base coordinates */
> DRM_DEBUG_DRIVER("Layer coordinates X: %d Y: %d\n",
> state->crtc_x, state->crtc_y);
> regmap_write(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_COORD(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_COORD(ui->chan, ui->id),
> SUN8I_MIXER_COORD(state->crtc_x, state->crtc_y));
>
> return 0;
> }
>
> int sun8i_mixer_update_layer_formats(struct sun8i_mixer *mixer,
> - int layer, struct drm_plane *plane)
> + struct sun8i_ui *ui)
> {
> + struct drm_plane *plane = &ui->plane;
> struct drm_plane_state *state = plane->state;
> struct drm_framebuffer *fb = state->fb;
> bool interlaced = false;
> u32 val;
> - /* Currently the first UI channel is used */
> - int chan = mixer->cfg->vi_num;
> int ret;
>
> if (plane->state->crtc)
> @@ -174,21 +170,20 @@ int sun8i_mixer_update_layer_formats(struct
> sun8i_mixer *mixer,
> }
>
> regmap_update_bits(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_ATTR(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ui->chan, ui->id),
> SUN8I_MIXER_CHAN_UI_LAYER_ATTR_FBFMT_MASK, val);
>
> return 0;
> }
>
> int sun8i_mixer_update_layer_buffer(struct sun8i_mixer *mixer,
> - int layer, struct drm_plane *plane)
> + struct sun8i_ui *ui)
> {
> + struct drm_plane *plane = &ui->plane;
> struct drm_plane_state *state = plane->state;
> struct drm_framebuffer *fb = state->fb;
> struct drm_gem_cma_object *gem;
> dma_addr_t paddr;
> - /* Currently the first UI channel is used */
> - int chan = mixer->cfg->vi_num;
> int bpp;
>
> /* Get the physical address of the buffer in memory */
> @@ -220,7 +215,7 @@ int sun8i_mixer_update_layer_buffer(struct
> sun8i_mixer *mixer,
> DRM_DEBUG_DRIVER("Setting buffer address to %pad\n", &paddr);
>
> regmap_write(mixer->engine.regs,
> - SUN8I_MIXER_CHAN_UI_LAYER_TOP_LADDR(chan, layer),
> + SUN8I_MIXER_CHAN_UI_LAYER_TOP_LADDR(ui->chan, ui->id),
> lower_32_bits(paddr));
>
> return 0;
> @@ -342,11 +337,8 @@ static int sun8i_mixer_bind(struct device *dev,
> struct device *master,
> SUN8I_MIXER_BLEND_ATTR_FCOLOR_DEF);
>
> /* Select the first UI channel */
> - DRM_DEBUG_DRIVER("Selecting channel %d (first UI channel)\n",
> - mixer->cfg->vi_num);
> - regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ROUTE,
> - mixer->cfg->vi_num);
> -
> + DRM_DEBUG_DRIVER("Selecting channel %d (first UI channel)\n", 1);
> + regmap_write(mixer->engine.regs, SUN8I_MIXER_BLEND_ROUTE, 1);
> return 0;
>
> err_disable_bus_clk:
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h
> b/drivers/gpu/drm/sun4i/sun8i_mixer.h
> index 4785ac090b8c..20d2ee1c4187 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
> @@ -61,22 +61,22 @@
> */
>
> #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0x0)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0x0)
> #define SUN8I_MIXER_CHAN_UI_LAYER_SIZE(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0x4)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0x4)
> #define SUN8I_MIXER_CHAN_UI_LAYER_COORD(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0x8)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0x8)
> #define SUN8I_MIXER_CHAN_UI_LAYER_PITCH(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0xc)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0xc)
> #define SUN8I_MIXER_CHAN_UI_LAYER_TOP_LADDR(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0x10)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0x10)
> #define SUN8I_MIXER_CHAN_UI_LAYER_BOT_LADDR(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0x14)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0x14)
> #define SUN8I_MIXER_CHAN_UI_LAYER_FCOLOR(ch, layer) \
> - (0x2000 + 0x1000 * (ch) + 0x20 * (layer) + 0x18)
> -#define SUN8I_MIXER_CHAN_UI_TOP_HADDR(ch) (0x2000 + 0x1000 * (ch) +
> 0x80)
> -#define SUN8I_MIXER_CHAN_UI_BOT_HADDR(ch) (0x2000 + 0x1000 * (ch) +
> 0x84)
> -#define SUN8I_MIXER_CHAN_UI_OVL_SIZE(ch) (0x2000 + 0x1000 * (ch) +
> 0x88)
> + (0x3000 + 0x1000 * (ch) + 0x20 * (layer) + 0x18)
> +#define SUN8I_MIXER_CHAN_UI_TOP_HADDR(ch) (0x3000 + 0x1000 * (ch) +
> 0x80)
> +#define SUN8I_MIXER_CHAN_UI_BOT_HADDR(ch) (0x3000 + 0x1000 * (ch) +
> 0x84)
> +#define SUN8I_MIXER_CHAN_UI_OVL_SIZE(ch) (0x3000 + 0x1000 * (ch) +
> 0x88)
>
> #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_EN BIT(0)
> #define SUN8I_MIXER_CHAN_UI_LAYER_ATTR_ALPHA_MODE_MASK GENMASK(2, 1)
> @@ -104,6 +104,8 @@
> #define SUN8I_MIXER_FCC_EN 0xaa000
> #define SUN8I_MIXER_DCSC_EN 0xb0000
>
> +struct sun8i_ui;
> +
> struct sun8i_mixer_cfg {
> int vi_num;
> int ui_num;
> @@ -126,12 +128,12 @@ engine_to_sun8i_mixer(struct sunxi_engine
> *engine)
> return container_of(engine, struct sun8i_mixer, engine);
> }
>
> -void sun8i_mixer_layer_enable(struct sun8i_mixer *mixer,
> - int layer, bool enable);
> +void sun8i_mixer_layer_enable(struct sun8i_mixer *mixer, struct
> sun8i_ui *ui,
> + bool enable);
> int sun8i_mixer_update_layer_coord(struct sun8i_mixer *mixer,
> - int layer, struct drm_plane *plane);
> + struct sun8i_ui *ui);
> int sun8i_mixer_update_layer_formats(struct sun8i_mixer *mixer,
> - int layer, struct drm_plane *plane);
> + struct sun8i_ui *ui);
> int sun8i_mixer_update_layer_buffer(struct sun8i_mixer *mixer,
> - int layer, struct drm_plane *plane);
> + struct sun8i_ui *ui);
> #endif /* _SUN8I_MIXER_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun8i_ui.c
> b/drivers/gpu/drm/sun4i/sun8i_ui.c
> index 077099ef565a..a056bb0c63c7 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_ui.c
> +++ b/drivers/gpu/drm/sun4i/sun8i_ui.c
> @@ -32,7 +32,7 @@ static void sun8i_mixer_ui_atomic_disable(struct
> drm_plane *plane,
> struct sun8i_ui *ui = plane_to_sun8i_ui(plane);
> struct sun8i_mixer *mixer = ui->mixer;
>
> - sun8i_mixer_layer_enable(mixer, ui->id, false);
> + sun8i_mixer_layer_enable(mixer, ui, false);
> }
>
> static void sun8i_mixer_ui_atomic_update(struct drm_plane *plane,
> @@ -41,10 +41,10 @@ static void sun8i_mixer_ui_atomic_update(struct
> drm_plane *plane,
> struct sun8i_ui *ui = plane_to_sun8i_ui(plane);
> struct sun8i_mixer *mixer = ui->mixer;
>
> - sun8i_mixer_update_layer_coord(mixer, ui->id, plane);
> - sun8i_mixer_update_layer_formats(mixer, ui->id, plane);
> - sun8i_mixer_update_layer_buffer(mixer, ui->id, plane);
> - sun8i_mixer_layer_enable(mixer, ui->id, true);
> + sun8i_mixer_update_layer_coord(mixer, ui);
> + sun8i_mixer_update_layer_formats(mixer, ui);
> + sun8i_mixer_update_layer_buffer(mixer, ui);
> + sun8i_mixer_layer_enable(mixer, ui, true);
> }
>
> static struct drm_plane_helper_funcs sun8i_mixer_ui_helper_funcs = {
> @@ -126,6 +126,8 @@ struct drm_plane **sun8i_ui_init(struct drm_device
> *drm,
> return ERR_CAST(ui);
> };
>
> + /* TODO: Support several UI channels */
> + ui->chan = 0;
> ui->id = i;
> planes[i] = &ui->plane;
> };
> diff --git a/drivers/gpu/drm/sun4i/sun8i_ui.h
> b/drivers/gpu/drm/sun4i/sun8i_ui.h
> index 17dfc92ccc9f..3c3185878ad1 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_ui.h
> +++ b/drivers/gpu/drm/sun4i/sun8i_ui.h
> @@ -22,6 +22,7 @@ struct sun8i_ui {
> struct drm_plane plane;
> struct sun4i_drv *drv;
> struct sun8i_mixer *mixer;
> + u8 chan;
> int id;
> };

\
 
 \ /
  Last update: 2017-10-17 14:18    [W:0.244 / U:0.036 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site