Expose the DRM LUMINANCE connector property for internal panels when CONFIG_DRM_LUMINANCE is enabled. Keep registering the existing backlight class device otherwise, preserving its userspace ABI.
Use the existing brightness scaling and programming paths from connector helper callbacks in both Display Core and legacy display. Apply atomic luminance after the display pipeline is enabled so changes made while a connector is inactive take effect on the next enable. Signed-off-by: Mario Limonciello <[email protected]> --- drivers/gpu/drm/amd/amdgpu/Kconfig | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 20 +++++++++ .../gpu/drm/amd/amdgpu/atombios_encoders.c | 17 +++++++- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 ++++++---- .../display/amdgpu_dm/amdgpu_dm_backlight.c | 42 +++++++++++++++++-- .../display/amdgpu_dm/amdgpu_dm_backlight.h | 2 + .../display/amdgpu_dm/amdgpu_dm_connector.c | 7 +++- 7 files changed, 96 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig index 12e4a41bf1f04..f273fb79c0e02 100644 --- a/drivers/gpu/drm/amd/amdgpu/Kconfig +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig @@ -20,7 +20,7 @@ config DRM_AMDGPU select I2C select I2C_ALGOBIT select CRC16 - select BACKLIGHT_CLASS_DEVICE + select BACKLIGHT_CLASS_DEVICE if !DRM_LUMINANCE select INTERVAL_TREE select DRM_BUDDY select DRM_SUBALLOC_HELPER diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 92c98e999efe9..209a7a6c246db 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -798,11 +798,31 @@ static int amdgpu_connector_set_lcd_property(struct drm_connector *connector, return 0; } +static void amdgpu_connector_set_luminance(const struct drm_connector_state *conn_state) +{ + struct drm_encoder *encoder = + amdgpu_connector_best_single_encoder(conn_state->connector); + + if (encoder) + amdgpu_atombios_encoder_set_backlight_level(to_amdgpu_encoder(encoder), + conn_state->luminance); +} + +static void amdgpu_connector_disable_luminance(const struct drm_connector_state *conn_state) +{ + struct drm_encoder *encoder = + amdgpu_connector_best_single_encoder(conn_state->connector); + + if (encoder) + amdgpu_atombios_encoder_set_backlight_level(to_amdgpu_encoder(encoder), 0); +} static const struct drm_connector_helper_funcs amdgpu_connector_lvds_helper_funcs = { .get_modes = amdgpu_connector_lvds_get_modes, .mode_valid = amdgpu_connector_lvds_mode_valid, .best_encoder = amdgpu_connector_best_single_encoder, + .set_luminance = amdgpu_connector_set_luminance, + .disable_luminance = amdgpu_connector_disable_luminance, }; static const struct drm_connector_funcs amdgpu_connector_lvds_funcs = { diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c index a1d05df0ac99b..dbff532ac1bcd 100644 --- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c @@ -191,6 +191,21 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode goto register_acpi_backlight; } + dig = amdgpu_encoder->enc_priv; + if (IS_ENABLED(CONFIG_DRM_LUMINANCE)) { + unsigned int brightness; + + brightness = amdgpu_atombios_encoder_get_backlight_level(amdgpu_encoder); + if (drm_connector_attach_luminance_property(drm_connector, 0, + AMDGPU_MAX_BL_LEVEL, + brightness)) + return; + + dig->backlight_level = brightness; + dig->bl_dev = NULL; + return; + } + pdata = kmalloc_obj(struct amdgpu_backlight_privdata); if (!pdata) { DRM_ERROR("Memory allocation failed\n"); @@ -211,7 +226,6 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode pdata->encoder = amdgpu_encoder; - dig = amdgpu_encoder->enc_priv; dig->bl_dev = bd; bd->props.brightness = amdgpu_atombios_encoder_get_backlight_brightness(bd); @@ -2123,4 +2137,3 @@ amdgpu_atombios_encoder_get_dig_info(struct amdgpu_encoder *amdgpu_encoder) return dig; } - 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 2b0686bcc7fd2..e79920ca17ac5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5175,9 +5175,12 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_commit *state) } /* Skip any modesets/resets */ - if (!acrtc || drm_atomic_crtc_needs_modeset(new_crtc_state)) + if (!acrtc || !new_crtc_state || + drm_atomic_crtc_needs_modeset(new_crtc_state)) continue; + drm_connector_update_privacy_screen(new_con_state); + dm_new_crtc_state = to_dm_crtc_state(new_crtc_state); dm_old_crtc_state = to_dm_crtc_state(old_crtc_state); @@ -5257,8 +5260,6 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_commit *state) &stream_update); mutex_unlock(&dm->dc_lock); kfree(dummy_updates); - - drm_connector_update_privacy_screen(new_con_state); } /** @@ -5376,11 +5377,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_commit *state) /* Update audio instances for each connector. */ amdgpu_dm_commit_audio(dev, state); - /* restore the backlight level */ - for (i = 0; i < dm->num_of_edps; i++) { - if (dm->backlight_dev[i] && - (dm->actual_brightness[i] != dm->brightness[i])) - amdgpu_dm_backlight_set_level(dm, i, dm->brightness[i]); + if (IS_ENABLED(CONFIG_DRM_LUMINANCE)) { + /* Apply brightness after the display pipeline is enabled. */ + drm_atomic_helper_commit_luminance_enables(state); + } else { + /* Restore the legacy backlight level. */ + for (i = 0; i < dm->num_of_edps; i++) { + if (dm->backlight_dev[i] && + dm->actual_brightness[i] != dm->brightness[i]) + amdgpu_dm_backlight_set_level(dm, i, dm->brightness[i]); + } } /* diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c index 64a963c218c8b..7b9ab94244176 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c @@ -40,6 +40,7 @@ #include <linux/backlight.h> #include <linux/power_supply.h> +#include <drm/drm_connector.h> #include <drm/drm_edid.h> #include <drm/drm_utils.h> @@ -233,13 +234,17 @@ struct dc_stream_state *dm_find_stream_with_link( struct amdgpu_display_manager *dm, struct dc_link *link) { - struct dc_state *cur_dc_state = dm->dc->current_state; + struct dc_state *cur_dc_state; struct dc_stream_state *stream = NULL; int i; + if (!dm || !dm->dc || !dm->dc->current_state || !link) + return NULL; + + cur_dc_state = dm->dc->current_state; for (i = 0; i < cur_dc_state->stream_count; i++) { stream = cur_dc_state->streams[i]; - if (stream->link == link) + if (stream && stream->link == link) return stream; } @@ -293,7 +298,7 @@ void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm, dm->brightness[bl_idx] = user_brightness; /* update scratch register */ - if (bl_idx == 0) + if (bl_idx == 0 && dm->adev && dm->adev->rmmio && dm->adev->bios_scratch_reg_offset) amdgpu_atombios_scratch_regs_set_backlight_level(dm->adev, dm->brightness[bl_idx]); brightness = convert_brightness_from_user(caps, dm->brightness[bl_idx]); link = (struct dc_link *)dm->backlight_link[bl_idx]; @@ -591,6 +596,10 @@ void amdgpu_dm_setup_backlight_device(struct amdgpu_display_manager *dm, { struct dc_link *link = aconnector->dc_link; int bl_idx = dm->num_of_edps; + struct backlight_properties props = { 0 }; + struct amdgpu_dm_backlight_caps *caps; + struct drm_connector *connector = &aconnector->base; + int ret; if (!(link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) || link->type == dc_connection_none) @@ -609,6 +618,19 @@ void amdgpu_dm_setup_backlight_device(struct amdgpu_display_manager *dm, amdgpu_dm_update_connector_ext_caps(aconnector); + caps = &dm->backlight_caps[bl_idx]; + amdgpu_dm_backlight_fill_props(caps, power_supply_is_system_supplied() > 0, + !(amdgpu_dc_debug_mask & + DC_DISABLE_CUSTOM_BRIGHTNESS_CURVE), + &props); + if (IS_ENABLED(CONFIG_DRM_LUMINANCE)) { + unsigned int max = props.max_brightness; + unsigned int value = props.brightness; + + ret = drm_connector_attach_luminance_property(connector, 0, max, value); + drm_WARN_ON(adev_to_drm(dm->adev), ret); + } + /* Offer ABM property when user didn't turn off by module parameter. * OLED panels are included to support CACP (Content Adaptive * Contrast and Power) feature via set_abm_level. @@ -620,6 +642,20 @@ void amdgpu_dm_setup_backlight_device(struct amdgpu_display_manager *dm, } EXPORT_IF_KUNIT(amdgpu_dm_setup_backlight_device); +void amdgpu_dm_set_luminance(const struct drm_connector_state *state) +{ + struct amdgpu_dm_connector *aconnector = + to_amdgpu_dm_connector(state->connector); + struct amdgpu_display_manager *dm = + &drm_to_adev(state->connector->dev)->dm; + + if (aconnector->bl_idx < 0) + return; + + amdgpu_dm_backlight_set_level(dm, aconnector->bl_idx, + state->luminance); +} + /** * DOC: panel power savings * diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h index 891749322191c..859224cb37988 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h @@ -33,6 +33,7 @@ struct dc_stream_state; struct device; struct device_attribute; struct drm_connector; +struct drm_connector_state; struct attribute_group; #define AMDGPU_DM_DEFAULT_MIN_BACKLIGHT 12 @@ -47,6 +48,7 @@ void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm, void amdgpu_dm_register_backlight_device(struct amdgpu_dm_connector *aconnector); void amdgpu_dm_setup_backlight_device(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector); +void amdgpu_dm_set_luminance(const struct drm_connector_state *state); void amdgpu_dm_update_connector_ext_caps(struct amdgpu_dm_connector *aconnector); bool amdgpu_dm_should_create_sysfs(struct amdgpu_dm_connector *aconnector); diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c index 2a63a1c9b79d8..41610bed02c6d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c @@ -1922,7 +1922,8 @@ STATIC_IFN_KUNIT void amdgpu_dm_connector_destroy(struct drm_connector *connecto } if (aconnector->bl_idx != -1) { - backlight_device_unregister(dm->backlight_dev[aconnector->bl_idx]); + if (dm->backlight_dev[aconnector->bl_idx]) + backlight_device_unregister(dm->backlight_dev[aconnector->bl_idx]); dm->backlight_dev[aconnector->bl_idx] = NULL; } @@ -2016,7 +2017,8 @@ amdgpu_dm_connector_late_register(struct drm_connector *connector) return r; } - amdgpu_dm_register_backlight_device(amdgpu_dm_connector); + if (!IS_ENABLED(CONFIG_DRM_LUMINANCE)) + amdgpu_dm_register_backlight_device(amdgpu_dm_connector); if ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) || (connector->connector_type == DRM_MODE_CONNECTOR_eDP)) { @@ -2679,6 +2681,7 @@ amdgpu_dm_connector_helper_funcs = { .get_modes = get_modes, .mode_valid = amdgpu_dm_connector_mode_valid, .atomic_check = amdgpu_dm_connector_atomic_check, + .set_luminance = amdgpu_dm_set_luminance, }; int amdgpu_dm_convert_dc_color_depth_into_bpc(enum dc_color_depth display_color_depth) -- 2.43.0
