diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-08-17 12:09:53 -0400 |
| commit | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (patch) | |
| tree | 9252cd09defdd29742af6b2bd22db72ce252ab1a /drivers/gpu/drm/i915/intel_panel.c | |
| parent | af7a950284af5526a26b4ae4809c1104b4dc47f3 (diff) | |
| parent | c5624f554600ab812fe235690665ee81413cebc3 (diff) | |
Merge commit 'v3.0.2' into linaro-3.0
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index a06ff07a4d3..05f500cd9c2 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -83,11 +83,15 @@ intel_pch_panel_fitting(struct drm_device *dev, 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; |