Attachment 140809 Details for Bug 106228 – additional patch

[patch] additional patch

0001-drm-amd-display-Implement-backlight_ops.get_brightne.patch (text/plain), 2.99 KB, created by Daniel Drake on 2018-07-24 20:06:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Drake

Created: 2018-07-24 20:06:11 UTC

Size: 2.99 KB

patch

obsolete

>From 2f5c030daa1dadccc16c701193ed2ef8391f2d85 Mon Sep 17 00:00:00 2001
>From: David Francis <David.Francis@amd.com>
>Date: Thu, 19 Jul 2018 11:25:05 -0400
>Subject: [PATCH] drm/amd/display: Implement backlight_ops.get_brightness
>
>[Why]
>This hook that is supposed to read the actual backlight value
>is used in a few places throughout the kernel to setup or force
>update on backlight
>
>[How]
>Create a dc function that calls the existing abm function, and
>call that function from amdgpu
>
>Signed-off-by: David Francis <David.Francis@amd.com>
>---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++++++-
> drivers/gpu/drm/amd/display/dc/core/dc_link.c     | 9 +++++++++
> drivers/gpu/drm/amd/display/dc/dc_link.h          | 2 ++
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
>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 7a8c8c14c7d6..71256f1e5e74 100644
>--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>@@ -1316,7 +1316,12 @@ static int amdgpu_dm_backlight_update_status(struct backlight_device *bd)
> 
> static int amdgpu_dm_backlight_get_brightness(struct backlight_device *bd)
> {
>-	return bd->props.brightness;
>+	struct amdgpu_display_manager *dm = bl_get_data(bd);
>+	int ret = dc_link_get_backlight_level(dm->backlight_link);
>+
>+	if (ret == DC_ERROR_UNEXPECTED)
>+		return bd->props.brightness;
>+	return ret;
> }
> 
> static const struct backlight_ops amdgpu_dm_backlight_ops = {
>diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
>index 4de68fa074a0..14674a2b0b67 100644
>--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
>+++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
>@@ -1996,6 +1996,15 @@ enum dc_status dc_link_validate_mode_timing(
> 	return DC_OK;
> }
> 
>+int dc_link_get_backlight_level(const struct dc_link *link)
>+{
>+	struct abm *abm = link->ctx->dc->res_pool->abm;
>+
>+	if (abm == NULL || abm->funcs->get_current_backlight_8_bit == NULL)
>+		return DC_ERROR_UNEXPECTED;
>+
>+	return (int) abm->funcs->get_current_backlight_8_bit(abm);
>+}
> 
> bool dc_link_set_backlight_level(const struct dc_link *link, uint32_t level,
> 		uint32_t frame_ramp, const struct dc_stream_state *stream)
>diff --git a/drivers/gpu/drm/amd/display/dc/dc_link.h b/drivers/gpu/drm/amd/display/dc/dc_link.h
>index 070a56926308..22f4ddd219d1 100644
>--- a/drivers/gpu/drm/amd/display/dc/dc_link.h
>+++ b/drivers/gpu/drm/amd/display/dc/dc_link.h
>@@ -141,6 +141,8 @@ static inline struct dc_link *dc_get_link_at_index(struct dc *dc, uint32_t link_
> bool dc_link_set_backlight_level(const struct dc_link *dc_link, uint32_t level,
> 		uint32_t frame_ramp, const struct dc_stream_state *stream);
> 
>+int dc_link_get_backlight_level(const struct dc_link *dc_link);
>+
> bool dc_link_set_abm_disable(const struct dc_link *dc_link);
> 
> bool dc_link_set_psr_enable(const struct dc_link *dc_link, bool enable, bool wait);
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 106228: 139091 | 140795 | 140809

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.