From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Chiras Subject: [PATCH 06/10] drm/mxsfb: Add support for new pixel formats in eLCDIF Date: Wed, 9 Jan 2019 14:13:46 +0000 Message-ID: <1547043209-8283-7-git-send-email-robert.chiras@nxp.com> References: <1547043209-8283-1-git-send-email-robert.chiras@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1547043209-8283-1-git-send-email-robert.chiras@nxp.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Daniel Vetter , Philipp Zabel , Marek Vasut Cc: Mirela Rabulea , Stefan Agner , Shawn Guo , Fabio Estevam , David Airlie , Anson Huang , "dri-devel@lists.freedesktop.org" , dl-linux-imx , "kernel@pengutronix.de" , "linux-kernel@vger.kernel.org" List-Id: dri-devel@lists.freedesktop.org From: Mirela Rabulea Add support for the following pixel formats: 16 bpp: RG16 ,BG16, XR15, XB15, AR15, AB15 Set the bus format based on input from the user and panel capabilities. Save the bus format in crtc->mode.private_flags, the DSI will use it. Use drm_get_format_name instead of locally defined fourcc_to_str. Signed-off-by: Mirela Rabulea --- drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 100 ++++++++++++++++++++++++++-------= ---- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 5 ++ 2 files changed, 76 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c b/drivers/gpu/drm/mxsfb/mxs= fb_crtc.c index 6aa8804..b62b607 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_crtc.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_crtc.c @@ -48,24 +48,6 @@ static u32 set_hsync_pulse_width(struct mxsfb_drm_privat= e *mxsfb, u32 val) mxsfb->devdata->hs_wdth_shift; } =20 -/* Print Four-character-code (FOURCC) */ -static char *fourcc_to_str(u32 fmt) -{ - /* Use 10 chars so we can simultaneously print two codes */ - static char code[10], *c =3D &code[0]; - - if (c =3D=3D &code[10]) - c =3D &code[0]; - - *(c++) =3D (unsigned char)(fmt & 0xff); - *(c++) =3D (unsigned char)((fmt >> 8) & 0xff); - *(c++) =3D (unsigned char)((fmt >> 16) & 0xff); - *(c++) =3D (unsigned char)((fmt >> 24) & 0xff); - *(c++) =3D '\0'; - - return (c - 5); -} - /* Setup the MXSFB registers for decoding the pixels out of the framebuffe= r */ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private *mxsfb, bool updat= e) { @@ -74,6 +56,7 @@ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private *= mxsfb, bool update) const u32 format =3D crtc->primary->state->fb->format->format; u32 ctrl =3D 0, ctrl1 =3D 0; bool bgr_format =3D true; + struct drm_format_name_buf format_name_buf; =20 if (!update) ctrl =3D CTRL_BYPASS_COUNT | CTRL_MASTER; @@ -92,7 +75,7 @@ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private *= mxsfb, bool update) } =20 DRM_DEV_DEBUG_DRIVER(drm->dev, "Setting up %s mode\n", - fourcc_to_str(format)); + drm_get_format_name(format, &format_name_buf)); =20 /* Do some clean-up that we might have from a previous mode */ ctrl &=3D ~CTRL_SHIFT_DIR(1); @@ -103,19 +86,41 @@ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_privat= e *mxsfb, bool update) mxsfb->base + LCDC_V4_CTRL2 + REG_CLR); =20 switch (format) { - case DRM_FORMAT_RGB565: + case DRM_FORMAT_BGR565: /* BG16 */ + if (mxsfb->devdata->ipversion < 4) + goto err; + writel(CTRL2_ODD_LINE_PATTERN(0x5) | + CTRL2_EVEN_LINE_PATTERN(0x5), + mxsfb->base + LCDC_V4_CTRL2 + REG_SET); + /* Fall through */ + case DRM_FORMAT_RGB565: /* RG16 */ ctrl |=3D CTRL_SET_WORD_LENGTH(0); + ctrl &=3D ~CTRL_DF16; ctrl1 |=3D CTRL1_SET_BYTE_PACKAGING(0xf); break; - case DRM_FORMAT_RGBX8888: - case DRM_FORMAT_RGBA8888: + case DRM_FORMAT_XBGR1555: /* XB15 */ + case DRM_FORMAT_ABGR1555: /* AB15 */ + if (mxsfb->devdata->ipversion < 4) + goto err; + writel(CTRL2_ODD_LINE_PATTERN(0x5) | + CTRL2_EVEN_LINE_PATTERN(0x5), + mxsfb->base + LCDC_V4_CTRL2 + REG_SET); + /* Fall through */ + case DRM_FORMAT_XRGB1555: /* XR15 */ + case DRM_FORMAT_ARGB1555: /* AR15 */ + ctrl |=3D CTRL_SET_WORD_LENGTH(0); + ctrl |=3D CTRL_DF16; + ctrl1 |=3D CTRL1_SET_BYTE_PACKAGING(0xf); + break; + case DRM_FORMAT_RGBX8888: /* RX24 */ + case DRM_FORMAT_RGBA8888: /* RA24 */ /* RGBX - > 0RGB */ ctrl |=3D CTRL_SHIFT_DIR(1); ctrl |=3D CTRL_SHIFT_NUM(8); bgr_format =3D false; /* Fall through */ - case DRM_FORMAT_XBGR8888: - case DRM_FORMAT_ABGR8888: + case DRM_FORMAT_XBGR8888: /* XB24 */ + case DRM_FORMAT_ABGR8888: /* AB24 */ if (bgr_format) { if (mxsfb->devdata->ipversion < 4) goto err; @@ -124,8 +129,8 @@ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_private= *mxsfb, bool update) mxsfb->base + LCDC_V4_CTRL2 + REG_SET); } /* Fall through */ - case DRM_FORMAT_XRGB8888: - case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_XRGB8888: /* XR24 */ + case DRM_FORMAT_ARGB8888: /* AR24 */ ctrl |=3D CTRL_SET_WORD_LENGTH(3); /* Do not use packed pixels =3D one pixel per word instead. */ ctrl1 |=3D CTRL1_SET_BYTE_PACKAGING(0x7); @@ -146,19 +151,56 @@ static int mxsfb_set_pixel_fmt(struct mxsfb_drm_priva= te *mxsfb, bool update) =20 err: DRM_DEV_ERROR(drm->dev, "Unhandled pixel format: %s\n", - fourcc_to_str(format)); + drm_get_format_name(format, &format_name_buf)); + return -EINVAL; } =20 +static u32 get_bus_format_from_bpp(u32 bpp) +{ + switch (bpp) { + case 16: + return MEDIA_BUS_FMT_RGB565_1X16; + case 18: + return MEDIA_BUS_FMT_RGB666_1X18; + case 24: + return MEDIA_BUS_FMT_RGB888_1X24; + default: + return MEDIA_BUS_FMT_RGB888_1X24; + } +} + static void mxsfb_set_bus_fmt(struct mxsfb_drm_private *mxsfb) { struct drm_crtc *crtc =3D &mxsfb->pipe.crtc; + unsigned int bits_per_pixel =3D crtc->primary->state->fb->format->depth; struct drm_device *drm =3D crtc->dev; u32 bus_format =3D MEDIA_BUS_FMT_RGB888_1X24; + int num_bus_formats =3D mxsfb->connector->display_info.num_bus_formats; + const u32 *bus_formats =3D mxsfb->connector->display_info.bus_formats; u32 reg =3D 0; + int i =3D 0; + + /* match the user requested bus_format to one supported by the panel */ + if (num_bus_formats) { + u32 user_bus_format =3D get_bus_format_from_bpp(bits_per_pixel); + + bus_format =3D bus_formats[0]; + for (i =3D 0; i < num_bus_formats; i++) { + if (user_bus_format =3D=3D bus_formats[i]) { + bus_format =3D user_bus_format; + break; + } + } + } =20 - if (mxsfb->connector->display_info.num_bus_formats) - bus_format =3D mxsfb->connector->display_info.bus_formats[0]; + /* + * CRTC will dictate the bus format via private_flags[16:1] + * and private_flags[0] will signal a bus format change + */ + crtc->mode.private_flags &=3D ~0x1FFFF; /* clear bus format */ + crtc->mode.private_flags |=3D (bus_format << 1); /* set bus format */ + crtc->mode.private_flags |=3D 0x1; /* bus format change indication*/ =20 DRM_DEV_DEBUG_DRIVER(drm->dev, "Using bus_format: 0x%08X\n", bus_format); diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsf= b_drv.c index aa35c43..d3fb3a8 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -65,6 +65,11 @@ static const uint32_t mxsfb_formats[] =3D { DRM_FORMAT_ABGR8888, DRM_FORMAT_RGBX8888, DRM_FORMAT_RGBA8888, + DRM_FORMAT_ARGB1555, + DRM_FORMAT_XRGB1555, + DRM_FORMAT_ABGR1555, + DRM_FORMAT_XBGR1555, + DRM_FORMAT_BGR565 }; =20 static const struct mxsfb_devdata mxsfb_devdata[] =3D { --=20 2.7.4