diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2023-09-15 11:53:39 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2023-10-16 12:47:46 +0300 |
| commit | fa32c6bc92813a76419d1c306e35394cae5028eb (patch) | |
| tree | 3a59d69155ce1db8d10f6179930ad3b17797d18e /drivers/gpu/drm/renesas | |
| parent | 6a6ab0c7162b4b10ce74347e282e1bc81103a48f (diff) | |
| download | linux-fa32c6bc92813a76419d1c306e35394cae5028eb.tar.xz | |
drm: renesas: shmobile: Use media bus formats in platform data
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@glider.be>
Link: https://lore.kernel.org/r/0a15e5100ca30d14953c93550eb1d4c2e18de939.1694767209.git.geert+renesas@glider.be
Diffstat (limited to 'drivers/gpu/drm/renesas')
| -rw-r--r-- | drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 7e5977d3e256..db4d081fa3d9 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,25 +35,31 @@ 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, + static const struct { + u32 fmt; + u32 ldmt1r; + } bus_fmts[] = { + { MEDIA_BUS_FMT_RGB888_3X8, LDMT1R_MIFTYP_RGB8 }, + { MEDIA_BUS_FMT_RGB666_2X9_BE, LDMT1R_MIFTYP_RGB9 }, + { MEDIA_BUS_FMT_RGB888_2X12_BE, LDMT1R_MIFTYP_RGB12A }, + { MEDIA_BUS_FMT_RGB444_1X12, LDMT1R_MIFTYP_RGB12B }, + { MEDIA_BUS_FMT_RGB565_1X16, LDMT1R_MIFTYP_RGB16 }, + { MEDIA_BUS_FMT_RGB666_1X18, LDMT1R_MIFTYP_RGB18 }, + { MEDIA_BUS_FMT_RGB888_1X24, LDMT1R_MIFTYP_RGB24 }, + { MEDIA_BUS_FMT_UYVY8_1X16, LDMT1R_MIFTYP_YCBCR }, }; + unsigned int i; - if (sdev->pdata->iface.interface >= ARRAY_SIZE(ldmt1r)) { - dev_err(sdev->dev, "invalid interface type %u\n", - sdev->pdata->iface.interface); - return -EINVAL; + for (i = 0; i < ARRAY_SIZE(bus_fmts); i++) { + if (bus_fmts[i].fmt == sdev->pdata->iface.bus_fmt) { + sdev->ldmt1r = bus_fmts[i].ldmt1r; + return 0; + } } - sdev->ldmt1r = ldmt1r[sdev->pdata->iface.interface]; - return 0; + dev_err(sdev->dev, "unsupported bus format 0x%x\n", + sdev->pdata->iface.bus_fmt); + return -EINVAL; } static int shmob_drm_setup_clocks(struct shmob_drm_device *sdev, |