Dne nedelja, 16. februar 2025 ob 19:36:08 Srednjeevropski standardni čas je Ryan Walklin napisal(a):
> From: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
>
> The mixer in the DE3 display engine supports YUV 8 and 10 bit
> formats in addition to 8-bit RGB. Add the required register
> configuration and format enumeration callback functions to the mixer,
> and store the in-use output format (defaulting to RGB) and color
> encoding in the mixer configuration.
>
> Signed-off-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
> Signed-off-by: Ryan Walklin <ryan@xxxxxxxxxxxxx>
>
> ---
> Changelog v4..v5:
> - Remove trailing whitespace
>
> Changelog v5..v6:
> - Move color format and encoding flags to mixer and add struct.
> ---
> drivers/gpu/drm/sun4i/sun8i_mixer.c | 54 +++++++++++++++++++++++++++--
> drivers/gpu/drm/sun4i/sun8i_mixer.h | 11 ++++++
> 2 files changed, 62 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> index a170f68708b1f..bc934186bfd6f 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
> @@ -23,7 +23,10 @@
> #include <drm/drm_gem_dma_helper.h>
> #include <drm/drm_probe_helper.h>
>
> +#include <uapi/linux/media-bus-format.h>
> +
> #include "sun4i_drv.h"
> +#include "sun50i_fmt.h"
> #include "sun8i_mixer.h"
> #include "sun8i_ui_layer.h"
> #include "sun8i_vi_layer.h"
> @@ -390,12 +393,52 @@ static void sun8i_mixer_mode_set(struct sunxi_engine *engine,
>
> DRM_DEBUG_DRIVER("Switching display mixer interlaced mode %s\n",
> interlaced ? "on" : "off");
> +
> + if (mixer->color_model.format == MEDIA_BUS_FMT_RGB888_1X24)
> + val = SUN8I_MIXER_BLEND_COLOR_BLACK;
> + else
> + val = 0xff108080;
> +
> + regmap_write(mixer->engine.regs,
> + SUN8I_MIXER_BLEND_BKCOLOR(bld_base), val);
> + regmap_write(mixer->engine.regs,
> + SUN8I_MIXER_BLEND_ATTR_FCOLOR(bld_base, 0), val);
> +
> + if (mixer->cfg->has_formatter)
> + sun50i_fmt_setup(mixer, mode->hdisplay,
> + mode->vdisplay, mixer->color_model.format);
> +}
> +
> +static u32 *sun8i_mixer_get_supported_fmts(struct sunxi_engine *engine, u32 *num)
> +{
> + struct sun8i_mixer *mixer = engine_to_sun8i_mixer(engine);
> + u32 *formats, count;
> +
> + count = 0;
> +
> + formats = kcalloc(5, sizeof(*formats), GFP_KERNEL);
> + if (!formats)
> + return NULL;
> +
> + if (mixer->cfg->has_formatter) {
> + formats[count++] = MEDIA_BUS_FMT_UYYVYY10_0_5X30;
> + formats[count++] = MEDIA_BUS_FMT_YUV8_1X24;
> + formats[count++] = MEDIA_BUS_FMT_UYVY8_1X16;
> + formats[count++] = MEDIA_BUS_FMT_UYYVYY8_0_5X24;
> + }
> +
> + formats[count++] = MEDIA_BUS_FMT_RGB888_1X24;
> +
> + *num = count;
> +
> + return formats;
> }
>
> static const struct sunxi_engine_ops sun8i_engine_ops = {
> - .commit = sun8i_mixer_commit,
> - .layers_init = sun8i_layers_init,
> - .mode_set = sun8i_mixer_mode_set,
> + .commit = sun8i_mixer_commit,
> + .layers_init = sun8i_layers_init,
> + .mode_set = sun8i_mixer_mode_set,
> + .get_supported_fmts = sun8i_mixer_get_supported_fmts,
> };
>
> static const struct regmap_config sun8i_mixer_regmap_config = {
> @@ -484,6 +527,11 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
> if (!mixer->cfg)
> return -EINVAL;
>
> + /* default output format, supported by all mixers */
> + mixer->color_model.format = MEDIA_BUS_FMT_RGB888_1X24;
> + /* default color encoding, ignored with RGB I/O */
> + mixer->color_model.encoding = DRM_COLOR_YCBCR_BT601;
> +
> regs = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(regs))
> return PTR_ERR(regs);
> diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
> index 8417b8fef2e1f..5f465a974fbdf 100644
> --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
> +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
> @@ -9,6 +9,7 @@
> #include <linux/clk.h>
> #include <linux/regmap.h>
> #include <linux/reset.h>
> +#include <drm/drm_color_mgmt.h>
> #include <drm/drm_plane.h>
>
> #include "sunxi_engine.h"
> @@ -177,6 +178,11 @@ struct sun8i_mixer_cfg {
> unsigned int scanline_yuv;
> };
>
> +struct sun8i_color_model {
> + u32 format;
> + enum drm_color_encoding encoding;
> +};
> +
> struct sun8i_mixer {
> struct sunxi_engine engine;
>
> @@ -186,6 +192,11 @@ struct sun8i_mixer {
>
> struct clk *bus_clk;
> struct clk *mod_clk;
> +
> + struct regmap *top_regs;
> + struct regmap *disp_regs;
This chunk is DE33 specific and should go in patch 24.
Best regards,
Jernej
> +
> + struct sun8i_color_model color_model;
> };
>
> enum {
>
