Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88bc4178 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: Use new DRM_BUS_FLAG_*_(DRIVE|SAMPLE)_(POS|NEG)EDGE flags 



The DRM_BUS_FLAG_PIXDATA_(POS|NEG)EDGE and
DRM_BUS_FLAG_SYNC_(POS|NEG)EDGE flags are deprecated in favour of the
new DRM_BUS_FLAG_PIXDATA_(DRIVE|SAMPLE)_(POS|NEG)EDGE and
new DRM_BUS_FLAG_SYNC_(DRIVE|SAMPLE)_(POS|NEG)EDGE flags. Replace them
through the code.

This effectively changes the value of the .sampling_edge bridge timings
field in the dumb-vga-dac driver. This is safe to do as no driver
consumes these values yet.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Tested-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent a792fa0e

drivers/gpu/drm/bridge/dumb-vga-dac.c

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static int dumb_vga_remove(struct platform_device *pdev) 
 */

static const struct drm_bridge_timings default_dac_timings = {

	/* Timing specifications, datasheet page 7 */

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,

	.setup_time_ps = 500,

	.hold_time_ps = 1500,

};
@@ -245,7 +245,7 @@ static const struct drm_bridge_timings default_dac_timings = { 
 */

static const struct drm_bridge_timings ti_ths8134_dac_timings = {

	/* From timing diagram, datasheet page 9 */

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,

	/* From datasheet, page 12 */

	.setup_time_ps = 3000,

	/* I guess this means latched input */
@@ -258,7 +258,7 @@ static const struct drm_bridge_timings ti_ths8134_dac_timings = { 
 */

static const struct drm_bridge_timings ti_ths8135_dac_timings = {

	/* From timing diagram, datasheet page 14 */

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_POSEDGE,

	.sampling_edge = DRM_BUS_FLAG_PIXDATA_SAMPLE_POSEDGE,

	/* From datasheet, page 16 */

	.setup_time_ps = 2000,

	.hold_time_ps = 500,

drivers/gpu/drm/bridge/tc358767.c

+2 −2
Original line number Diff line number Diff line
@@ -1222,8 +1222,8 @@ static int tc_bridge_attach(struct drm_bridge *bridge) 
					 &bus_format, 1);

	tc->connector.display_info.bus_flags =

		DRM_BUS_FLAG_DE_HIGH |

		DRM_BUS_FLAG_PIXDATA_NEGEDGE |

		DRM_BUS_FLAG_SYNC_NEGEDGE;

		DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE |

		DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;

	drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);



	return 0;

drivers/gpu/drm/drm_modes.c

+6 −6
Original line number Diff line number Diff line
@@ -655,22 +655,22 @@ EXPORT_SYMBOL_GPL(drm_display_mode_to_videomode); 
 * @bus_flags: information about pixelclk, sync and DE polarity will be stored

 * here

 *

 * Sets DRM_BUS_FLAG_DE_(LOW|HIGH),  DRM_BUS_FLAG_PIXDATA_(POS|NEG)EDGE and

 * DISPLAY_FLAGS_SYNC_(POS|NEG)EDGE in @bus_flags according to DISPLAY_FLAGS

 * Sets DRM_BUS_FLAG_DE_(LOW|HIGH),  DRM_BUS_FLAG_PIXDATA_DRIVE_(POS|NEG)EDGE

 * and DISPLAY_FLAGS_SYNC_(POS|NEG)EDGE in @bus_flags according to DISPLAY_FLAGS

 * found in @vm

 */

void drm_bus_flags_from_videomode(const struct videomode *vm, u32 *bus_flags)

{

	*bus_flags = 0;

	if (vm->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)

		*bus_flags |= DRM_BUS_FLAG_PIXDATA_POSEDGE;

		*bus_flags |= DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE;

	if (vm->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)

		*bus_flags |= DRM_BUS_FLAG_PIXDATA_NEGEDGE;

		*bus_flags |= DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE;



	if (vm->flags & DISPLAY_FLAGS_SYNC_POSEDGE)

		*bus_flags |= DRM_BUS_FLAG_SYNC_POSEDGE;

		*bus_flags |= DRM_BUS_FLAG_SYNC_DRIVE_POSEDGE;

	if (vm->flags & DISPLAY_FLAGS_SYNC_NEGEDGE)

		*bus_flags |= DRM_BUS_FLAG_SYNC_NEGEDGE;

		*bus_flags |= DRM_BUS_FLAG_SYNC_DRIVE_NEGEDGE;



	if (vm->flags & DISPLAY_FLAGS_DE_LOW)

		*bus_flags |= DRM_BUS_FLAG_DE_LOW;

drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void fsl_dcu_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) 
	drm_display_mode_to_videomode(mode, &vm);



	/* INV_PXCK as default (most display sample data on rising edge) */

	if (!(con->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE))

	if (!(con->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE))

		pol |= DCU_SYN_POL_INV_PXCK;



	if (vm.flags & DISPLAY_FLAGS_HSYNC_LOW)

drivers/gpu/drm/imx/ipuv3-crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static void ipu_crtc_mode_set_nofb(struct drm_crtc *crtc) 
	sig_cfg.enable_pol = !(imx_crtc_state->bus_flags & DRM_BUS_FLAG_DE_LOW);

	/* Default to driving pixel data on negative clock edges */

	sig_cfg.clk_pol = !!(imx_crtc_state->bus_flags &

			     DRM_BUS_FLAG_PIXDATA_POSEDGE);

			     DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE);

	sig_cfg.bus_format = imx_crtc_state->bus_format;

	sig_cfg.v_to_h_sync = 0;

	sig_cfg.hsync_pin = imx_crtc_state->di_hsync_pin;