archive mirror
 help / color / mirror / Atom feed
* Conflict in merge of the the drm-intel tree
@ 2013-10-04 21:02 Mark Brown
  0 siblings, 0 replies; only message in thread
From: Mark Brown @ 2013-10-04 21:02 UTC (permalink / raw)
  To: Rodrigo Vivi, Ben Widawsky, Daniel Vetter, David Airlie
  Cc: linux-next, linux-kernel, Thierry Reding, intel-gfx, dri-devel

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

While merging the drm-intel tree into -next there were conflicts in
drivers/gpu/drm/i915/intel_dp.c between 0cc4b69960 (drm/i915: Mask LPSP
to get PSR working even with Power Well in use by audio) in the drm tree
and 18b5992c37 (drm/i915: Calculate PSR register offsets from base +
gen) from the drm-intel tree.

I've fixed this up as below:

diff --cc drivers/gpu/drm/i915/intel_dp.c
index bc6579e,0f77b8c..0000000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -1549,8 -1558,8 +1558,8 @@@ static void intel_edp_psr_setup(struct 
  	intel_edp_psr_write_vsc(intel_dp, &psr_vsc);
  	/* Avoid continuous PSR exit by masking memup and hpd */
  	intel_dp->psr_setup_done = true;

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-10-04 21:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-04 21:02 Conflict in merge of the the drm-intel tree Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).