mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +00:00
302983e905
Consider a 1600x900 panel, upscaling a 1360x768 mode, full-aspect. The old math would give you: scaled_width = 1600 * 768; /* 1228800 */ scaled_height = 1360 * 900; /* 1224000 */ if (scaled_width > scaled_height) { /* pillarbox, and true */ width = 1224000 / 768; /* int(1593.75) = 1593 */ x = (1600 - 1593 + 1) / 2; /* 4 */ y = 0; height = 768; } /* ... */ This is broken. The total width of scanout would then be 1593 + 4 + 4, or 1601, which is wider than the panel itself. The hardware very dutifully implements this, and you end up with a black 45° diagonal from the top-left corner to the bottom edge of the screen. It's a cool effect and all, but not what you wanted. Similar things happen for the letterbox case. The problem is that you have an integer number of pixels, which means it's usually impossible to upscale equally on both axes. 1360/768 is 1.7708, 1600/900 is 1.7777. Since we're constrained on the one axis, the other one wants to come out as an even number of pixels (the panel is almost certainly even on both axes, and the x/y offsets will be applied on both sides). In the math above, if 'width' comes out even, rounding down is correct; if it's odd, you'd rather round up. So just increment width/height in those cases. Tested on a Lenovo T500 (Ironlake). Signed-off-by: Adam Jackson <ajax@redhat.com> Tested-By: Daniel Manrique <daniel.manrique@canonical.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38851 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: stable@kernel.org Signed-off-by: Keith Packard <keithp@keithp.com>
312 lines
8.4 KiB
C
312 lines
8.4 KiB
C
/*
|
|
* Copyright © 2006-2010 Intel Corporation
|
|
* Copyright (c) 2006 Dave Airlie <airlied@linux.ie>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Eric Anholt <eric@anholt.net>
|
|
* Dave Airlie <airlied@linux.ie>
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
* Chris Wilson <chris@chris-wilson.co.uk>
|
|
*/
|
|
|
|
#include "intel_drv.h"
|
|
|
|
#define PCI_LBPC 0xf4 /* legacy/combination backlight modes */
|
|
|
|
void
|
|
intel_fixed_panel_mode(struct drm_display_mode *fixed_mode,
|
|
struct drm_display_mode *adjusted_mode)
|
|
{
|
|
adjusted_mode->hdisplay = fixed_mode->hdisplay;
|
|
adjusted_mode->hsync_start = fixed_mode->hsync_start;
|
|
adjusted_mode->hsync_end = fixed_mode->hsync_end;
|
|
adjusted_mode->htotal = fixed_mode->htotal;
|
|
|
|
adjusted_mode->vdisplay = fixed_mode->vdisplay;
|
|
adjusted_mode->vsync_start = fixed_mode->vsync_start;
|
|
adjusted_mode->vsync_end = fixed_mode->vsync_end;
|
|
adjusted_mode->vtotal = fixed_mode->vtotal;
|
|
|
|
adjusted_mode->clock = fixed_mode->clock;
|
|
|
|
drm_mode_set_crtcinfo(adjusted_mode, CRTC_INTERLACE_HALVE_V);
|
|
}
|
|
|
|
/* adjusted_mode has been preset to be the panel's fixed mode */
|
|
void
|
|
intel_pch_panel_fitting(struct drm_device *dev,
|
|
int fitting_mode,
|
|
struct drm_display_mode *mode,
|
|
struct drm_display_mode *adjusted_mode)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
int x, y, width, height;
|
|
|
|
x = y = width = height = 0;
|
|
|
|
/* Native modes don't need fitting */
|
|
if (adjusted_mode->hdisplay == mode->hdisplay &&
|
|
adjusted_mode->vdisplay == mode->vdisplay)
|
|
goto done;
|
|
|
|
switch (fitting_mode) {
|
|
case DRM_MODE_SCALE_CENTER:
|
|
width = mode->hdisplay;
|
|
height = mode->vdisplay;
|
|
x = (adjusted_mode->hdisplay - width + 1)/2;
|
|
y = (adjusted_mode->vdisplay - height + 1)/2;
|
|
break;
|
|
|
|
case DRM_MODE_SCALE_ASPECT:
|
|
/* Scale but preserve the aspect ratio */
|
|
{
|
|
u32 scaled_width = adjusted_mode->hdisplay * mode->vdisplay;
|
|
u32 scaled_height = mode->hdisplay * adjusted_mode->vdisplay;
|
|
if (scaled_width > scaled_height) { /* pillar */
|
|
width = scaled_height / mode->vdisplay;
|
|
if (width & 1)
|
|
width++;
|
|
x = (adjusted_mode->hdisplay - width + 1) / 2;
|
|
y = 0;
|
|
height = adjusted_mode->vdisplay;
|
|
} else if (scaled_width < scaled_height) { /* letter */
|
|
height = scaled_width / mode->hdisplay;
|
|
if (height & 1)
|
|
height++;
|
|
y = (adjusted_mode->vdisplay - height + 1) / 2;
|
|
x = 0;
|
|
width = adjusted_mode->hdisplay;
|
|
} else {
|
|
x = y = 0;
|
|
width = adjusted_mode->hdisplay;
|
|
height = adjusted_mode->vdisplay;
|
|
}
|
|
}
|
|
break;
|
|
|
|
default:
|
|
case DRM_MODE_SCALE_FULLSCREEN:
|
|
x = y = 0;
|
|
width = adjusted_mode->hdisplay;
|
|
height = adjusted_mode->vdisplay;
|
|
break;
|
|
}
|
|
|
|
done:
|
|
dev_priv->pch_pf_pos = (x << 16) | y;
|
|
dev_priv->pch_pf_size = (width << 16) | height;
|
|
}
|
|
|
|
static int is_backlight_combination_mode(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
if (INTEL_INFO(dev)->gen >= 4)
|
|
return I915_READ(BLC_PWM_CTL2) & BLM_COMBINATION_MODE;
|
|
|
|
if (IS_GEN2(dev))
|
|
return I915_READ(BLC_PWM_CTL) & BLM_LEGACY_MODE;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static u32 i915_read_blc_pwm_ctl(struct drm_i915_private *dev_priv)
|
|
{
|
|
u32 val;
|
|
|
|
/* Restore the CTL value if it lost, e.g. GPU reset */
|
|
|
|
if (HAS_PCH_SPLIT(dev_priv->dev)) {
|
|
val = I915_READ(BLC_PWM_PCH_CTL2);
|
|
if (dev_priv->saveBLC_PWM_CTL2 == 0) {
|
|
dev_priv->saveBLC_PWM_CTL2 = val;
|
|
} else if (val == 0) {
|
|
I915_WRITE(BLC_PWM_PCH_CTL2,
|
|
dev_priv->saveBLC_PWM_CTL);
|
|
val = dev_priv->saveBLC_PWM_CTL;
|
|
}
|
|
} else {
|
|
val = I915_READ(BLC_PWM_CTL);
|
|
if (dev_priv->saveBLC_PWM_CTL == 0) {
|
|
dev_priv->saveBLC_PWM_CTL = val;
|
|
dev_priv->saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
|
|
} else if (val == 0) {
|
|
I915_WRITE(BLC_PWM_CTL,
|
|
dev_priv->saveBLC_PWM_CTL);
|
|
I915_WRITE(BLC_PWM_CTL2,
|
|
dev_priv->saveBLC_PWM_CTL2);
|
|
val = dev_priv->saveBLC_PWM_CTL;
|
|
}
|
|
}
|
|
|
|
return val;
|
|
}
|
|
|
|
u32 intel_panel_get_max_backlight(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
u32 max;
|
|
|
|
max = i915_read_blc_pwm_ctl(dev_priv);
|
|
if (max == 0) {
|
|
/* XXX add code here to query mode clock or hardware clock
|
|
* and program max PWM appropriately.
|
|
*/
|
|
printk_once(KERN_WARNING "fixme: max PWM is zero.\n");
|
|
return 1;
|
|
}
|
|
|
|
if (HAS_PCH_SPLIT(dev)) {
|
|
max >>= 16;
|
|
} else {
|
|
if (IS_PINEVIEW(dev)) {
|
|
max >>= 17;
|
|
} else {
|
|
max >>= 16;
|
|
if (INTEL_INFO(dev)->gen < 4)
|
|
max &= ~1;
|
|
}
|
|
|
|
if (is_backlight_combination_mode(dev))
|
|
max *= 0xff;
|
|
}
|
|
|
|
DRM_DEBUG_DRIVER("max backlight PWM = %d\n", max);
|
|
return max;
|
|
}
|
|
|
|
u32 intel_panel_get_backlight(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
u32 val;
|
|
|
|
if (HAS_PCH_SPLIT(dev)) {
|
|
val = I915_READ(BLC_PWM_CPU_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
|
|
} else {
|
|
val = I915_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;
|
|
if (IS_PINEVIEW(dev))
|
|
val >>= 1;
|
|
|
|
if (is_backlight_combination_mode(dev)){
|
|
u8 lbpc;
|
|
|
|
val &= ~1;
|
|
pci_read_config_byte(dev->pdev, PCI_LBPC, &lbpc);
|
|
val *= lbpc;
|
|
}
|
|
}
|
|
|
|
DRM_DEBUG_DRIVER("get backlight PWM = %d\n", val);
|
|
return val;
|
|
}
|
|
|
|
static void intel_pch_panel_set_backlight(struct drm_device *dev, u32 level)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
u32 val = I915_READ(BLC_PWM_CPU_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
|
|
I915_WRITE(BLC_PWM_CPU_CTL, val | level);
|
|
}
|
|
|
|
void intel_panel_set_backlight(struct drm_device *dev, u32 level)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
u32 tmp;
|
|
|
|
DRM_DEBUG_DRIVER("set backlight PWM = %d\n", level);
|
|
|
|
if (HAS_PCH_SPLIT(dev))
|
|
return intel_pch_panel_set_backlight(dev, level);
|
|
|
|
if (is_backlight_combination_mode(dev)){
|
|
u32 max = intel_panel_get_max_backlight(dev);
|
|
u8 lbpc;
|
|
|
|
lbpc = level * 0xfe / max + 1;
|
|
level /= lbpc;
|
|
pci_write_config_byte(dev->pdev, PCI_LBPC, lbpc);
|
|
}
|
|
|
|
tmp = I915_READ(BLC_PWM_CTL);
|
|
if (IS_PINEVIEW(dev)) {
|
|
tmp &= ~(BACKLIGHT_DUTY_CYCLE_MASK - 1);
|
|
level <<= 1;
|
|
} else
|
|
tmp &= ~BACKLIGHT_DUTY_CYCLE_MASK;
|
|
I915_WRITE(BLC_PWM_CTL, tmp | level);
|
|
}
|
|
|
|
void intel_panel_disable_backlight(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
if (dev_priv->backlight_enabled) {
|
|
dev_priv->backlight_level = intel_panel_get_backlight(dev);
|
|
dev_priv->backlight_enabled = false;
|
|
}
|
|
|
|
intel_panel_set_backlight(dev, 0);
|
|
}
|
|
|
|
void intel_panel_enable_backlight(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
if (dev_priv->backlight_level == 0)
|
|
dev_priv->backlight_level = intel_panel_get_max_backlight(dev);
|
|
|
|
intel_panel_set_backlight(dev, dev_priv->backlight_level);
|
|
dev_priv->backlight_enabled = true;
|
|
}
|
|
|
|
void intel_panel_setup_backlight(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
|
|
dev_priv->backlight_level = intel_panel_get_backlight(dev);
|
|
dev_priv->backlight_enabled = dev_priv->backlight_level != 0;
|
|
}
|
|
|
|
enum drm_connector_status
|
|
intel_panel_detect(struct drm_device *dev)
|
|
{
|
|
#if 0
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
#endif
|
|
|
|
if (i915_panel_ignore_lid)
|
|
return i915_panel_ignore_lid > 0 ?
|
|
connector_status_connected :
|
|
connector_status_disconnected;
|
|
|
|
/* opregion lid state on HP 2540p is wrong at boot up,
|
|
* appears to be either the BIOS or Linux ACPI fault */
|
|
#if 0
|
|
/* Assume that the BIOS does not lie through the OpRegion... */
|
|
if (dev_priv->opregion.lid_state)
|
|
return ioread32(dev_priv->opregion.lid_state) & 0x1 ?
|
|
connector_status_connected :
|
|
connector_status_disconnected;
|
|
#endif
|
|
|
|
return connector_status_unknown;
|
|
}
|