Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: mxsfb: use bus_format to determine LCD bus width

The LCD bus width does not need to align with the pixel format. The
LCDIF controller automatically converts between pixel formats and
bus width by padding or dropping LSBs.

The DRM subsystem has the notion of bus_format which allows to
determine what bus_formats are supported by the display. Choose the
first available or fallback to 24 bit if none are available.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>

authored by

Stefan Agner and committed by
Dave Airlie
10f2889b 9813527a

+33 -2
+32 -2
drivers/gpu/drm/mxsfb/mxsfb_crtc.c
··· 65 65 switch (format) { 66 66 case DRM_FORMAT_RGB565: 67 67 dev_dbg(drm->dev, "Setting up RGB565 mode\n"); 68 - ctrl |= CTRL_SET_BUS_WIDTH(STMLCDIF_16BIT); 69 68 ctrl |= CTRL_SET_WORD_LENGTH(0); 70 69 ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0xf); 71 70 break; 72 71 case DRM_FORMAT_XRGB8888: 73 72 dev_dbg(drm->dev, "Setting up XRGB8888 mode\n"); 74 - ctrl |= CTRL_SET_BUS_WIDTH(STMLCDIF_24BIT); 75 73 ctrl |= CTRL_SET_WORD_LENGTH(3); 76 74 /* Do not use packed pixels = one pixel per word instead. */ 77 75 ctrl1 |= CTRL1_SET_BYTE_PACKAGING(0x7); ··· 83 85 writel(ctrl, mxsfb->base + LCDC_CTRL); 84 86 85 87 return 0; 88 + } 89 + 90 + static void mxsfb_set_bus_fmt(struct mxsfb_drm_private *mxsfb) 91 + { 92 + struct drm_crtc *crtc = &mxsfb->pipe.crtc; 93 + struct drm_device *drm = crtc->dev; 94 + u32 bus_format = MEDIA_BUS_FMT_RGB888_1X24; 95 + u32 reg; 96 + 97 + reg = readl(mxsfb->base + LCDC_CTRL); 98 + 99 + if (mxsfb->connector.display_info.num_bus_formats) 100 + bus_format = mxsfb->connector.display_info.bus_formats[0]; 101 + 102 + reg &= ~CTRL_BUS_WIDTH_MASK; 103 + switch (bus_format) { 104 + case MEDIA_BUS_FMT_RGB565_1X16: 105 + reg |= CTRL_SET_BUS_WIDTH(STMLCDIF_16BIT); 106 + break; 107 + case MEDIA_BUS_FMT_RGB666_1X18: 108 + reg |= CTRL_SET_BUS_WIDTH(STMLCDIF_18BIT); 109 + break; 110 + case MEDIA_BUS_FMT_RGB888_1X24: 111 + reg |= CTRL_SET_BUS_WIDTH(STMLCDIF_24BIT); 112 + break; 113 + default: 114 + dev_err(drm->dev, "Unknown media bus format %d\n", bus_format); 115 + break; 116 + } 117 + writel(reg, mxsfb->base + LCDC_CTRL); 86 118 } 87 119 88 120 static void mxsfb_enable_controller(struct mxsfb_drm_private *mxsfb) ··· 202 174 vdctrl0 |= VDCTRL0_DOTCLK_ACT_FALLING; 203 175 204 176 writel(vdctrl0, mxsfb->base + LCDC_VDCTRL0); 177 + 178 + mxsfb_set_bus_fmt(mxsfb); 205 179 206 180 /* Frame length in lines. */ 207 181 writel(m->crtc_vtotal, mxsfb->base + LCDC_VDCTRL1);
+1
drivers/gpu/drm/mxsfb/mxsfb_regs.h
··· 44 44 #define CTRL_DATA_SELECT (1 << 16) 45 45 #define CTRL_SET_BUS_WIDTH(x) (((x) & 0x3) << 10) 46 46 #define CTRL_GET_BUS_WIDTH(x) (((x) >> 10) & 0x3) 47 + #define CTRL_BUS_WIDTH_MASK (0x3 << 10) 47 48 #define CTRL_SET_WORD_LENGTH(x) (((x) & 0x3) << 8) 48 49 #define CTRL_GET_WORD_LENGTH(x) (((x) >> 8) & 0x3) 49 50 #define CTRL_MASTER (1 << 5)