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

Commit 050d2a55 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'imx-drm-fixes-2018-07-20' of git://git.pengutronix.de/git/pza/linux into drm-fixes 



drm/imx: imx-drm ldb and ipu-v3 csi fixes

- Disable the LVDS Display Bridge (LDB) on driver bind. This is
  necessary to guarantee correct LVDS signals in case the bootloader
  left the LVDS output active.
- Remove false positive warning about disabled second LVDS channel in
  dual-channel mode. In this mode, the second LVDS channel can not be
  used separately. If the second channel is correctly described as
  disabled in the device tree, the driver warned about this anyway.
- Fix the CSI confiuration to not only enable interlaced capture mode
  for V4L2_FIELD_SEQ_BT and V4L2_FIELD_SEQ_TB, but also for the
  V4L2_FIELD_ALTERNATE interlacing mode. Before, it incorrectly tried
  to capture progressive frames in that case.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1532100423.3438.8.camel@pengutronix.de
parents 5a75cd11 bbe4a089

drivers/gpu/drm/imx/imx-ldb.c

+6 −3
Original line number Diff line number Diff line
@@ -612,6 +612,9 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) 
		return PTR_ERR(imx_ldb->regmap);

	}



	/* disable LDB by resetting the control register to POR default */

	regmap_write(imx_ldb->regmap, IOMUXC_GPR2, 0);



	imx_ldb->dev = dev;



	if (of_id)
@@ -652,14 +655,14 @@ static int imx_ldb_bind(struct device *dev, struct device *master, void *data) 
		if (ret || i < 0 || i > 1)

			return -EINVAL;



		if (!of_device_is_available(child))

			continue;



		if (dual && i > 0) {

			dev_warn(dev, "dual-channel mode, ignoring second output\n");

			continue;

		}



		if (!of_device_is_available(child))

			continue;



		channel = &imx_ldb->channel[i];

		channel->ldb = imx_ldb;

		channel->chno = i;

drivers/gpu/ipu-v3/ipu-csi.c

+2 −1
Original line number Diff line number Diff line
@@ -339,7 +339,8 @@ static void fill_csi_bus_cfg(struct ipu_csi_bus_config *csicfg, 
		break;

	case V4L2_MBUS_BT656:

		csicfg->ext_vsync = 0;

		if (V4L2_FIELD_HAS_BOTH(mbus_fmt->field))

		if (V4L2_FIELD_HAS_BOTH(mbus_fmt->field) ||

		    mbus_fmt->field == V4L2_FIELD_ALTERNATE)

			csicfg->clk_mode = IPU_CSI_CLK_MODE_CCIR656_INTERLACED;

		else

			csicfg->clk_mode = IPU_CSI_CLK_MODE_CCIR656_PROGRESSIVE;