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

Stephen Rothwell sfr at canb.auug.org.au
Sun Jun 16 20:25:37 PDT 2013


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 d62cf62ad07d
("drm/i915: Quirk the pipe A quirk in the modeset state checker") from
Linus' tree and commit 6c49f24180c3 ("drm/i915: hw state readout support
for pixel_multiplier") from the drm-intel tree.

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

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

diff --cc drivers/gpu/drm/i915/intel_display.c
index 6eb99e1,218bc93..0000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -8177,11 -8264,14 +8264,19 @@@ check_crtc_state(struct drm_device *dev
  
  		active = dev_priv->display.get_pipe_config(crtc,
  							   &pipe_config);
 +
 +		/* hw state is inconsistent with the pipe A quirk */
 +		if (crtc->pipe == PIPE_A && dev_priv->quirks & QUIRK_PIPEA_FORCE)
 +			active = crtc->active;
 +
+ 		list_for_each_entry(encoder, &dev->mode_config.encoder_list,
+ 				    base.head) {
+ 			if (encoder->base.crtc != &crtc->base)
+ 				continue;
+ 			if (encoder->get_config)
+ 				encoder->get_config(encoder, &pipe_config);
+ 		}
+ 
  		WARN(crtc->active != active,
  		     "crtc active state doesn't match with hw state "
  		     "(expected %i, found %i)\n", crtc->active, active);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20130617/c3be2264/attachment.pgp>


More information about the dri-devel mailing list