Merge pull request torvalds#675 from tq-steina/6.6-2.0.x-imx-lcdif

drm/imx: lcdifv3: Fix videomode settings
tq-steina · Jul 11, 2024 · a9adc02 · a9adc02
2 parents ee366aa + 7a31ed7
commit a9adc02
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/drivers/gpu/drm/imx/lcdifv3/lcdifv3-crtc.c b/drivers/gpu/drm/imx/lcdifv3/lcdifv3-crtc.c
@@ -159,12 +159,14 @@ static void lcdifv3_crtc_atomic_enable(struct drm_crtc *crtc,
 
 	if (imx_crtc_state->bus_flags & DRM_BUS_FLAG_DE_HIGH)
 		vm.flags |= DISPLAY_FLAGS_DE_HIGH;
-	else
+	if (imx_crtc_state->bus_flags & DRM_BUS_FLAG_DE_LOW)
 		vm.flags |= DISPLAY_FLAGS_DE_LOW;
 
-	if (imx_crtc_state->bus_flags & DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE)
+	if ((imx_crtc_state->bus_flags & DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE) ||
+	    (imx_crtc_state->bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE))
 		vm.flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
-	else
+	if ((imx_crtc_state->bus_flags & DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE) ||
+	    (imx_crtc_state->bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE))
 		vm.flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
 
 	pm_runtime_get_sync(lcdifv3_crtc->dev->parent);