From: Mark Brown <broonie@kernel•org>
To: Rodrigo Vivi <rodrigo.vivi@gmail•com>,
Ben Widawsky <benjamin.widawsky@intel•com>,
Daniel Vetter <daniel.vetter@ffwll•ch>,
David Airlie <airlied@linux•ie>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thierry Reding <thierry.reding@gmail•com>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org
Subject: Conflict in merge of the the drm-intel tree
Date: Fri, 4 Oct 2013 22:02:50 +0100 [thread overview]
Message-ID: <20131004210250.GV27287@sirena.org.uk> (raw)
[-- 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 */
- I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP |
+ I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP |
- EDP_PSR_DEBUG_MASK_HPD);
+ EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP);
intel_dp->psr_setup_done = true;
}
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2013-10-04 21:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131004210250.GV27287@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=airlied@linux$(echo .)ie \
--cc=benjamin.widawsky@intel$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rodrigo.vivi@gmail$(echo .)com \
--cc=thierry.reding@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox