Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 198d8178 authored by Sankeerth Billakanti's avatar Sankeerth Billakanti
Browse files

drm/msm/dp: Fix DP stream count if DP MST is disabled 



Even when the DP MST property is not present in the DT file, the dp
driver is returning the number of streams as 2. Correcting the code
to return number of streams as 0 when DP MST is not supported.

Change-Id: I7c41d8739698e265776d94931bbcfe7212f96509
Signed-off-by: default avatarSankeerth Billakanti <sbillaka@codeaurora.org>
parent e89a5466

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

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

		goto error_catalog;

	}

	}





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



	dp->catalog = dp_catalog_get(dev, dp->parser);

	dp->catalog = dp_catalog_get(dev, dp->parser);

	if (IS_ERR(dp->catalog)) {

	if (IS_ERR(dp->catalog)) {

		rc = PTR_ERR(dp->catalog);

		rc = PTR_ERR(dp->catalog);
@@ -2123,7 +2125,10 @@ int dp_display_get_num_of_displays(void) 




int dp_display_get_num_of_streams(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)

static int dp_display_remove(struct platform_device *pdev)

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ struct dp_display { 
	struct drm_connector *base_connector;

	struct drm_connector *base_connector;

	void *base_dp_panel;

	void *base_dp_panel;

	bool is_sst_connected;

	bool is_sst_connected;

	bool is_mst_supported;

	u32 max_pclk_khz;

	u32 max_pclk_khz;

	void *dp_mst_prv_info;

	void *dp_mst_prv_info;