drm/amdgpu/display: add support for multiple backlights
Subsystems (3)
Alex Deucher
maintainerPATCH v2 1/1 drm/amdgpu/display: add support for multiple backlights
On platforms that support multiple backlights, register each one separately. This lets us manage them independently rather than registering a single backlight and applying the same settings to both.
v2: fix typo:
--- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 147 ++++++++++-------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- 3 files changed, 84 insertions(+), 71 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +2 -2
@@ -854,8 +854,8 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)if (amdgpu_device_has_dc_support (adev)) {#if defined(CONFIG_DRM_AMD_DC )struct amdgpu_display_manager *dm = &adev->dm; -if (dm->backlight_dev) - atif->bd = dm->backlight_dev; +if (dm->backlight_dev[0 ]) + atif->bd = dm->backlight_dev[0 ];#endif }else {struct drm_encoder *tmp;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +80 -67
277 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +2 -2
@@ -365,13 +365,13 @@ struct amdgpu_display_manager {spinlock_t irq_handler_list_table_lock; -struct backlight_device *backlight_dev; +struct backlight_device *backlight_dev[AMDGPU_DM_MAX_NUM_EDP ];const struct dc_link *backlight_link[AMDGPU_DM_MAX_NUM_EDP ];uint8_t num_of_edps; -struct amdgpu_dm_backlight_caps backlight_caps; +struct amdgpu_dm_backlight_caps backlight_caps[AMDGPU_DM_MAX_NUM_EDP ];struct mod_freesync *freesync_module;#ifdef CONFIG_DRM_AMD_DC_HDCP
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alex Deucher
Sent: Wednesday, July 14, 2021 3:00 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; kernel test robot <[email protected]>
Subject: [PATCH V2] drm/amdgpu/display: add support for multiple backlights
On platforms that support multiple backlights, register each one separately. This lets us manage them independently rather than registering a single backlight and applying the same settings to both.
v2: fix typo:
--- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 147 ++++++++++-------- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 +- 3 files changed, 84 insertions(+), 71 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +2 -2
@@ -854,8 +854,8 @@ int amdgpu_acpi_init(struct amdgpu_device *adev)if (amdgpu_device_has_dc_support (adev)) {#if defined(CONFIG_DRM_AMD_DC )struct amdgpu_display_manager *dm = &adev->dm; -if (dm->backlight_dev) - atif->bd = dm->backlight_dev; +if (dm->backlight_dev[0 ]) + atif->bd = dm->backlight_dev[0 ];#endif }else {struct drm_encoder *tmp;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +60 -45
186 lines not on this page · raw message
- int i;
- amdgpu_dm_update_backlight_caps(dm);
- for (i = 0; i < dm->num_of_edps; i++)
- dm->brightness[i] = AMDGPU_MAX_BL_LEVEL;
+ amdgpu_dm_update_backlight_caps(dm, dm->num_of_edps);
+ dm->brightness[dm->num_of_edps] = AMDGPU_MAX_BL_LEVEL;
props.max_brightness = AMDGPU_MAX_BL_LEVEL;
props.brightness = AMDGPU_MAX_BL_LEVEL;
props.type = BACKLIGHT_RAW;
snprintf(bl_name, sizeof(bl_name), "amdgpu_bl%d",- adev_to_drm(dm->adev)->primary->index);
+ adev_to_drm(dm->adev)->primary->index + dm->num_of_edps);
- dm->backlight_dev = backlight_device_register(bl_name,
- adev_to_drm(dm->adev)->dev, - dm, - &amdgpu_dm_backlight_ops, - &props); + dm->backlight_dev[dm->num_of_edps] = backlight_device_register(bl_name, + adev_to_drm(dm->adev)->dev, + dm, + &amdgpu_dm_backlight_ops, + &props);
- if (IS_ERR(dm->backlight_dev))
+ if (IS_ERR(dm->backlight_dev[dm->num_of_edps]))
DRM_ERROR("DM: Backlight registration failed!\n");
else
DRM_DEBUG_DRIVER("DM: Registered Backlight device: %s\n", bl_name); }-
#endif
static int initialize_plane(struct amdgpu_display_manager *dm, @@ -3675,10 +3685,10 @@ static void register_backlight_device(struct amdgpu_display_manager *dm,
* DM initialization because not having a backlight control
* is better then a black screen.
*/
- if (!dm->backlight_dev)
+ if (!dm->backlight_dev[dm->num_of_edps])
amdgpu_dm_register_backlight_device(dm);
- if (dm->backlight_dev) {
+ if (dm->backlight_dev[dm->num_of_edps]) {
dm->backlight_link[dm->num_of_edps] = link;
dm->num_of_edps++;
}
@@ -6198,6 +6208,7 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector)
const struct dc_link *link = aconnector->dc_link;
struct amdgpu_device *adev = drm_to_adev(connector->dev);
struct amdgpu_display_manager *dm = &adev->dm;+ int i;
/*
* Call only if mst_mgr was iniitalized before since it's not done @@ -6208,12 +6219,11 @@ 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)) &&
- link->type != dc_connection_none &&
- dm->backlight_dev) {
- backlight_device_unregister(dm->backlight_dev);
- dm->backlight_dev = NULL;
+ for (i = 0; i < dm->num_of_edps; i++) {
+ if ((link == dm->backlight_link[i]) && dm->backlight_dev[i]) {
+ backlight_device_unregister(dm->backlight_dev[i]);
+ dm->backlight_dev[i] = NULL;
+ }
}
#endif
@@ -9191,8 +9201,11 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || \
defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)
/* restore the backlight level */- if (dm->backlight_dev && (amdgpu_dm_backlight_get_level(dm) != dm->brightness[0]))
- amdgpu_dm_backlight_set_level(dm, dm->brightness[0]);
+ for (i = 0; i < dm->num_of_edps; i++) {
+ if (dm->backlight_dev[i] &&
+ (amdgpu_dm_backlight_get_level(dm, i) != dm->brightness[i]))
+ amdgpu_dm_backlight_set_level(dm, i, dm->brightness[i]);
+ }
#endif
/*
* send vblank event on all events not handled in flip and diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 9522d4ca299e..ab1670b16b02 100644
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +2 -2
@@ -365,13 +365,13 @@ struct amdgpu_display_manager {spinlock_t irq_handler_list_table_lock; -struct backlight_device *backlight_dev; +struct backlight_device *backlight_dev[AMDGPU_DM_MAX_NUM_EDP ];const struct dc_link *backlight_link[AMDGPU_DM_MAX_NUM_EDP ];uint8_t num_of_edps; -struct amdgpu_dm_backlight_caps backlight_caps; +struct amdgpu_dm_backlight_caps backlight_caps[AMDGPU_DM_MAX_NUM_EDP ];struct mod_freesync *freesync_module;#ifdef CONFIG_DRM_AMD_DC_HDCP
--
2.31.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Croman.li%40amd.com%7C4e1f8a3d82c94bb5a6c608d946f9a646%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637618860323313878%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=wTGk3rrbxTa2gWnTgI%2FCic0Dqr7ERPgbanwXpn47ZiA%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx