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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130617133253.f59c0b9a1721111a8e3c75e3@canb.auug.org.au>
Date:	Mon, 17 Jun 2013 13:32:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Vetter <daniel.vetter@...ll.ch>,
	<intel-gfx@...ts.freedesktop.org>,
	<dri-devel@...ts.freedesktop.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chris Wilson <chris@...is-wilson.co.uk>
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_sdvo.c between commit 7ba220cec0bb ("drm/i915:
Enable hotplug interrupts after querying hw capabilities") from Linus'
tree and commit e596a02ccfc6 ("drm/i915: Remove dead code from SDVO
initialisation") 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@...b.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
index 7d31165,b8e1623..0000000
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@@ -2850,18 -2889,12 +2891,6 @@@ bool intel_sdvo_init(struct drm_device 
  		}
  	}
  
- 	hotplug_mask = 0;
- 	if (IS_G4X(dev)) {
- 		hotplug_mask = intel_sdvo->is_sdvob ?
- 			SDVOB_HOTPLUG_INT_STATUS_G4X : SDVOC_HOTPLUG_INT_STATUS_G4X;
- 	} else if (IS_GEN4(dev)) {
- 		hotplug_mask = intel_sdvo->is_sdvob ?
- 			SDVOB_HOTPLUG_INT_STATUS_I965 : SDVOC_HOTPLUG_INT_STATUS_I965;
- 	} else {
- 		hotplug_mask = intel_sdvo->is_sdvob ?
- 			SDVOB_HOTPLUG_INT_STATUS_I915 : SDVOC_HOTPLUG_INT_STATUS_I915;
- 	}
- 
 -	/* Only enable the hotplug irq if we need it, to work around noisy
 -	 * hotplug lines.
 -	 */
 -	if (intel_sdvo->hotplug_active)
 -		intel_encoder->hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C;
 -
  	intel_encoder->compute_config = intel_sdvo_compute_config;
  	intel_encoder->disable = intel_disable_sdvo;
  	intel_encoder->mode_set = intel_sdvo_mode_set;

Content of type "application/pgp-signature" skipped