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

[Mark Brown]

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);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20140903/736a97be/attachment-0001.sig>