linux-next: manual merge of the drm-intel tree with Linus' tree

Stephen Rothwell
2013-05-21T01:58:21Z

[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 657445fe8660 ("Revert
"drm/i915: revert eDP bpp clamping code changes"") from Linus' tree and
commits c6bb353815c3 ("drm/i915: move dp clock computations to
encoder->compute_config"), af13188a1a66 ("drm/i915: force bpp for eDP
panels") and 52541e30339d ("drm/i915: allow high-bpc modes on DP") from
the drm-intel tree.

I fixed it up (see below and I used the latter two commits instead of the
one from Linus' tree) and can carry the fix as necessary (no action is
required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_dp.c
index 3d704b7,2bb4009..0000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -755,6 -782,10 +783,8 @@@ found
target_clock, adjusted_mode->clock,
&pipe_config->dp_m_n);

- pipe_config->pipe_bpp = bpp;
-
+ intel_dp_set_clock(encoder, pipe_config, intel_dp->link_bw);
+
return true;
}

@@@ -1379,8 -1400,15 +1399,16 @@@ static void intel_enable_dp(struct inte
ironlake_edp_panel_on(intel_dp);
ironlake_edp_panel_vdd_off(intel_dp, true);
intel_dp_complete_link_train(intel_dp);
+ intel_dp_stop_link_train(intel_dp);
ironlake_edp_backlight_on(intel_dp);
+
+ if (IS_VALLEYVIEW(dev)) {
+ struct intel_digital_port *dport =
+ enc_to_dig_port(&encoder->base);
+ int channel = vlv_dport_to_channel(dport);
+
+ vlv_wait_port_ready(dev_priv, channel);
+ }
}

static void intel_pre_enable_dp(struct intel_encoder *encoder)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]