Attachment 138027 Details for Bug 104064 – [PATCH] Only register backlight device if embedded panel connected

[patch] [PATCH] Only register backlight device if embedded panel connected

0001-drm-amd-display-Only-register-backlight-device-if-em.patch (text/plain), 3.98 KB, created by Harry Wentland on 2018-03-12 15:54:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harry Wentland

Created: 2018-03-12 15:54:58 UTC

Size: 3.98 KB

patch

obsolete

>From be0b6ac569d6bdea19719cbc52d651ab5caab368 Mon Sep 17 00:00:00 2001
>From: Harry Wentland <harry.wentland@amd.com>
>Date: Mon, 12 Mar 2018 11:16:47 -0400
>Subject: [PATCH] drm/amd/display: Only register backlight device if embedded
> panel connected
>
>Change-Id: I576ecb7f2e5de458e2b59b7a6678611f5e164c83
>Signed-off-by: Harry Wentland <harry.wentland@amd.com>
>---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 57 +++++++++++++----------
> 1 file changed, 32 insertions(+), 25 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>index 0564676487e7..d47761a00da7 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -1402,6 +1402,27 @@ static int initialize_plane(struct amdgpu_display_manager *dm,
> 	return ret;
> }
> 
>+
>+static void register_backlight_device(struct amdgpu_display_manager *dm,
>+				      struct dc_link *link)
>+#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\
>+	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
>+
>+	if ((link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS) &&
>+	    link->type != dc_connection_none) {
>+		/* Event if registration failed, we should continue with
>+		 * DM initialization because not having a backlight control
>+		 * is better then a black screen.
>+		 */
>+		amdgpu_dm_register_backlight_device(dm);
>+
>+		if (dm->backlight_dev)
>+			dm->backlight_link = link;
>+	}
>+#endif
>+}
>+
>+
> /* In this architecture, the association
>  * connector -> encoder -> crtc
>  * id not really requried. The crtc and connector will hold the
>@@ -1455,6 +1476,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
> 
> 	/* loops over all connectors on the board */
> 	for (i = 0; i < link_cnt; i++) {
>+		struct dc_link *link = NULL;
> 
> 		if (i > AMDGPU_DM_MAX_DISPLAY_INDEX) {
> 			DRM_ERROR(
>@@ -1481,9 +1503,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
> 			goto fail;
> 		}
> 
>-		if (dc_link_detect(dc_get_link_at_index(dm->dc, i),
>-				DETECT_REASON_BOOT))
>+		link = dc_get_link_at_index(dm->dc, i);
>+
>+		if (dc_link_detect(link, DETECT_REASON_BOOT)) {
> 			amdgpu_dm_update_connector_after_detect(aconnector);
>+			register_backlight_device(dm, link);
>+		}
>+
>+
> 	}
> 
> 	/* Software is initialized. Now we can register interrupt handlers. */
>@@ -2712,7 +2739,8 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector)
> #if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\
> 	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
> 
>-	if (link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) {
>+	if ((link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) &&
>+	    link->type != dc_connection_none) {
> 		amdgpu_dm_register_backlight_device(dm);
> 
> 		if (dm->backlight_dev) {
>@@ -3598,6 +3626,7 @@ create_i2c(struct ddc_service *ddc_service,
> 	return i2c;
> }
> 
>+
> /* Note: this function assumes that dc_link_detect() was called for the
>  * dc_link which will be represented by this aconnector.
>  */
>@@ -3667,28 +3696,6 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
> 		|| connector_type == DRM_MODE_CONNECTOR_eDP)
> 		amdgpu_dm_initialize_dp_connector(dm, aconnector);
> 
>-#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\
>-	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
>-
>-	/* NOTE: this currently will create backlight device even if a panel
>-	 * is not connected to the eDP/LVDS connector.
>-	 *
>-	 * This is less than ideal but we don't have sink information at this
>-	 * stage since detection happens after. We can't do detection earlier
>-	 * since MST detection needs connectors to be created first.
>-	 */
>-	if (link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) {
>-		/* Event if registration failed, we should continue with
>-		 * DM initialization because not having a backlight control
>-		 * is better then a black screen.
>-		 */
>-		amdgpu_dm_register_backlight_device(dm);
>-
>-		if (dm->backlight_dev)
>-			dm->backlight_link = link;
>-	}
>-#endif
>-
> out_free:
> 	if (res) {
> 		kfree(i2c);
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 104064: 135921 | 135922 | 137103 | 137643 | 137646 | 137647 | 137651 | 137668 | 137732 | 137733 | 137816 | 137817 | 137825 | 137852 | 137979 | 138027 | 138028 | 138032 | 138267 | 138278 | 138279

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.