From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Thomas Zimmermann <tzimmermann@suse.de>, Magnus Damm <magnus.damm@gmail.com>, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 10/39] drm: renesas: shmobile: Improve shmob_drm_format_info table Date: Fri, 23 Jun 2023 18:30:47 +0300 [thread overview] Message-ID: <20230623153047.GO2112@pendragon.ideasonboard.com> (raw) In-Reply-To: <a61c89c6e1514ab915ce0842470582e121612688.1687423204.git.geert+renesas@glider.be> Hi Geert, Thank you for the patch. On Thu, Jun 22, 2023 at 11:21:22AM +0200, Geert Uytterhoeven wrote: > Improve the table containing hardware information related to the > supported plane formats: > 1. Move (part of) the overlay format register settings from multiple > switch() statements spread across the code into the table, like is > already done for the primary plane register settings, > 2. Remove the .yuv field, as that information can easily be extracted > from the register settings using a new helper macro, > 3. Shrink and move the .bpp field to reduce table size. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 29 ++-------- > .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 42 ++++++++++---- > .../gpu/drm/renesas/shmobile/shmob_drm_kms.h | 9 ++- > .../drm/renesas/shmobile/shmob_drm_plane.c | 56 ++----------------- > 4 files changed, 47 insertions(+), 89 deletions(-) I like this :-) Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > index cd492806105e5b5d..9bfdfa7c6e2b1001 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > @@ -221,31 +221,12 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) > lcdc_write(sdev, LDDFR, format->lddfr | LDDFR_CF1); > lcdc_write(sdev, LDMLSR, scrtc->line_size); > lcdc_write(sdev, LDSA1R, scrtc->dma[0]); > - if (format->yuv) > + if (shmob_drm_format_is_yuv(format)) > lcdc_write(sdev, LDSA2R, scrtc->dma[1]); > lcdc_write(sdev, LDSM1R, 0); > > /* Word and long word swap. */ > - switch (format->fourcc) { > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_NV21: > - case DRM_FORMAT_NV61: > - case DRM_FORMAT_NV42: > - value = LDDDSR_LS | LDDDSR_WS; > - break; > - case DRM_FORMAT_RGB888: > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV24: > - value = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS; > - break; > - case DRM_FORMAT_ARGB8888: > - case DRM_FORMAT_XRGB8888: > - default: > - value = LDDDSR_LS; > - break; > - } > - lcdc_write(sdev, LDDDSR, value); > + lcdc_write(sdev, LDDDSR, format->ldddsr); > > /* Setup planes. */ > drm_for_each_legacy_plane(plane, dev) { > @@ -304,12 +285,12 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, > struct drm_gem_dma_object *gem; > unsigned int bpp; > > - bpp = scrtc->format->yuv ? 8 : scrtc->format->bpp; > + bpp = shmob_drm_format_is_yuv(scrtc->format) ? 8 : scrtc->format->bpp; > gem = drm_fb_dma_get_gem_obj(fb, 0); > scrtc->dma[0] = gem->dma_addr + fb->offsets[0] > + y * fb->pitches[0] + x * bpp / 8; > > - if (scrtc->format->yuv) { > + if (shmob_drm_format_is_yuv(scrtc->format)) { > bpp = scrtc->format->bpp - 8; > gem = drm_fb_dma_get_gem_obj(fb, 1); > scrtc->dma[1] = gem->dma_addr + fb->offsets[1] > @@ -326,7 +307,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc) > shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y); > > lcdc_write_mirror(sdev, LDSA1R, scrtc->dma[0]); > - if (scrtc->format->yuv) > + if (shmob_drm_format_is_yuv(scrtc->format)) > lcdc_write_mirror(sdev, LDSA2R, scrtc->dma[1]); > > lcdc_write(sdev, LDRCNTR, lcdc_read(sdev, LDRCNTR) ^ LDRCNTR_MRS); > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c > index 99381cc0abf3ae1f..8fd360149743f8e2 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c > @@ -27,53 +27,73 @@ static const struct shmob_drm_format_info shmob_drm_format_infos[] = { > { > .fourcc = DRM_FORMAT_RGB565, > .bpp = 16, > - .yuv = false, > .lddfr = LDDFR_PKF_RGB16, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_RY | LDBBSIFR_RPKF_RGB16, > }, { > .fourcc = DRM_FORMAT_RGB888, > .bpp = 24, > - .yuv = false, > .lddfr = LDDFR_PKF_RGB24, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_RY | LDBBSIFR_RPKF_RGB24, > }, { > .fourcc = DRM_FORMAT_ARGB8888, > .bpp = 32, > - .yuv = false, > .lddfr = LDDFR_PKF_ARGB32, > + .ldddsr = LDDDSR_LS, > + .ldbbsifr = LDBBSIFR_AL_PK | LDBBSIFR_SWPL | LDBBSIFR_RY | > + LDBBSIFR_RPKF_ARGB32, > }, { > .fourcc = DRM_FORMAT_XRGB8888, > .bpp = 32, > - .yuv = false, > .lddfr = LDDFR_PKF_ARGB32, > + .ldddsr = LDDDSR_LS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_RY | > + LDBBSIFR_RPKF_ARGB32, > }, { > .fourcc = DRM_FORMAT_NV12, > .bpp = 12, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_420, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_CHRR_420, > }, { > .fourcc = DRM_FORMAT_NV21, > .bpp = 12, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_420, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_CHRR_420, > }, { > .fourcc = DRM_FORMAT_NV16, > .bpp = 16, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_422, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_CHRR_422, > }, { > .fourcc = DRM_FORMAT_NV61, > .bpp = 16, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_422, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_CHRR_422, > }, { > .fourcc = DRM_FORMAT_NV24, > .bpp = 24, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_444, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_CHRR_444, > }, { > .fourcc = DRM_FORMAT_NV42, > .bpp = 24, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_444, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_CHRR_444, > }, > }; > > @@ -112,7 +132,7 @@ shmob_drm_fb_create(struct drm_device *dev, struct drm_file *file_priv, > return ERR_PTR(-EINVAL); > } > > - if (format->yuv) { > + if (shmob_drm_format_is_yuv(format)) { > unsigned int chroma_cpp = format->bpp == 24 ? 2 : 1; > > if (mode_cmd->pitches[1] != mode_cmd->pitches[0] * chroma_cpp) { > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h > index 0347b1fd2338a84d..590162c3db20209d 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h > @@ -17,11 +17,14 @@ struct shmob_drm_device; > > struct shmob_drm_format_info { > u32 fourcc; > - unsigned int bpp; > - bool yuv; > - u32 lddfr; > + u32 lddfr; /* LCD Data Format Register */ > + u16 ldbbsifr; /* CHn Source Image Format Register low bits */ > + u8 ldddsr; /* LCDC Input Image Data Swap Register low bits */ > + u8 bpp; > }; > > +#define shmob_drm_format_is_yuv(format) ((format)->lddfr & LDDFR_CC) > + > const struct shmob_drm_format_info *shmob_drm_format_info(u32 fourcc); > > int shmob_drm_modeset_init(struct shmob_drm_device *sdev); > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c > index 36fedb2b74c8b7a2..0b2ab153e9ae76df 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c > @@ -43,12 +43,12 @@ static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane, > struct drm_gem_dma_object *gem; > unsigned int bpp; > > - bpp = splane->format->yuv ? 8 : splane->format->bpp; > + bpp = shmob_drm_format_is_yuv(splane->format) ? 8 : splane->format->bpp; > gem = drm_fb_dma_get_gem_obj(fb, 0); > splane->dma[0] = gem->dma_addr + fb->offsets[0] > + y * fb->pitches[0] + x * bpp / 8; > > - if (splane->format->yuv) { > + if (shmob_drm_format_is_yuv(splane->format)) { > bpp = splane->format->bpp - 8; > gem = drm_fb_dma_get_gem_obj(fb, 1); > splane->dma[1] = gem->dma_addr + fb->offsets[1] > @@ -64,54 +64,8 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, > u32 format; > > /* TODO: Support ROP3 mode */ > - format = LDBBSIFR_EN | (splane->alpha << LDBBSIFR_LAY_SHIFT); > - > - switch (splane->format->fourcc) { > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_NV21: > - case DRM_FORMAT_NV61: > - case DRM_FORMAT_NV42: > - format |= LDBBSIFR_SWPL | LDBBSIFR_SWPW; > - break; > - case DRM_FORMAT_RGB888: > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV24: > - format |= LDBBSIFR_SWPL | LDBBSIFR_SWPW | LDBBSIFR_SWPB; > - break; > - case DRM_FORMAT_ARGB8888: > - case DRM_FORMAT_XRGB8888: > - default: > - format |= LDBBSIFR_SWPL; > - break; > - } > - > - switch (splane->format->fourcc) { > - case DRM_FORMAT_RGB565: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDBBSIFR_RPKF_RGB16; > - break; > - case DRM_FORMAT_RGB888: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDBBSIFR_RPKF_RGB24; > - break; > - case DRM_FORMAT_ARGB8888: > - format |= LDBBSIFR_AL_PK | LDBBSIFR_RY | LDBBSIFR_RPKF_ARGB32; > - break; > - case DRM_FORMAT_XRGB8888: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDBBSIFR_RPKF_ARGB32; > - break; > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV21: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_420; > - break; > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV61: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_422; > - break; > - case DRM_FORMAT_NV24: > - case DRM_FORMAT_NV42: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_444; > - break; > - } > + format = LDBBSIFR_EN | (splane->alpha << LDBBSIFR_LAY_SHIFT) | > + splane->format->ldbbsifr; > > #define plane_reg_dump(sdev, splane, reg) \ > dev_dbg(sdev->ddev->dev, "%s(%u): %s 0x%08x 0x%08x\n", __func__, \ > @@ -144,7 +98,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, > shmob_drm_plane_compute_base(splane, fb, splane->src_x, splane->src_y); > > lcdc_write(sdev, LDBnBSAYR(splane->index), splane->dma[0]); > - if (splane->format->yuv) > + if (shmob_drm_format_is_yuv(splane->format)) > lcdc_write(sdev, LDBnBSACR(splane->index), splane->dma[1]); > > lcdc_write(sdev, LDBCR, -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Magnus Damm <magnus.damm@gmail.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>, Thomas Zimmermann <tzimmermann@suse.de> Subject: Re: [PATCH 10/39] drm: renesas: shmobile: Improve shmob_drm_format_info table Date: Fri, 23 Jun 2023 18:30:47 +0300 [thread overview] Message-ID: <20230623153047.GO2112@pendragon.ideasonboard.com> (raw) In-Reply-To: <a61c89c6e1514ab915ce0842470582e121612688.1687423204.git.geert+renesas@glider.be> Hi Geert, Thank you for the patch. On Thu, Jun 22, 2023 at 11:21:22AM +0200, Geert Uytterhoeven wrote: > Improve the table containing hardware information related to the > supported plane formats: > 1. Move (part of) the overlay format register settings from multiple > switch() statements spread across the code into the table, like is > already done for the primary plane register settings, > 2. Remove the .yuv field, as that information can easily be extracted > from the register settings using a new helper macro, > 3. Shrink and move the .bpp field to reduce table size. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > .../gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 29 ++-------- > .../gpu/drm/renesas/shmobile/shmob_drm_kms.c | 42 ++++++++++---- > .../gpu/drm/renesas/shmobile/shmob_drm_kms.h | 9 ++- > .../drm/renesas/shmobile/shmob_drm_plane.c | 56 ++----------------- > 4 files changed, 47 insertions(+), 89 deletions(-) I like this :-) Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > index cd492806105e5b5d..9bfdfa7c6e2b1001 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > @@ -221,31 +221,12 @@ static void shmob_drm_crtc_start(struct shmob_drm_crtc *scrtc) > lcdc_write(sdev, LDDFR, format->lddfr | LDDFR_CF1); > lcdc_write(sdev, LDMLSR, scrtc->line_size); > lcdc_write(sdev, LDSA1R, scrtc->dma[0]); > - if (format->yuv) > + if (shmob_drm_format_is_yuv(format)) > lcdc_write(sdev, LDSA2R, scrtc->dma[1]); > lcdc_write(sdev, LDSM1R, 0); > > /* Word and long word swap. */ > - switch (format->fourcc) { > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_NV21: > - case DRM_FORMAT_NV61: > - case DRM_FORMAT_NV42: > - value = LDDDSR_LS | LDDDSR_WS; > - break; > - case DRM_FORMAT_RGB888: > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV24: > - value = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS; > - break; > - case DRM_FORMAT_ARGB8888: > - case DRM_FORMAT_XRGB8888: > - default: > - value = LDDDSR_LS; > - break; > - } > - lcdc_write(sdev, LDDDSR, value); > + lcdc_write(sdev, LDDDSR, format->ldddsr); > > /* Setup planes. */ > drm_for_each_legacy_plane(plane, dev) { > @@ -304,12 +285,12 @@ static void shmob_drm_crtc_compute_base(struct shmob_drm_crtc *scrtc, > struct drm_gem_dma_object *gem; > unsigned int bpp; > > - bpp = scrtc->format->yuv ? 8 : scrtc->format->bpp; > + bpp = shmob_drm_format_is_yuv(scrtc->format) ? 8 : scrtc->format->bpp; > gem = drm_fb_dma_get_gem_obj(fb, 0); > scrtc->dma[0] = gem->dma_addr + fb->offsets[0] > + y * fb->pitches[0] + x * bpp / 8; > > - if (scrtc->format->yuv) { > + if (shmob_drm_format_is_yuv(scrtc->format)) { > bpp = scrtc->format->bpp - 8; > gem = drm_fb_dma_get_gem_obj(fb, 1); > scrtc->dma[1] = gem->dma_addr + fb->offsets[1] > @@ -326,7 +307,7 @@ static void shmob_drm_crtc_update_base(struct shmob_drm_crtc *scrtc) > shmob_drm_crtc_compute_base(scrtc, crtc->x, crtc->y); > > lcdc_write_mirror(sdev, LDSA1R, scrtc->dma[0]); > - if (scrtc->format->yuv) > + if (shmob_drm_format_is_yuv(scrtc->format)) > lcdc_write_mirror(sdev, LDSA2R, scrtc->dma[1]); > > lcdc_write(sdev, LDRCNTR, lcdc_read(sdev, LDRCNTR) ^ LDRCNTR_MRS); > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c > index 99381cc0abf3ae1f..8fd360149743f8e2 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c > @@ -27,53 +27,73 @@ static const struct shmob_drm_format_info shmob_drm_format_infos[] = { > { > .fourcc = DRM_FORMAT_RGB565, > .bpp = 16, > - .yuv = false, > .lddfr = LDDFR_PKF_RGB16, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_RY | LDBBSIFR_RPKF_RGB16, > }, { > .fourcc = DRM_FORMAT_RGB888, > .bpp = 24, > - .yuv = false, > .lddfr = LDDFR_PKF_RGB24, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_RY | LDBBSIFR_RPKF_RGB24, > }, { > .fourcc = DRM_FORMAT_ARGB8888, > .bpp = 32, > - .yuv = false, > .lddfr = LDDFR_PKF_ARGB32, > + .ldddsr = LDDDSR_LS, > + .ldbbsifr = LDBBSIFR_AL_PK | LDBBSIFR_SWPL | LDBBSIFR_RY | > + LDBBSIFR_RPKF_ARGB32, > }, { > .fourcc = DRM_FORMAT_XRGB8888, > .bpp = 32, > - .yuv = false, > .lddfr = LDDFR_PKF_ARGB32, > + .ldddsr = LDDDSR_LS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_RY | > + LDBBSIFR_RPKF_ARGB32, > }, { > .fourcc = DRM_FORMAT_NV12, > .bpp = 12, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_420, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_CHRR_420, > }, { > .fourcc = DRM_FORMAT_NV21, > .bpp = 12, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_420, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_CHRR_420, > }, { > .fourcc = DRM_FORMAT_NV16, > .bpp = 16, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_422, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_CHRR_422, > }, { > .fourcc = DRM_FORMAT_NV61, > .bpp = 16, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_422, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_CHRR_422, > }, { > .fourcc = DRM_FORMAT_NV24, > .bpp = 24, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_444, > + .ldddsr = LDDDSR_LS | LDDDSR_WS | LDDDSR_BS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_SWPB | LDBBSIFR_CHRR_444, > }, { > .fourcc = DRM_FORMAT_NV42, > .bpp = 24, > - .yuv = true, > .lddfr = LDDFR_CC | LDDFR_YF_444, > + .ldddsr = LDDDSR_LS | LDDDSR_WS, > + .ldbbsifr = LDBBSIFR_AL_1 | LDBBSIFR_SWPL | LDBBSIFR_SWPW | > + LDBBSIFR_CHRR_444, > }, > }; > > @@ -112,7 +132,7 @@ shmob_drm_fb_create(struct drm_device *dev, struct drm_file *file_priv, > return ERR_PTR(-EINVAL); > } > > - if (format->yuv) { > + if (shmob_drm_format_is_yuv(format)) { > unsigned int chroma_cpp = format->bpp == 24 ? 2 : 1; > > if (mode_cmd->pitches[1] != mode_cmd->pitches[0] * chroma_cpp) { > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h > index 0347b1fd2338a84d..590162c3db20209d 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h > @@ -17,11 +17,14 @@ struct shmob_drm_device; > > struct shmob_drm_format_info { > u32 fourcc; > - unsigned int bpp; > - bool yuv; > - u32 lddfr; > + u32 lddfr; /* LCD Data Format Register */ > + u16 ldbbsifr; /* CHn Source Image Format Register low bits */ > + u8 ldddsr; /* LCDC Input Image Data Swap Register low bits */ > + u8 bpp; > }; > > +#define shmob_drm_format_is_yuv(format) ((format)->lddfr & LDDFR_CC) > + > const struct shmob_drm_format_info *shmob_drm_format_info(u32 fourcc); > > int shmob_drm_modeset_init(struct shmob_drm_device *sdev); > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c > index 36fedb2b74c8b7a2..0b2ab153e9ae76df 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c > @@ -43,12 +43,12 @@ static void shmob_drm_plane_compute_base(struct shmob_drm_plane *splane, > struct drm_gem_dma_object *gem; > unsigned int bpp; > > - bpp = splane->format->yuv ? 8 : splane->format->bpp; > + bpp = shmob_drm_format_is_yuv(splane->format) ? 8 : splane->format->bpp; > gem = drm_fb_dma_get_gem_obj(fb, 0); > splane->dma[0] = gem->dma_addr + fb->offsets[0] > + y * fb->pitches[0] + x * bpp / 8; > > - if (splane->format->yuv) { > + if (shmob_drm_format_is_yuv(splane->format)) { > bpp = splane->format->bpp - 8; > gem = drm_fb_dma_get_gem_obj(fb, 1); > splane->dma[1] = gem->dma_addr + fb->offsets[1] > @@ -64,54 +64,8 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, > u32 format; > > /* TODO: Support ROP3 mode */ > - format = LDBBSIFR_EN | (splane->alpha << LDBBSIFR_LAY_SHIFT); > - > - switch (splane->format->fourcc) { > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_NV21: > - case DRM_FORMAT_NV61: > - case DRM_FORMAT_NV42: > - format |= LDBBSIFR_SWPL | LDBBSIFR_SWPW; > - break; > - case DRM_FORMAT_RGB888: > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV24: > - format |= LDBBSIFR_SWPL | LDBBSIFR_SWPW | LDBBSIFR_SWPB; > - break; > - case DRM_FORMAT_ARGB8888: > - case DRM_FORMAT_XRGB8888: > - default: > - format |= LDBBSIFR_SWPL; > - break; > - } > - > - switch (splane->format->fourcc) { > - case DRM_FORMAT_RGB565: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDBBSIFR_RPKF_RGB16; > - break; > - case DRM_FORMAT_RGB888: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDBBSIFR_RPKF_RGB24; > - break; > - case DRM_FORMAT_ARGB8888: > - format |= LDBBSIFR_AL_PK | LDBBSIFR_RY | LDBBSIFR_RPKF_ARGB32; > - break; > - case DRM_FORMAT_XRGB8888: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_RY | LDBBSIFR_RPKF_ARGB32; > - break; > - case DRM_FORMAT_NV12: > - case DRM_FORMAT_NV21: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_420; > - break; > - case DRM_FORMAT_NV16: > - case DRM_FORMAT_NV61: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_422; > - break; > - case DRM_FORMAT_NV24: > - case DRM_FORMAT_NV42: > - format |= LDBBSIFR_AL_1 | LDBBSIFR_CHRR_444; > - break; > - } > + format = LDBBSIFR_EN | (splane->alpha << LDBBSIFR_LAY_SHIFT) | > + splane->format->ldbbsifr; > > #define plane_reg_dump(sdev, splane, reg) \ > dev_dbg(sdev->ddev->dev, "%s(%u): %s 0x%08x 0x%08x\n", __func__, \ > @@ -144,7 +98,7 @@ static void __shmob_drm_plane_setup(struct shmob_drm_plane *splane, > shmob_drm_plane_compute_base(splane, fb, splane->src_x, splane->src_y); > > lcdc_write(sdev, LDBnBSAYR(splane->index), splane->dma[0]); > - if (splane->format->yuv) > + if (shmob_drm_format_is_yuv(splane->format)) > lcdc_write(sdev, LDBnBSACR(splane->index), splane->dma[1]); > > lcdc_write(sdev, LDBCR, -- Regards, Laurent Pinchart
next prev parent reply other threads:[~2023-06-23 15:30 UTC|newest] Thread overview: 199+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-06-22 9:21 [PATCH 00/39] drm: renesas: shmobile: Atomic conversion + DT support Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-22 9:21 ` [PATCH 01/39] dt-bindings: display: Add Renesas SH-Mobile LCDC bindings Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-22 14:52 ` Rob Herring 2023-06-22 14:52 ` Rob Herring 2023-07-17 13:57 ` Geert Uytterhoeven 2023-07-17 13:57 ` Geert Uytterhoeven 2023-06-23 14:43 ` Laurent Pinchart 2023-06-23 14:43 ` Laurent Pinchart 2023-06-23 15:19 ` Geert Uytterhoeven 2023-06-23 15:19 ` Geert Uytterhoeven 2023-06-23 15:33 ` Laurent Pinchart 2023-06-23 15:33 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 02/39] media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9 variants Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 14:56 ` Laurent Pinchart 2023-06-23 14:56 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 03/39] drm: renesas: shmobile: Fix overlay plane disable Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 14:59 ` Laurent Pinchart 2023-06-23 14:59 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 04/39] drm: renesas: shmobile: Fix ARGB32 overlay format typo Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-22 10:11 ` Sergei Shtylyov 2023-06-22 10:11 ` Sergei Shtylyov 2023-06-23 14:58 ` Laurent Pinchart 2023-06-23 14:58 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 05/39] drm: renesas: shmobile: Correct encoder/connector types Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:03 ` Laurent Pinchart 2023-06-23 15:03 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 06/39] drm: renesas: shmobile: Add support for Runtime PM Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:07 ` Laurent Pinchart 2023-06-23 15:07 ` Laurent Pinchart 2023-06-23 15:11 ` Laurent Pinchart 2023-06-23 15:11 ` Laurent Pinchart 2023-06-23 15:22 ` Geert Uytterhoeven 2023-06-23 15:22 ` Geert Uytterhoeven 2023-06-23 15:34 ` Laurent Pinchart 2023-06-23 15:34 ` Laurent Pinchart 2023-06-23 17:41 ` Geert Uytterhoeven 2023-06-23 17:41 ` Geert Uytterhoeven 2023-06-23 17:52 ` Laurent Pinchart 2023-06-23 17:52 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 07/39] drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks() Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:04 ` Laurent Pinchart 2023-06-23 15:04 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 08/39] drm: renesas: shmobile: Use %p4cc to print fourcc code Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:04 ` Laurent Pinchart 2023-06-23 15:04 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 09/39] drm: renesas: shmobile: Add missing YCbCr formats Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:13 ` Laurent Pinchart 2023-06-23 15:13 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 10/39] drm: renesas: shmobile: Improve shmob_drm_format_info table Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:30 ` Laurent Pinchart [this message] 2023-06-23 15:30 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 11/39] drm: renesas: shmobile: Remove backlight support Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:36 ` Laurent Pinchart 2023-06-23 15:36 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 12/39] drm: renesas: shmobile: Don't set display info width and height twice Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-28 1:46 ` [12/39] " Sui Jingfeng 2023-06-22 9:21 ` [PATCH 13/39] drm: renesas: shmobile: Rename input clocks Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-28 1:50 ` [13/39] " Sui Jingfeng 2023-06-22 9:21 ` [PATCH 14/39] drm: renesas: shmobile: Remove support for SYS panels Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-22 9:21 ` [PATCH 15/39] drm: renesas: shmobile: Improve error handling Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:41 ` Laurent Pinchart 2023-06-23 15:41 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 16/39] drm: renesas: shmobile: Convert to use devm_request_irq() Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:41 ` Laurent Pinchart 2023-06-23 15:41 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 17/39] drm: renesas: shmobile: Use drmm_universal_plane_alloc() Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:46 ` Laurent Pinchart 2023-06-23 15:46 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 18/39] drm: renesas: shmobile: Embed drm_device in shmob_drm_device Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:48 ` Laurent Pinchart 2023-06-23 15:48 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 19/39] drm: renesas: shmobile: Convert container helpers to static inline functions Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:49 ` Laurent Pinchart 2023-06-23 15:49 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 20/39] drm: renesas: shmobile: Replace .dev_private with container_of() Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:50 ` Laurent Pinchart 2023-06-23 15:50 ` Laurent Pinchart 2023-06-24 9:49 ` [20/39] " Sui Jingfeng 2023-06-22 9:21 ` [PATCH 21/39] drm: renesas: shmobile: Use struct videomode in platform data Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:53 ` Laurent Pinchart 2023-06-23 15:53 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 22/39] drm: renesas: shmobile: Use media bus formats " Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 15:54 ` Laurent Pinchart 2023-06-23 15:54 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 23/39] drm: renesas: shmobile: Move interface handling to connector setup Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:39 ` Laurent Pinchart 2023-06-23 16:39 ` Laurent Pinchart 2023-06-23 17:51 ` Geert Uytterhoeven 2023-06-23 17:51 ` Geert Uytterhoeven 2023-06-23 17:53 ` Laurent Pinchart 2023-06-23 17:53 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 24/39] drm: renesas: shmobile: Unify plane allocation Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:50 ` Laurent Pinchart 2023-06-23 16:50 ` Laurent Pinchart 2023-06-23 17:55 ` Geert Uytterhoeven 2023-06-23 17:55 ` Geert Uytterhoeven 2023-06-23 18:50 ` Laurent Pinchart 2023-06-23 18:50 ` Laurent Pinchart 2023-06-25 8:58 ` Geert Uytterhoeven 2023-06-25 8:58 ` Geert Uytterhoeven 2023-06-25 16:56 ` Laurent Pinchart 2023-06-25 16:56 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 25/39] drm: renesas: shmobile: Rename shmob_drm_crtc.crtc Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:51 ` Laurent Pinchart 2023-06-23 16:51 ` Laurent Pinchart 2023-06-27 14:38 ` [25/39] " Sui Jingfeng 2023-06-22 9:21 ` [PATCH 26/39] drm: renesas: shmobile: Rename shmob_drm_connector.connector Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:51 ` Laurent Pinchart 2023-06-23 16:51 ` Laurent Pinchart 2023-06-27 14:40 ` [26/39] " Sui Jingfeng 2023-06-22 9:21 ` [PATCH 27/39] drm: renesas: shmobile: Rename shmob_drm_plane.plane Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:52 ` Laurent Pinchart 2023-06-23 16:52 ` Laurent Pinchart 2023-06-27 14:40 ` [27/39] " Sui Jingfeng 2023-06-22 9:21 ` [PATCH 28/39] drm: renesas: shmobile: Use drm_crtc_handle_vblank() Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:53 ` Laurent Pinchart 2023-06-23 16:53 ` Laurent Pinchart 2023-06-24 9:33 ` [28/39] " Sui Jingfeng 2023-06-25 8:55 ` Geert Uytterhoeven 2023-06-25 8:55 ` Geert Uytterhoeven 2023-06-22 9:21 ` [PATCH 29/39] drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip() Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 16:53 ` Laurent Pinchart 2023-06-23 16:53 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 30/39] drm: renesas: shmobile: Wait for page flip when turning CRTC off Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:08 ` Laurent Pinchart 2023-06-23 17:08 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 31/39] drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:09 ` Laurent Pinchart 2023-06-23 17:09 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 32/39] drm: renesas: shmobile: Shutdown the display on remove Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:10 ` Laurent Pinchart 2023-06-23 17:10 ` Laurent Pinchart 2023-06-27 14:57 ` [32/39] " Sui Jingfeng 2023-07-05 10:29 ` Geert Uytterhoeven 2023-07-05 10:29 ` Geert Uytterhoeven 2023-07-06 3:51 ` suijingfeng 2023-06-22 9:21 ` [PATCH 33/39] drm: renesas: shmobile: Cleanup encoder Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:12 ` Laurent Pinchart 2023-06-23 17:12 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 34/39] drm: renesas: shmobile: Atomic conversion part 1 Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-22 9:21 ` [PATCH 35/39] drm: renesas: shmobile: Atomic conversion part 2 Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-22 9:21 ` [PATCH 36/39] drm: renesas: shmobile: Use suspend/resume helpers Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:14 ` Laurent Pinchart 2023-06-23 17:14 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 37/39] drm: renesas: shmobile: Remove internal CRTC state tracking Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:15 ` Laurent Pinchart 2023-06-23 17:15 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 38/39] drm: renesas: shmobile: Atomic conversion part 3 Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:18 ` Laurent Pinchart 2023-06-23 17:18 ` Laurent Pinchart 2023-06-22 9:21 ` [PATCH 39/39] drm: renesas: shmobile: Add DT support Geert Uytterhoeven 2023-06-22 9:21 ` Geert Uytterhoeven 2023-06-23 17:50 ` Laurent Pinchart 2023-06-23 17:50 ` Laurent Pinchart 2023-06-23 17:54 ` Sam Ravnborg 2023-06-23 17:54 ` Sam Ravnborg 2023-06-23 18:09 ` Geert Uytterhoeven 2023-06-23 18:09 ` Geert Uytterhoeven 2023-06-23 18:52 ` Laurent Pinchart 2023-06-23 18:52 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230623153047.GO2112@pendragon.ideasonboard.com \ --to=laurent.pinchart@ideasonboard.com \ --cc=airlied@gmail.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=geert+renesas@glider.be \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=magnus.damm@gmail.com \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.