From: Mark Brown <broonie@kernel.org>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the drm-intel tree with the tree
Date: Wed, 3 Sep 2014 14:37:29 +0100 [thread overview]
Message-ID: <20140903133729.GM29327@sirena.org.uk> (raw)
In-Reply-To: <20140903143146.88d4b3ada1e3098989139540@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
On Wed, Sep 03, 2014 at 02:31:46PM +0100, Mark Brown wrote:
> @@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
>
> I915_WRITE(VLV_MASTER_IER, 0);
>
> - for_each_pipe(pipe)
> + intel_hpd_irq_uninstall(dev_priv);
> +
> + for_each_pipe(dev_priv, pipe)
> I915_WRITE(PIPESTAT(pipe), 0xffff);
>
> I915_WRITE(HWSTAM, 0xffffffff);
...or actually this since the above doesn't build, I was too hasty:
@@ -3923,7 +3942,9 @@ static void valleyview_irq_uninstall(struct drm_device *dev)
I915_WRITE(VLV_MASTER_IER, 0);
- for_each_pipe(pipe)
+
+ for_each_pipe(dev_priv, pipe)
I915_WRITE(PIPESTAT(pipe), 0xffff);
I915_WRITE(HWSTAM, 0xffffffff);
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-09-03 13:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 13:31 linux-next: manual merge of the drm-intel tree with the tree Mark Brown
2014-09-03 13:37 ` Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-15 1:26 Stephen Rothwell
2014-03-09 19:19 Mark Brown
2014-02-10 1:59 Stephen Rothwell
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=20140903133729.GM29327@sirena.org.uk \
--to=broonie@kernel.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).