drm/i915: panel: invert brightness via quirk
commit 4dca20efb1a9c2efefc28ad2867e5d6c3f5e1955 upstream. A machine may need to invert the panel backlight brightness value. This patch adds the infrastructure for a quirk to do so. Signed-off-by: Carsten Emde <C.Emde@osadl.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Acked-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> [wml: Backported to 3.4: - Adjust context - one more flag QUIRK_NO_PCH_PWM_ENABLE] Signed-off-by: Weng Meiling <wengmeiling.weng@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4c4478f4b8
commit
ed0bff16cc
|
@ -993,14 +993,19 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||||
i8k.restricted [HW] Allow controlling fans only if SYS_ADMIN
|
i8k.restricted [HW] Allow controlling fans only if SYS_ADMIN
|
||||||
capability is set.
|
capability is set.
|
||||||
|
|
||||||
i915.invert_brightness
|
i915.invert_brightness=
|
||||||
[DRM] Invert the sense of the variable that is used to
|
[DRM] Invert the sense of the variable that is used to
|
||||||
set the brightness of the panel backlight. Normally a
|
set the brightness of the panel backlight. Normally a
|
||||||
value of 0 indicates backlight switched off, and the
|
brightness value of 0 indicates backlight switched off,
|
||||||
maximum value sets the backlight to maximum brightness.
|
and the maximum of the brightness value sets the backlight
|
||||||
If this parameter is specified, a value of 0 sets the
|
to maximum brightness. If this parameter is set to 0
|
||||||
backlight to maximum brightness, and the maximum value
|
(default) and the machine requires it, or this parameter
|
||||||
switches the backlight off.
|
is set to 1, a brightness value of 0 sets the backlight
|
||||||
|
to maximum brightness, and the maximum of the brightness
|
||||||
|
value switches the backlight off.
|
||||||
|
-1 -- never invert brightness
|
||||||
|
0 -- machine default
|
||||||
|
1 -- force brightness inversion
|
||||||
|
|
||||||
icn= [HW,ISDN]
|
icn= [HW,ISDN]
|
||||||
Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
|
Format: <io>[,<membase>[,<icn_id>[,<icn_id2>]]]
|
||||||
|
|
|
@ -296,7 +296,8 @@ enum intel_pch {
|
||||||
|
|
||||||
#define QUIRK_PIPEA_FORCE (1<<0)
|
#define QUIRK_PIPEA_FORCE (1<<0)
|
||||||
#define QUIRK_LVDS_SSC_DISABLE (1<<1)
|
#define QUIRK_LVDS_SSC_DISABLE (1<<1)
|
||||||
#define QUIRK_NO_PCH_PWM_ENABLE (1<<2)
|
#define QUIRK_INVERT_BRIGHTNESS (1<<2)
|
||||||
|
#define QUIRK_NO_PCH_PWM_ENABLE (1<<3)
|
||||||
|
|
||||||
struct intel_fbdev;
|
struct intel_fbdev;
|
||||||
struct intel_fbc_work;
|
struct intel_fbc_work;
|
||||||
|
|
|
@ -9200,6 +9200,15 @@ static void quirk_no_pcm_pwm_enable(struct drm_device *dev)
|
||||||
DRM_INFO("applying no-PCH_PWM_ENABLE quirk\n");
|
DRM_INFO("applying no-PCH_PWM_ENABLE quirk\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* A machine may need to invert the panel backlight brightness value
|
||||||
|
*/
|
||||||
|
static void quirk_invert_brightness(struct drm_device *dev)
|
||||||
|
{
|
||||||
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||||
|
dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS;
|
||||||
|
}
|
||||||
|
|
||||||
struct intel_quirk {
|
struct intel_quirk {
|
||||||
int device;
|
int device;
|
||||||
int subsystem_vendor;
|
int subsystem_vendor;
|
||||||
|
|
|
@ -190,15 +190,22 @@ u32 intel_panel_get_max_backlight(struct drm_device *dev)
|
||||||
return max;
|
return max;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool i915_panel_invert_brightness;
|
static int i915_panel_invert_brightness;
|
||||||
MODULE_PARM_DESC(invert_brightness, "Invert backlight brightness, please "
|
MODULE_PARM_DESC(invert_brightness, "Invert backlight brightness "
|
||||||
|
"(-1 force normal, 0 machine defaults, 1 force inversion), please "
|
||||||
"report PCI device ID, subsystem vendor and subsystem device ID "
|
"report PCI device ID, subsystem vendor and subsystem device ID "
|
||||||
"to dri-devel@lists.freedesktop.org, if your machine needs it. "
|
"to dri-devel@lists.freedesktop.org, if your machine needs it. "
|
||||||
"It will then be included in an upcoming module version.");
|
"It will then be included in an upcoming module version.");
|
||||||
module_param_named(invert_brightness, i915_panel_invert_brightness, bool, 0600);
|
module_param_named(invert_brightness, i915_panel_invert_brightness, int, 0600);
|
||||||
static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
|
static u32 intel_panel_compute_brightness(struct drm_device *dev, u32 val)
|
||||||
{
|
{
|
||||||
if (i915_panel_invert_brightness)
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||||
|
|
||||||
|
if (i915_panel_invert_brightness < 0)
|
||||||
|
return val;
|
||||||
|
|
||||||
|
if (i915_panel_invert_brightness > 0 ||
|
||||||
|
dev_priv->quirks & QUIRK_INVERT_BRIGHTNESS)
|
||||||
return intel_panel_get_max_backlight(dev) - val;
|
return intel_panel_get_max_backlight(dev) - val;
|
||||||
|
|
||||||
return val;
|
return val;
|
||||||
|
|
Loading…
Reference in New Issue