linux-next: build failure after merge of the drm tree

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/intel_hdmi.c: In function 'intel_enable_hdmi':
drivers/gpu/drm/i915/intel_hdmi.c:633:31: error: 'mode' undeclared (first use in this function)

Caused by commit b98b60167279 ("drm/i915: HDMI - Clear Audio Enable bit
for Hot Plug") from Linus' tree interacting with commit 5ab432ef4997
("drm/i915/hdmi: convert to encoder->disable/enable") from the drm tree.

I added the following merge fix patch (which may be wrong, of course):

From: Stephen Rothwell <redacted>
Date: Mon, 24 Sep 2012 13:14:40 +1000
Subject: [PATCH] drm/i915: HDMI: update for API change

Signed-off-by: Stephen Rothwell <redacted>
---
 drivers/gpu/drm/i915/intel_hdmi.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 2ec9c76..d39ed58 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c

@@ -630,7 +630,7 @@ static void intel_enable_hdmi(struct intel_encoder *encoder)
 	u32 temp;
 	u32 enable_bits = SDVO_ENABLE;
 
-	if (intel_hdmi->has_audio || mode != DRM_MODE_DPMS_ON)
+	if (intel_hdmi->has_audio)
 		enable_bits |= SDVO_AUDIO_ENABLE;
 
 	temp = I915_READ(intel_hdmi->sdvox_reg);

@@ -676,8 +676,7 @@ static void intel_disable_hdmi(struct intel_encoder *encoder)
 	u32 temp;
 	u32 enable_bits = SDVO_ENABLE;
 
-	if (intel_hdmi->has_audio)
-		enable_bits |= SDVO_AUDIO_ENABLE;
+	enable_bits |= SDVO_AUDIO_ENABLE;
 
 	temp = I915_READ(intel_hdmi->sdvox_reg);
 

-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

On Mon, Sep 24, 2012 at 01:18:34PM +1000, Stephen Rothwell wrote:

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/gpu/drm/i915/intel_hdmi.c: In function 'intel_enable_hdmi':
drivers/gpu/drm/i915/intel_hdmi.c:633:31: error: 'mode' undeclared (first use in this function)

Caused by commit b98b60167279 ("drm/i915: HDMI - Clear Audio Enable bit
for Hot Plug") from Linus' tree interacting with commit 5ab432ef4997
("drm/i915/hdmi: convert to encoder->disable/enable") from the drm tree.

I added the following merge fix patch (which may be wrong, of course):

From: Stephen Rothwell <redacted>
Date: Mon, 24 Sep 2012 13:14:40 +1000
Subject: [PATCH] drm/i915: HDMI: update for API change

Signed-off-by: Stephen Rothwell <redacted>

Looks good. I've known about this issue and tried to improve matters by
applying the patch to both trees (to at least force a conflict), but not
even with that patch applied in my drm-intel-next queue I get a proper
conflict. I guess I need to do a proper backmerge.

Fixup patch looks good for now.

Thanks, Daniel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Hi Daniel,

On Mon, 24 Sep 2012 13:31:54 +0200 Daniel Vetter [off-list ref] wrote:

Looks good. I've known about this issue and tried to improve matters by
applying the patch to both trees (to at least force a conflict), but not
even with that patch applied in my drm-intel-next queue I get a proper
conflict. I guess I need to do a proper backmerge.

Fixup patch looks good for now.

If that is all that is needed, just make sure Linus is informed of the
merge conflict fix when he merged the drm tree.  If there is more, it is
up to you and Dave.  If you do a back merge, make sure that it is
properly commented.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au