-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/i915: Enable aspect/centering panel fitting for Ironlake.
v2: Hook in DP paths to keep FULLSCREEN panel fitting on eDP. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
- Loading branch information
Chris Wilson
authored and
Eric Anholt
committed
Aug 9, 2010
1 parent
2e88e40
commit 1d8e1c7
Showing
7 changed files
with
143 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| * 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" | ||
|
|
||
| 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; | ||
| 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; | ||
| 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; | ||
| } |