Merge "drm/msm/dp: Fix DP stream count if DP MST is disabled" (9ad1c73f) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/dp/dp_display.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1081,6 +1081,8 @@ static int dp_init_sub_modules(struct dp_display_private *dp)
		goto error_catalog;
		}

		g_dp_display->is_mst_supported = dp->parser->has_mst;

		dp->catalog = dp_catalog_get(dev, dp->parser);
		if (IS_ERR(dp->catalog)) {
		rc = PTR_ERR(dp->catalog);
		@@ -2227,7 +2229,10 @@ int dp_display_get_num_of_displays(void)

		int dp_display_get_num_of_streams(void)
		{
		return 2;
		if (g_dp_display->is_mst_supported)
		return DP_STREAM_MAX;

		return 0;
		}

		static int dp_display_remove(struct platform_device *pdev)

+1 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ struct dp_display {
		struct drm_connector *base_connector;
		void *base_dp_panel;
		bool is_sst_connected;
		bool is_mst_supported;
		u32 max_pclk_khz;
		void *dp_mst_prv_info;