drm/i915: safeguard against too high minimum brightness
Subsystems (2)
PATCH 1/1 drm/i915: safeguard against too high minimum brightness
Never trust (your interpretation of) the VBT. Regression from
commit 6dda730e55f412a6dfb181cae6784822ba463847
Author: Jani Nikula <[email protected]> Date: Tue Jun 24 18:27:40 2014 +0300
drm/i915: respect the VBT minimum backlight brightness
causing div by zero if VBT minimum brightness equals maximum brightness.
Despite my attempts I've failed in my detective work to figure out what the root cause is. This is not the real fix, but we have to do something.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=86551
--- drivers/gpu/drm/i915/intel_panel.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_panel.c +15 -2
@@ -1094,12 +1094,25 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)struct drm_device *dev = connector->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_panel *panel = &connector->panel; +int min;WARN_ON (panel->backlight.max ==0 ); +/* +* XXX: If the vbt value is 255, it makes min equal to max, which leads +* to problems. There are such machines out there. Either our +* interpretation is wrong or the vbt has bogus data. Or both. Safeguard +* against this by letting the minimum be at most (arbitrarily chosen) +* 25% of the max. +*/ + min =clamp_t (int, dev_priv->vbt.backlight.min_brightness,0 ,64 ); +if (min != dev_priv->vbt.backlight.min_brightness) { +DRM_DEBUG_KMS ("clamping VBT min backlight %d/255 to %d/255\n" , + dev_priv->vbt.backlight.min_brightness, min); + } +/* vbt value is a coefficient in range [0..255] */ -return scale (dev_priv->vbt.backlight.min_brightness,0 ,255 , -0 , panel->backlight.max); +return scale (min,0 ,255 ,0 , panel->backlight.max); }static int bdw_setup_backlight (struct intel_connector *connector)
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 32 lines · Jani Nikula
Never trust (your interpretation of) the VBT. Regression from
commit
6dda730e55f412a6dfb181cae6784822ba463847Author: Jani Nikula <[email protected]> Date: Tue Jun 24 18:27:40 2014 +0300drm/i915: respect the VBT minimum backlight brightness
causing div by zero if VBT minimum brightness equals maximum brightness.
Despite my attempts I've failed in my detective work to figure out what the root cause is. This is not the real fix, but we have to do something.
Reported-by Mike Auty <[email protected]>Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=86551
Cc [email protected] (v3.17+)Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_panel.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_panel.c +1
-0@@ -1094,12 +1094,25 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)struct drm_device *dev = connector->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_panel *panel = &connector->panel; +int min;
drivers/gpu/drm/i915/intel_panel.c static u32 get_backlight_min_vbt(struct intel_connector *connector) · line 1108
Quoted 10 lines
drivers/gpu/drm/i915/intel_panel.c +8
-0WARN_ON (panel->backlight.max ==0 ); +/* +* XXX: If the vbt value is 255, it makes min equal to max, which leads +* to problems. There are such machines out there. Either our +* interpretation is wrong or the vbt has bogus data. Or both. Safeguard +* against this by letting the minimum be at most (arbitrarily chosen) +* 25% of the max. +*/ + min =clamp_t (int, dev_priv->vbt.backlight.min_brightness,0 ,64 );
min_brightness is unsigned everywhere I've look, so a min_t looks sufficient here. Otherwise
Also, more gin pls :(
-Daniel
Quoted 19 lines
drivers/gpu/drm/i915/intel_panel.c +6
-2+if (min != dev_priv->vbt.backlight.min_brightness) { +DRM_DEBUG_KMS ("clamping VBT min backlight %d/255 to %d/255\n" , + dev_priv->vbt.backlight.min_brightness, min); + } +/* vbt value is a coefficient in range [0..255] */ -return scale (dev_priv->vbt.backlight.min_brightness,0 ,255 , -0 , panel->backlight.max); +return scale (min,0 ,255 ,0 , panel->backlight.max); }static int bdw_setup_backlight (struct intel_connector *connector)Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
AppliedQuoted 47 lines · Daniel Vetter
Quoted 32 lines · Jani Nikula
Never trust (your interpretation of) the VBT. Regression from
commit
6dda730e55f412a6dfb181cae6784822ba463847Author: Jani Nikula <[email protected]> Date: Tue Jun 24 18:27:40 2014 +0300drm/i915: respect the VBT minimum backlight brightness
causing div by zero if VBT minimum brightness equals maximum brightness.
Despite my attempts I've failed in my detective work to figure out what the root cause is. This is not the real fix, but we have to do something.
Reported-by Mike Auty <[email protected]>Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=86551
Cc [email protected] (v3.17+)Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/intel_panel.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_panel.c +1
-0@@ -1094,12 +1094,25 @@ static u32 get_backlight_min_vbt(struct intel_connector *connector)struct drm_device *dev = connector->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_panel *panel = &connector->panel; +int min;drivers/gpu/drm/i915/intel_panel.c static u32 get_backlight_min_vbt(struct intel_connector *connector) · line 1108
Quoted 10 lines
drivers/gpu/drm/i915/intel_panel.c +8
-0WARN_ON (panel->backlight.max ==0 ); +/* +* XXX: If the vbt value is 255, it makes min equal to max, which leads +* to problems. There are such machines out there. Either our +* interpretation is wrong or the vbt has bogus data. Or both. Safeguard +* against this by letting the minimum be at most (arbitrarily chosen) +* 25% of the max. +*/ + min =clamp_t (int, dev_priv->vbt.backlight.min_brightness,0 ,64 );
min_brightnessis unsigned everywhere I've look, so amin_tlooks sufficient here. Otherwise
Quoted 1 line
Reviewed-by Daniel Vetter <[email protected]>
Pushed to drm-intel-fixes, thanks for the review.
BR,
Jani.
Quoted 28 lines
Also, more gin pls :(
-DanielQuoted 19 lines
drivers/gpu/drm/i915/intel_panel.c +6
-2+if (min != dev_priv->vbt.backlight.min_brightness) { +DRM_DEBUG_KMS ("clamping VBT min backlight %d/255 to %d/255\n" , + dev_priv->vbt.backlight.min_brightness, min); + } +/* vbt value is a coefficient in range [0..255] */ -return scale (dev_priv->vbt.backlight.min_brightness,0 ,255 , -0 , panel->backlight.max); +return scale (min,0 ,255 ,0 , panel->backlight.max); }static int bdw_setup_backlight (struct intel_connector *connector)Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx