Commit 750643a9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-06-10' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



One fix for snu4i that prevents it from probing, two locking fixes for
ttm and drm_auth, one off-by-x1000 fix for mcde and a fix for vc4 to
prevent an out-of-bounds access.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210610171653.lqsoadxrhdk73cdy@gilmour
parents 43f44f5b c336a5ee

drivers/gpu/drm/drm_auth.c

+2 −1
Original line number Diff line number Diff line
@@ -314,9 +314,10 @@ int drm_master_open(struct drm_file *file_priv) 
void drm_master_release(struct drm_file *file_priv)

{

	struct drm_device *dev = file_priv->minor->dev;

	struct drm_master *master = file_priv->master;

	struct drm_master *master;



	mutex_lock(&dev->master_mutex);

	master = file_priv->master;

	if (file_priv->magic)

		idr_remove(&file_priv->master->magic_map, file_priv->magic);

drivers/gpu/drm/drm_ioctl.c

+5 −4
Original line number Diff line number Diff line
@@ -118,17 +118,18 @@ int drm_getunique(struct drm_device *dev, void *data, 
		  struct drm_file *file_priv)

{

	struct drm_unique *u = data;

	struct drm_master *master = file_priv->master;

	struct drm_master *master;



	mutex_lock(&master->dev->master_mutex);

	mutex_lock(&dev->master_mutex);

	master = file_priv->master;

	if (u->unique_len >= master->unique_len) {

		if (copy_to_user(u->unique, master->unique, master->unique_len)) {

			mutex_unlock(&master->dev->master_mutex);

			mutex_unlock(&dev->master_mutex);

			return -EFAULT;

		}

	}

	u->unique_len = master->unique_len;

	mutex_unlock(&master->dev->master_mutex);

	mutex_unlock(&dev->master_mutex);



	return 0;

}

drivers/gpu/drm/mcde/mcde_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static void mcde_dsi_setup_video_mode(struct mcde_dsi *d, 
	 * porches and sync.

	 */

	/* (ps/s) / (pixels/s) = ps/pixels */

	pclk = DIV_ROUND_UP_ULL(1000000000000, mode->clock);

	pclk = DIV_ROUND_UP_ULL(1000000000000, (mode->clock * 1000));

	dev_dbg(d->dev, "picoseconds between two pixels: %llu\n",

		pclk);

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c

+27 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, 
		goto err_disable_clk_tmds;

	}



	ret = sun8i_hdmi_phy_probe(hdmi, phy_node);

	ret = sun8i_hdmi_phy_get(hdmi, phy_node);

	of_node_put(phy_node);

	if (ret) {

		dev_err(dev, "Couldn't get the HDMI PHY\n");
@@ -242,7 +242,6 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master, 


cleanup_encoder:

	drm_encoder_cleanup(encoder);

	sun8i_hdmi_phy_remove(hdmi);

err_disable_clk_tmds:

	clk_disable_unprepare(hdmi->clk_tmds);

err_assert_ctrl_reset:
@@ -263,7 +262,6 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master, 
	struct sun8i_dw_hdmi *hdmi = dev_get_drvdata(dev);



	dw_hdmi_unbind(hdmi->hdmi);

	sun8i_hdmi_phy_remove(hdmi);

	clk_disable_unprepare(hdmi->clk_tmds);

	reset_control_assert(hdmi->rst_ctrl);

	gpiod_set_value(hdmi->ddc_en, 0);
@@ -320,7 +318,32 @@ static struct platform_driver sun8i_dw_hdmi_pltfm_driver = { 
		.of_match_table = sun8i_dw_hdmi_dt_ids,

	},

};

module_platform_driver(sun8i_dw_hdmi_pltfm_driver);



static int __init sun8i_dw_hdmi_init(void)

{

	int ret;



	ret = platform_driver_register(&sun8i_dw_hdmi_pltfm_driver);

	if (ret)

		return ret;



	ret = platform_driver_register(&sun8i_hdmi_phy_driver);

	if (ret) {

		platform_driver_unregister(&sun8i_dw_hdmi_pltfm_driver);

		return ret;

	}



	return ret;

}



static void __exit sun8i_dw_hdmi_exit(void)

{

	platform_driver_unregister(&sun8i_dw_hdmi_pltfm_driver);

	platform_driver_unregister(&sun8i_hdmi_phy_driver);

}



module_init(sun8i_dw_hdmi_init);

module_exit(sun8i_dw_hdmi_exit);



MODULE_AUTHOR("Jernej Skrabec <jernej.skrabec@siol.net>");

MODULE_DESCRIPTION("Allwinner DW HDMI bridge");

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h

+3 −2
Original line number Diff line number Diff line
@@ -195,14 +195,15 @@ struct sun8i_dw_hdmi { 
	struct gpio_desc		*ddc_en;

};



extern struct platform_driver sun8i_hdmi_phy_driver;



static inline struct sun8i_dw_hdmi *

encoder_to_sun8i_dw_hdmi(struct drm_encoder *encoder)

{

	return container_of(encoder, struct sun8i_dw_hdmi, encoder);

}



int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node);

void sun8i_hdmi_phy_remove(struct sun8i_dw_hdmi *hdmi);

int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, struct device_node *node);



void sun8i_hdmi_phy_init(struct sun8i_hdmi_phy *phy);

void sun8i_hdmi_phy_set_ops(struct sun8i_hdmi_phy *phy,