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

Merge tag 'drm-misc-next-fixes-2020-08-05' of... 

Merge tag 'drm-misc-next-fixes-2020-08-05' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

drm-misc-next-fixes for v5.9-rc1:
- Fix drm_dp_mst_port refcount leaks in drm_dp_mst_allocate_vcpi
- Fix a fbcon OOB read in fbdev, found by syzbot.
- Mark vga_tryget static as it's not used elsewhere.
- Small fixes to xlnx.
- Remove null check for kfree in drm_dev_release.
- Fix DRM_FORMAT_MOD_AMLOGIC_FBC definition.
- Fix mode initialization in omap_connector_mode_valid().

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b2043dad-f118-bd19-54a6-f23bf6264007@linux.intel.com
parents dc100bc8 a34a0a63

drivers/gpu/drm/drm_dp_mst_topology.c

+4 −3
Original line number Diff line number Diff line
@@ -4308,11 +4308,11 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, 
{

	int ret;



	port = drm_dp_mst_topology_get_port_validated(mgr, port);

	if (!port)

	if (slots < 0)

		return false;



	if (slots < 0)

	port = drm_dp_mst_topology_get_port_validated(mgr, port);

	if (!port)

		return false;



	if (port->vcpi.vcpi > 0) {
@@ -4328,6 +4328,7 @@ bool drm_dp_mst_allocate_vcpi(struct drm_dp_mst_topology_mgr *mgr, 
	if (ret) {

		DRM_DEBUG_KMS("failed to init vcpi slots=%d max=63 ret=%d\n",

			      DIV_ROUND_UP(pbn, mgr->pbn_div), ret);

		drm_dp_mst_topology_put_port(port);

		goto out;

	}

	DRM_DEBUG_KMS("initing vcpi for pbn=%d slots=%d\n",

drivers/gpu/drm/drm_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -815,7 +815,6 @@ static void drm_dev_release(struct kref *ref) 


	drm_managed_release(dev);



	if (dev->managed.final_kfree)

	kfree(dev->managed.final_kfree);

}

drivers/gpu/drm/omapdrm/omap_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static enum drm_mode_status omap_connector_mode_valid(struct drm_connector *conn 
				 struct drm_display_mode *mode)

{

	struct omap_connector *omap_connector = to_omap_connector(connector);

	struct drm_display_mode new_mode = { { 0 } };

	struct drm_display_mode new_mode = {};

	enum drm_mode_status status;



	status = omap_connector_mode_fixup(omap_connector->output, mode,

drivers/gpu/drm/xlnx/zynqmp_dp.c

+18 −15
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ MODULE_PARM_DESC(aux_timeout_ms, "DP aux timeout value in msec (default: 50)"); 
 */

static uint zynqmp_dp_power_on_delay_ms = 4;

module_param_named(power_on_delay_ms, zynqmp_dp_power_on_delay_ms, uint, 0444);

MODULE_PARM_DESC(aux_timeout_ms, "DP power on delay in msec (default: 4)");

MODULE_PARM_DESC(power_on_delay_ms, "DP power on delay in msec (default: 4)");



/* Link configuration registers */

#define ZYNQMP_DP_LINK_BW_SET				0x0
@@ -567,23 +567,26 @@ static int zynqmp_dp_mode_configure(struct zynqmp_dp *dp, int pclock, 
				    u8 current_bw)

{

	int max_rate = dp->link_config.max_rate;

	u8 bws[3] = { DP_LINK_BW_1_62, DP_LINK_BW_2_7, DP_LINK_BW_5_4 };

	u8 bw_code;

	u8 max_lanes = dp->link_config.max_lanes;

	u8 max_link_rate_code = drm_dp_link_rate_to_bw_code(max_rate);

	u8 bpp = dp->config.bpp;

	u8 lane_cnt;

	s8 i;



	if (current_bw == DP_LINK_BW_1_62) {

	/* Downshift from current bandwidth */

	switch (current_bw) {

	case DP_LINK_BW_5_4:

		bw_code = DP_LINK_BW_2_7;

		break;

	case DP_LINK_BW_2_7:

		bw_code = DP_LINK_BW_1_62;

		break;

	case DP_LINK_BW_1_62:

		dev_err(dp->dev, "can't downshift. already lowest link rate\n");

		return -EINVAL;

	}



	for (i = ARRAY_SIZE(bws) - 1; i >= 0; i--) {

		if (current_bw && bws[i] >= current_bw)

			continue;



		if (bws[i] <= max_link_rate_code)

	default:

		/* If not given, start with max supported */

		bw_code = max_link_rate_code;

		break;

	}
@@ -591,10 +594,10 @@ static int zynqmp_dp_mode_configure(struct zynqmp_dp *dp, int pclock, 
		int bw;

		u32 rate;



		bw = drm_dp_bw_code_to_link_rate(bws[i]);

		bw = drm_dp_bw_code_to_link_rate(bw_code);

		rate = zynqmp_dp_max_rate(bw, lane_cnt, bpp);

		if (pclock <= rate) {

			dp->mode.bw_code = bws[i];

			dp->mode.bw_code = bw_code;

			dp->mode.lane_cnt = lane_cnt;

			dp->mode.pclock = pclock;

			return dp->mode.bw_code;
@@ -1308,7 +1311,7 @@ zynqmp_dp_connector_detect(struct drm_connector *connector, bool force) 
		ret = drm_dp_dpcd_read(&dp->aux, 0x0, dp->dpcd,

				       sizeof(dp->dpcd));

		if (ret < 0) {

			dev_dbg(dp->dev, "DPCD read failes");

			dev_dbg(dp->dev, "DPCD read failed");

			goto disconnected;

		}

drivers/gpu/vga/vgaarb.c

+1 −2
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ EXPORT_SYMBOL(vga_get); 
 *

 * 0 on success, negative error code on failure.

 */

int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)

static int vga_tryget(struct pci_dev *pdev, unsigned int rsrc)

{

	struct vga_device *vgadev;

	unsigned long flags;
@@ -554,7 +554,6 @@ bail: 
	spin_unlock_irqrestore(&vga_lock, flags);

	return rc;

}

EXPORT_SYMBOL(vga_tryget);



/**

 * vga_put - release lock on legacy VGA resources

CRA Git | Maintained and supported by SUSTech CRA and CCSE