diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2013-04-25 15:55:02 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-25 16:17:59 -0400 |
commit | b074cec8c652f2d273907a4b35239b4766c894ac (patch) | |
tree | 84060aae37f855df66e7422ef8aeeccf64e8fff1 /drivers/gpu/drm/i915/intel_lvds.c | |
parent | 2dd24552cab40ea829ba3fda890eeafd2c4816d8 (diff) |
drm/i915: move PCH pfit controls into pipe_config
And put the pfit stuff into substructs while we're at it.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 7d418818c7a8..3e29499b2e9a 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
@@ -229,7 +229,6 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, | |||
229 | struct intel_connector *intel_connector = | 229 | struct intel_connector *intel_connector = |
230 | &lvds_encoder->attached_connector->base; | 230 | &lvds_encoder->attached_connector->base; |
231 | struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; | 231 | struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode; |
232 | struct drm_display_mode *mode = &pipe_config->requested_mode; | ||
233 | struct intel_crtc *intel_crtc = lvds_encoder->base.new_crtc; | 232 | struct intel_crtc *intel_crtc = lvds_encoder->base.new_crtc; |
234 | unsigned int lvds_bpp; | 233 | unsigned int lvds_bpp; |
235 | int pipe; | 234 | int pipe; |
@@ -267,9 +266,8 @@ static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder, | |||
267 | if (HAS_PCH_SPLIT(dev)) { | 266 | if (HAS_PCH_SPLIT(dev)) { |
268 | pipe_config->has_pch_encoder = true; | 267 | pipe_config->has_pch_encoder = true; |
269 | 268 | ||
270 | intel_pch_panel_fitting(dev, | 269 | intel_pch_panel_fitting(intel_crtc, pipe_config, |
271 | intel_connector->panel.fitting_mode, | 270 | intel_connector->panel.fitting_mode); |
272 | mode, adjusted_mode); | ||
273 | return true; | 271 | return true; |
274 | } else { | 272 | } else { |
275 | intel_gmch_panel_fitting(intel_crtc, pipe_config, | 273 | intel_gmch_panel_fitting(intel_crtc, pipe_config, |