Commit c1368b34 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-fixes for v5.6-rc3:
- Fix dt binding for sunxi.
- Allow only 1 rotation argument, and allow 0 rotation in video cmdline.
- Small compiler warning fix for panfrost.
- Fix when using performance counters in panfrost when using per fd address space.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f5a6370d-9898-6c72-43e4-5bb56a99b6f2@linux.intel.com
parents 7c42545c dde2bb2d

Documentation/devicetree/bindings/display/allwinner,sun4i-a10-tcon.yaml

+5 −1
Original line number Diff line number Diff line
@@ -43,9 +43,13 @@ properties: 
        - enum:

          - allwinner,sun8i-h3-tcon-tv

          - allwinner,sun50i-a64-tcon-tv

          - allwinner,sun50i-h6-tcon-tv

        - const: allwinner,sun8i-a83t-tcon-tv



      - items:

        - enum:

          - allwinner,sun50i-h6-tcon-tv

        - const: allwinner,sun8i-r40-tcon-tv



  reg:

    maxItems: 1

drivers/gpu/drm/bridge/tc358767.c

+4 −4
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static inline int tc_poll_timeout(struct tc_data *tc, unsigned int addr, 


static int tc_aux_wait_busy(struct tc_data *tc)

{

	return tc_poll_timeout(tc, DP0_AUXSTATUS, AUX_BUSY, 0, 1000, 100000);

	return tc_poll_timeout(tc, DP0_AUXSTATUS, AUX_BUSY, 0, 100, 100000);

}



static int tc_aux_write_data(struct tc_data *tc, const void *data,
@@ -640,7 +640,7 @@ static int tc_aux_link_setup(struct tc_data *tc) 
	if (ret)

		goto err;



	ret = tc_poll_timeout(tc, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 1, 1000);

	ret = tc_poll_timeout(tc, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 100, 100000);

	if (ret == -ETIMEDOUT) {

		dev_err(tc->dev, "Timeout waiting for PHY to become ready");

		return ret;
@@ -876,7 +876,7 @@ static int tc_wait_link_training(struct tc_data *tc) 
	int ret;



	ret = tc_poll_timeout(tc, DP0_LTSTAT, LT_LOOPDONE,

			      LT_LOOPDONE, 1, 1000);

			      LT_LOOPDONE, 500, 100000);

	if (ret) {

		dev_err(tc->dev, "Link training timeout waiting for LT_LOOPDONE!\n");

		return ret;
@@ -949,7 +949,7 @@ static int tc_main_link_enable(struct tc_data *tc) 
	dp_phy_ctrl &= ~(DP_PHY_RST | PHY_M1_RST | PHY_M0_RST);

	ret = regmap_write(tc->regmap, DP_PHY_CTRL, dp_phy_ctrl);



	ret = tc_poll_timeout(tc, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 1, 1000);

	ret = tc_poll_timeout(tc, DP_PHY_CTRL, PHY_RDY, PHY_RDY, 500, 100000);

	if (ret) {

		dev_err(dev, "timeout waiting for phy become ready");

		return ret;

drivers/gpu/drm/bridge/ti-tfp410.c

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static int tfp410_attach(struct drm_bridge *bridge) 
					  dvi->connector_type,

					  dvi->ddc);

	if (ret) {

		dev_err(dvi->dev, "drm_connector_init() failed: %d\n", ret);

		dev_err(dvi->dev, "drm_connector_init_with_ddc() failed: %d\n",

			ret);

		return ret;

	}

drivers/gpu/drm/drm_client_modeset.c

+2 −1
Original line number Diff line number Diff line
@@ -951,7 +951,8 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation) 
	 * depending on the hardware this may require the framebuffer

	 * to be in a specific tiling format.

	 */

	if ((*rotation & DRM_MODE_ROTATE_MASK) != DRM_MODE_ROTATE_180 ||

	if (((*rotation & DRM_MODE_ROTATE_MASK) != DRM_MODE_ROTATE_0 &&

	     (*rotation & DRM_MODE_ROTATE_MASK) != DRM_MODE_ROTATE_180) ||

	    !plane->rotation_property)

		return false;

drivers/gpu/drm/drm_modes.c

+7 −0
Original line number Diff line number Diff line
@@ -1698,6 +1698,13 @@ static int drm_mode_parse_cmdline_options(const char *str, 
	if (rotation && freestanding)

		return -EINVAL;



	if (!(rotation & DRM_MODE_ROTATE_MASK))

		rotation |= DRM_MODE_ROTATE_0;



	/* Make sure there is exactly one rotation defined */

	if (!is_power_of_2(rotation & DRM_MODE_ROTATE_MASK))

		return -EINVAL;



	mode->rotation_reflection = rotation;



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE