Hi Geert,
Thank you for the patch.
On Thu, Jun 22, 2023 at 11:21:34AM +0200, Geert Uytterhoeven wrote:
> Replace the custom shmob_drm_interface enumeration values with standard
> media bus formats. This simplifies driver handling of bus formats and
> prepares for DT support.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 52 +++++++++++++------
> include/linux/platform_data/shmob_drm.h | 13 +----
> 2 files changed, 38 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
> index 1a1d66c6e817e227..e5be0ae99bd970be 100644
> --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
> +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
> @@ -9,6 +9,7 @@
>
> #include <linux/clk.h>
> #include <linux/io.h>
> +#include <linux/media-bus-format.h>
> #include <linux/mm.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> @@ -34,24 +35,45 @@
>
> static int shmob_drm_init_interface(struct shmob_drm_device *sdev)
> {
> - static const u32 ldmt1r[] = {
> - [SHMOB_DRM_IFACE_RGB8] = LDMT1R_MIFTYP_RGB8,
> - [SHMOB_DRM_IFACE_RGB9] = LDMT1R_MIFTYP_RGB9,
> - [SHMOB_DRM_IFACE_RGB12A] = LDMT1R_MIFTYP_RGB12A,
> - [SHMOB_DRM_IFACE_RGB12B] = LDMT1R_MIFTYP_RGB12B,
> - [SHMOB_DRM_IFACE_RGB16] = LDMT1R_MIFTYP_RGB16,
> - [SHMOB_DRM_IFACE_RGB18] = LDMT1R_MIFTYP_RGB18,
> - [SHMOB_DRM_IFACE_RGB24] = LDMT1R_MIFTYP_RGB24,
> - [SHMOB_DRM_IFACE_YUV422] = LDMT1R_MIFTYP_YCBCR,
> - };
> -
> - if (sdev->pdata->iface.interface >= ARRAY_SIZE(ldmt1r)) {
> - dev_err(sdev->dev, "invalid interface type %u\n",
> - sdev->pdata->iface.interface);
> + switch (sdev->pdata->iface.bus_fmt) {
> + case MEDIA_BUS_FMT_RGB888_3X8:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB8;
> + break;
> +
> + case MEDIA_BUS_FMT_RGB666_2X9_BE:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB9;
> + break;
> +
> + case MEDIA_BUS_FMT_RGB888_2X12_BE:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB12A;
> + break;
> +
> + case MEDIA_BUS_FMT_RGB444_1X12:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB12B;
> + break;
> +
> + case MEDIA_BUS_FMT_RGB565_1X16:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB16;
> + break;
> +
> + case MEDIA_BUS_FMT_RGB666_1X18:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB18;
> + break;
> +
> + case MEDIA_BUS_FMT_RGB888_1X24:
> + sdev->ldmt1r = LDMT1R_MIFTYP_RGB24;
> + break;
> +
> + case MEDIA_BUS_FMT_UYVY8_1X16:
> + sdev->ldmt1r = LDMT1R_MIFTYP_YCBCR;
> + break;
> +
> + default:
> + dev_err(sdev->dev, "invalid bus format 0x%x\n",
> + sdev->pdata->iface.bus_fmt);
> return -EINVAL;
> }
>
> - sdev->ldmt1r = ldmt1r[sdev->pdata->iface.interface];
> return 0;
> }
>
> diff --git a/include/linux/platform_data/shmob_drm.h b/include/linux/platform_data/shmob_drm.h
> index f3cb19ff9f818aca..5047e66f0a6823ba 100644
> --- a/include/linux/platform_data/shmob_drm.h
> +++ b/include/linux/platform_data/shmob_drm.h
> @@ -18,17 +18,6 @@ enum shmob_drm_clk_source {
> SHMOB_DRM_CLK_EXTERNAL,
> };
>
> -enum shmob_drm_interface {
> - SHMOB_DRM_IFACE_RGB8, /* 24bpp, 8:8:8 */
> - SHMOB_DRM_IFACE_RGB9, /* 18bpp, 9:9 */
> - SHMOB_DRM_IFACE_RGB12A, /* 24bpp, 12:12 */
> - SHMOB_DRM_IFACE_RGB12B, /* 12bpp */
> - SHMOB_DRM_IFACE_RGB16, /* 16bpp */
> - SHMOB_DRM_IFACE_RGB18, /* 18bpp */
> - SHMOB_DRM_IFACE_RGB24, /* 24bpp */
> - SHMOB_DRM_IFACE_YUV422, /* 16bpp */
> -};
> -
> struct shmob_drm_panel_data {
> unsigned int width_mm; /* Panel width in mm */
> unsigned int height_mm; /* Panel height in mm */
> @@ -36,7 +25,7 @@ struct shmob_drm_panel_data {
> };
>
> struct shmob_drm_interface_data {
> - enum shmob_drm_interface interface;
> + unsigned int bus_fmt; /* MEDIA_BUS_FMT_RGB888_* */
> unsigned int clk_div;
> };
>
--
Regards,
Laurent Pinchart
