Merge "drm/dp: cache edid for mst physical output ports" (7ffe4d2c) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/drm_dp_mst_topology.c

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1208,9 +1208,8 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
	drm_dp_put_port(port);		drm_dp_put_port(port);
	goto out;		goto out;
	}		}
	if ((port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV \|\|		if (port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV \|\|
	port->pdt == DP_PEER_DEVICE_SST_SINK) &&		port->pdt == DP_PEER_DEVICE_SST_SINK) {
	port->port_num >= DP_MST_LOGICAL_PORT_0) {
	port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);		port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);
	drm_mode_connector_set_tile_property(port->connector);		drm_mode_connector_set_tile_property(port->connector);
	}		}
	@@ -1248,6 +1247,13 @@ static void drm_dp_update_port(struct drm_dp_mst_branch *mstb,
	}		}
	}		}
	if (old_pdt != port->pdt && !port->input) {		if (old_pdt != port->pdt && !port->input) {
			if ((old_pdt == DP_PEER_DEVICE_DP_LEGACY_CONV \|\|
			old_pdt == DP_PEER_DEVICE_SST_SINK) &&
			port->port_num < DP_MST_LOGICAL_PORT_0) {
			kfree(port->cached_edid);
			port->cached_edid = NULL;
			}

	drm_dp_port_teardown_pdt(port, old_pdt);		drm_dp_port_teardown_pdt(port, old_pdt);

	if (drm_dp_port_setup_pdt(port))		if (drm_dp_port_setup_pdt(port))