xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/vc4: dpi: Add option for inverting pixel clock and output enable

Browse Source 
[ Upstream commit 3c2707632146b22e97b0fbf6778bab8add2eaa1d ]

DRM provides flags for inverting pixel clock and output enable
signals, but these were not mapped to the relevant registers.

Add those mappings.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20220613144800.326124-10-maxime@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Stable-dep-of: 0870d86eac8a ("drm/vc4: dpi: Fix format mapping for RGB565")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dave Stevenson
2022-06-13 16:47:36 +02:00
committed by Greg Kroah-Hartman
parent 0b8f390e22
commit 09c6e21d6a
1 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/gpu/drm/vc4/vc4_dpi.c
View File

@@ -148,35 +148,45 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder)
} }
drm_connector_list_iter_end(&conn_iter); drm_connector_list_iter_end(&conn_iter);
if (connector && connector->display_info.num_bus_formats) { if (connector) {
u32 bus_format = connector->display_info.bus_formats[0]; if (connector->display_info.num_bus_formats) {
u32 bus_format = connector->display_info.bus_formats[0];
switch (bus_format) { switch (bus_format) {
case MEDIA_BUS_FMT_RGB888_1X24: case MEDIA_BUS_FMT_RGB888_1X24:
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB,
DPI_FORMAT); DPI_FORMAT);
break; break;
case MEDIA_BUS_FMT_BGR888_1X24: case MEDIA_BUS_FMT_BGR888_1X24:
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB,
DPI_FORMAT); DPI_FORMAT);
dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER); dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR,
break; DPI_ORDER);
case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: break;
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, case MEDIA_BUS_FMT_RGB666_1X24_CPADHI:
DPI_FORMAT); dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2,
break; DPI_FORMAT);
case MEDIA_BUS_FMT_RGB666_1X18: break;
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, case MEDIA_BUS_FMT_RGB666_1X18:
DPI_FORMAT); dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1,
break; DPI_FORMAT);
case MEDIA_BUS_FMT_RGB565_1X16: break;
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3, case MEDIA_BUS_FMT_RGB565_1X16:
DPI_FORMAT); dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3,
break; DPI_FORMAT);
default: break;
DRM_ERROR("Unknown media bus format %d\n", bus_format); default:
break; DRM_ERROR("Unknown media bus format %d\n",
bus_format);
break;
}
} }
if (connector->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
dpi_c |= DPI_PIXEL_CLK_INVERT;
if (connector->display_info.bus_flags & DRM_BUS_FLAG_DE_LOW)
dpi_c |= DPI_OUTPUT_ENABLE_INVERT;
} else { } else {
/* Default to 24bit if no connector found. */ /* Default to 24bit if no connector found. */
dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT); dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT);