Commit 9336127d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2020-11-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



two patches to fix dw-hdmi bind and detection code, and one fix for
sun4i shared with arm-soc

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201119083939.ddj3saipyg5iwvb4@gilmour
parents f95dddc9 cdf117d6

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+0 −6
Original line number Diff line number Diff line
@@ -2327,12 +2327,6 @@ static enum drm_connector_status dw_hdmi_detect(struct dw_hdmi *hdmi) 
{

	enum drm_connector_status result;



	mutex_lock(&hdmi->mutex);

	hdmi->force = DRM_FORCE_UNSPECIFIED;

	dw_hdmi_update_power(hdmi);

	dw_hdmi_update_phy_mask(hdmi);

	mutex_unlock(&hdmi->mutex);



	result = hdmi->phy.ops->read_hpd(hdmi, hdmi->phy.data);



	mutex_lock(&hdmi->mutex);

drivers/gpu/drm/sun4i/sun4i_backend.c

+7 −1
Original line number Diff line number Diff line
@@ -814,9 +814,15 @@ static int sun4i_backend_bind(struct device *dev, struct device *master, 
		 *

		 * XXX(hch): this has no business in a driver and needs to move

		 * to the device tree.

		 *

		 * If we have two subsequent calls to dma_direct_set_offset

		 * returns -EINVAL. Unfortunately, this happens when we have two

		 * backends in the system, and will result in the driver

		 * reporting an error while it has been setup properly before.

		 * Ignore EINVAL, but it should really be removed eventually.

		 */

		ret = dma_direct_set_offset(drm->dev, PHYS_OFFSET, 0, SZ_4G);

		if (ret)

		if (ret && ret != -EINVAL)

			return ret;

	}

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, 
	phy_node = of_parse_phandle(dev->of_node, "phys", 0);

	if (!phy_node) {

		dev_err(dev, "Can't found PHY phandle\n");

		ret = -EINVAL;

		goto err_disable_clk_tmds;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE