[Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit d05410f9a450
("drm/i915: split conversion function out into separate function") from
the drm tree and commit 6b09e72050b4 ("drm/i915: Power gating display
wells during i915_pm_suspend") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

P.S. Daniel, that drm-intel tree commit has no Signed-off-by from its
author ...
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_display.c
index a5af732b87b8,1389d8a30f0a..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -4314,27 -4300,6 +4314,23 @@@ static void i9xx_pfit_enable(struct int
  	I915_WRITE(BCLRPAT(crtc->pipe), 0);
  }
  
 +static enum intel_display_power_domain port_to_power_domain(enum port port)
 +{
 +	switch (port) {
 +	case PORT_A:
 +		return POWER_DOMAIN_PORT_DDI_A_4_LANES;
 +	case PORT_B:
 +		return POWER_DOMAIN_PORT_DDI_B_4_LANES;
 +	case PORT_C:
 +		return POWER_DOMAIN_PORT_DDI_C_4_LANES;
 +	case PORT_D:
 +		return POWER_DOMAIN_PORT_DDI_D_4_LANES;
 +	default:
 +		WARN_ON_ONCE(1);
 +		return POWER_DOMAIN_PORT_OTHER;
 +	}
 +}
 +
- #define for_each_power_domain(domain, mask)				\
- 	for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++)	\
- 		if ((1 << (domain)) & (mask))
- 
  enum intel_display_power_domain
  intel_display_port_power_domain(struct intel_encoder *intel_encoder)
  {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20140723/d85aabca/attachment.sig>