drm/i915: WA intel_backlight scale math
Subsystems (2)
cover drm/i915: WA intel_backlight scale math
The first patch is version 3 of the original patch authored by Joe Konno. Joe Konno is off-the-grid for the next week or so. Thus, I'm submitting version 3 to keep the momentum going on this. I elected to split v3 up into two patches so that the first can be cherry-picked easier (i.e. out of context of intel_display.c).
U. Artie Eoff (2):
drm/i915: intel_backlight scale() math WA drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
drivers/gpu/drm/i915/intel_display.c | 3 --- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_panel.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-)
Signature · 1 line
1.9.3
PATCH v3 1/2 drm/i915: intel_backlight scale() math WA
Improper truncated integer division in the scale() function causes actual_brightness != brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.
TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with CONFIG_X86_32=y. (Jani)
-Use DIV_ROUND_CLOSEST_ULL() instead. (Damien)
-v1 and v2 originally authored by Joe Konno.
--- drivers/gpu/drm/i915/intel_panel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +5 -3
@@ -398,6 +398,9 @@ intel_panel_detect(struct drm_device *dev) } } +#define DIV_ROUND_CLOSEST_ULL (ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) +/** * scale - scale values from one range to another *
@@ -419,9 +422,8 @@ static uint32_t scale(uint32_t source_val, source_val =clamp (source_val, source_min, source_max);/* avoid overflows */ - target_val = (uint64_t )(source_val - source_min) * - (target_max - target_min); -do_div (target_val, source_max - source_min); + target_val =DIV_ROUND_CLOSEST_ULL ((uint64_t )(source_val - source_min) * + (target_max - target_min), source_max - source_min); target_val += target_min;return target_val;
Signature · 1 line
1.9.3
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
Quoted 13 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
Quoted 8 lines
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>
Is there some bug report, internal jira, mailing list reference or similar about this?
Note that at least for OTC jira tasks we now want them to be added to commit message with e.g.
OTC-Jria: VIZ-4932
And I guess I should merge patch 2 before patch 1, right?
Cheers, Daniel
Quoted 37 lines
--- drivers/gpu/drm/i915/intel_panel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_panel.c +5
-3@@ -398,6 +398,9 @@ intel_panel_detect(struct drm_device *dev) } } +#define DIV_ROUND_CLOSEST_ULL (ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) +/** * scale - scale values from one range to another * @@ -419,9 +422,8 @@ static uint32_t scale(uint32_t source_val, source_val =clamp (source_val, source_min, source_max);/* avoid overflows */ - target_val = (uint64_t )(source_val - source_min) * - (target_max - target_min); -do_div (target_val, source_max - source_min); + target_val =DIV_ROUND_CLOSEST_ULL ((uint64_t )(source_val - source_min) * + (target_max - target_min), source_max - source_min); target_val += target_min;return target_val;Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
Quoted 23 lines · Daniel Vetter
Quoted 13 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
Quoted 8 lines
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>
Quoted 8 lines
Is there some bug report, internal jira, mailing list reference or similar about this?
Note that at least for OTC jira tasks we now want them to be added to commit message with e.g.
OTC-Jria: VIZ-4932
Yes, the OTC-Jira task is: VIZ-4395. I'll resubmit with amended commit message.
Quoted 1 line
And I guess I should merge patch 2 before patch 1, right?
No, patch 1 before patch 2.
Thanks,
--U. Artie
Quoted 41 lines
Cheers, Daniel
Quoted 37 lines
--- drivers/gpu/drm/i915/intel_panel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_panel.c +5
-3@@ -398,6 +398,9 @@ intel_panel_detect(struct drm_device *dev) } } +#define DIV_ROUND_CLOSEST_ULL (ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) +/** * scale - scale values from one range to another * @@ -419,9 +422,8 @@ static uint32_t scale(uint32_t source_val, source_val =clamp (source_val, source_min, source_max);/* avoid overflows */ - target_val = (uint64_t )(source_val - source_min) * - (target_max - target_min); -do_div (target_val, source_max - source_min); + target_val =DIV_ROUND_CLOSEST_ULL ((uint64_t )(source_val - source_min) * + (target_max - target_min), source_max - source_min); target_val += target_min;return target_val;Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
Quoted 33 lines · Ullysses A
Quoted 23 lines · Daniel Vetter
Quoted 13 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
Quoted 8 lines
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>Quoted 8 lines
Is there some bug report, internal jira, mailing list reference or similar about this?
Note that at least for OTC jira tasks we now want them to be added to commit message with e.g.
OTC-Jria: VIZ-4932
Quoted 6 lines
Yes, the OTC-Jira task is: VIZ-4395. I'll resubmit with amended commit message.
Quoted 1 line
And I guess I should merge patch 2 before patch 1, right?
No, patch 1 before patch 2.
Oh, I didn't notice that your first add a duplicated version of the macro and then unify it. That's a bit backwards ...
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
Quoted 44 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, September 30, 2014 9:32 AM
To: Eoff, Ullysses A
Cc: [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/2 v3] drm/i915:intel_backlightscale()math WAQuoted 36 lines · Ullysses A
Quoted 23 lines · Daniel Vetter
Quoted 13 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
Quoted 8 lines
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>Quoted 8 lines
Is there some bug report, internal jira, mailing list reference or similar about this?
Note that at least for OTC jira tasks we now want them to be added to commit message with e.g.
OTC-Jria: VIZ-4932
Yes, the OTC-Jira task is: VIZ-4395. I'll resubmit with amended commit message.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
And I guess I should merge patch 2 before patch 1, right?
No, patch 1 before patch 2.
Oh, I didn't notice that your first add a duplicated version of the macro and then unify it. That's a bit backwards ...
The reason for doing it this way is so we can cherry-pick patch 1 into the chromeos 3.10 kernel cleanly (with some other backlight patches). That is, patch 1 is decoupled from the changes in intel_display.c. Hope that makes sense.
U. Artie
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
Quoted 48 lines · Ullysses A
Quoted 48 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, September 30, 2014 9:32 AM
To: Eoff, Ullysses A
Cc: [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/2 v3] drm/i915:intel_backlightscale()math WAQuoted 39 lines · Ullysses A
Quoted 23 lines · Daniel Vetter
Quoted 13 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
Quoted 8 lines
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>Quoted 8 lines
Is there some bug report, internal jira, mailing list reference or similar about this?
Note that at least for OTC jira tasks we now want them to be added to commit message with e.g.
OTC-Jria: VIZ-4932
Yes, the OTC-Jira task is: VIZ-4395. I'll resubmit with amended commit message.
Quoted 1 line
And I guess I should merge patch 2 before patch 1, right?
No, patch 1 before patch 2.
Quoted 7 lines
Quoted 2 lines
Oh, I didn't notice that your first add a duplicated version of the macro and then unify it. That's a bit backwards ...
The reason for doing it this way is so we can cherry-pick patch 1 into the chromeos 3.10 kernel cleanly (with some other backlight patches). That is, patch 1 is decoupled from the changes in
intel_display.c. Hope that makes sense.
Yeah. Would be good to mention that in the commit message, e.g. "For easier backporting Duplicate the division macro here and refactor the code in a follow-up patch". I'll add that when merging if you don't resend. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
Quoted 59 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, September 30, 2014 10:23 AM
To: Eoff, Ullysses A
Cc: Daniel Vetter; [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/2 v3] drm/i915:intel_backlightscale()math WAQuoted 51 lines · Ullysses A
Quoted 50 lines
-----Original Message-----
From: Daniel Vetter [mailto:[email protected]] On Behalf Of Daniel Vetter
Sent: Tuesday, September 30, 2014 9:32 AM
To: Eoff, Ullysses A
Cc: [email protected]; [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/2 v3] drm/i915:intel_backlightscale()math WAQuoted 33 lines · Ullysses A
Quoted 23 lines · Daniel Vetter
Quoted 13 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
Quoted 8 lines
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>Quoted 8 lines
Is there some bug report, internal jira, mailing list reference or similar about this?
Note that at least for OTC jira tasks we now want them to be added to commit message with e.g.
OTC-Jria: VIZ-4932
Quoted 6 lines
Yes, the OTC-Jira task is: VIZ-4395. I'll resubmit with amended commit message.
Quoted 1 line
And I guess I should merge patch 2 before patch 1, right?
No, patch 1 before patch 2.
Oh, I didn't notice that your first add a duplicated version of the macro and then unify it. That's a bit backwards ...
Quoted 8 lines
Quoted 4 lines
The reason for doing it this way is so we can cherry-pick patch 1 into the chromeos 3.10 kernel cleanly (with some other backlight patches). That is, patch 1 is decoupled from the changes in
intel_display.c. Hope that makes sense.Yeah. Would be good to mention that in the commit message, e.g. "For easier backporting Duplicate the division macro here and refactor the code in a follow-up patch". I'll add that when merging if you don't resend.
Agreed. I'll let you amend the message while merging if you don't mind.
I'll get the process right in another round ;-)
Thanks for your support!
U. Artie
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 1/2 v3] drm/i915: intel_backlight scale() math WA
In reply to U. Artie EoffQuoted 51 lines · U. Artie Eoff
Improper truncated integer division in the
scale()function causesactual_brightness!= brightness. This (partial) work-around should be sufficient for a majority of use-cases, but it is by no means a complete solution.TODO: Determine how best to scale "user" values to "hw" values, and vice-versa, when the ranges are of different sizes. That would be a buggy scenario even with this work-around.
The issue was introduced in the following (v3.17-rc1) commit:
6dda730 drm/i915: respect the VBT minimum backlight brightness
v2: (thanks to Chris Wilson) clarify commit message, use rounded division macro
v3: -DIV_ROUND_CLOSEST() fails to build with
CONFIG_X86_32=y. (Jani)
-UseDIV_ROUND_CLOSEST_ULL()instead. (Damien)
-v1 and v2 originally authored by Joe Konno.Signed-off-by U. Artie Eoff <[email protected]>--- drivers/gpu/drm/i915/intel_panel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_panel.c +5
-3@@ -398,6 +398,9 @@ intel_panel_detect(struct drm_device *dev) } } +#define DIV_ROUND_CLOSEST_ULL (ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) +/** * scale - scale values from one range to another * @@ -419,9 +422,8 @@ static uint32_t scale(uint32_t source_val, source_val =clamp (source_val, source_min, source_max);/* avoid overflows */ - target_val = (uint64_t )(source_val - source_min) * - (target_max - target_min); -do_div (target_val, source_max - source_min); + target_val =DIV_ROUND_CLOSEST_ULL ((uint64_t )(source_val - source_min) * + (target_max - target_min), source_max - source_min); target_val += target_min;return target_val;
PATCH 2/2 drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
In reply to U. Artie EoffMove the duplicated DIV_ROUND_CLOSEST_ULL macro into the intel_drv.h header file so that it can be shared between intel_display.c and intel_panel.c.
--- drivers/gpu/drm/i915/intel_display.c | 3 --- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_panel.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -3
@@ -73,9 +73,6 @@ static const uint32_t intel_cursor_formats[] = { DRM_FORMAT_ARGB8888, }; -#define DIV_ROUND_CLOSEST_ULL (ll, d) \ -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) -static void intel_increase_pllclock (struct drm_device *dev,enum pipe pipe);static void intel_crtc_update_cursor (struct drm_crtc *crtc,bool on);
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -36,6 +36,9 @@#include <drm/drm_dp_mst_helper.h> #include <drm/drm_rect.h> +#define DIV_ROUND_CLOSEST_ULL (ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) +/** * _wait_for - magic (register) wait macro *
drivers/gpu/drm/i915/intel_panel.c +0 -3
@@ -398,9 +398,6 @@ intel_panel_detect(struct drm_device *dev) } } -#define DIV_ROUND_CLOSEST_ULL (ll, d) \ -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) -/** * scale - scale values from one range to another *
Signature · 1 line
1.9.3
Re: [PATCH 2/2] drm/i915: Move DIV_ROUND_CLOSEST_ULL macro to header
Quoted 53 lines · U. Artie Eoff
Move the duplicated
DIV_ROUND_CLOSEST_ULLmacro into theintel_drv.hheader file so that it can be shared betweenintel_display.candintel_panel.c.Signed-off-by U. Artie Eoff <[email protected]>--- drivers/gpu/drm/i915/intel_display.c | 3 --- drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_panel.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-3@@ -73,9 +73,6 @@ static const uint32_t intel_cursor_formats[] = { DRM_FORMAT_ARGB8888, }; -#define DIV_ROUND_CLOSEST_ULL (ll, d) \ -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) -static void intel_increase_pllclock (struct drm_device *dev,enum pipe pipe);static void intel_crtc_update_cursor (struct drm_crtc *crtc,bool on);drivers/gpu/drm/i915/intel_drv.h +3
-0@@ -36,6 +36,9 @@#include <drm/drm_dp_mst_helper.h> #include <drm/drm_rect.h> +#define DIV_ROUND_CLOSEST_ULL (ll, d) \ +({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) +/** * _wait_for - magic (register) wait macro * drivers/gpu/drm/i915/intel_panel.c +0
-3@@ -398,9 +398,6 @@ intel_panel_detect(struct drm_device *dev) } } -#define DIV_ROUND_CLOSEST_ULL (ll, d) \ -({ unsigned long long _tmp = (ll)+(d)/2; do_div(_tmp, d); _tmp; }) -/** * scale - scale values from one range to another *