linux-kernel - linux-next: build failure after merge of the drm 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]

Date:	Mon, 8 Sep 2014 14:26:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Paulo Zanoni <paulo.r.zanoni@...el.com>,
	Jani Nikula <jani.nikula@...el.com>,
	Ville Syrjälä <ville.syrjala@...ux.intel.com>,
	Daniel Vetter <daniel.vetter@...ll.ch>
Subject: 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_display.c: In function 'intel_crtc_cursor_set_obj':
drivers/gpu/drm/i915/intel_display.c:8302:24: error: 'dev_priv' undeclared (first use in this function)
   intel_runtime_pm_get(dev_priv);
                        ^

Caused by commit d7ce484eeec4 ("drm/i915: Move CURSIZE setup to
i845_update_cursor()") interacting with commit d6dd6843ff4a ("drm/i915:
fix plane/cursor handling when runtime suspended") from Linus' tree.

I am not sure why this hasn't failed before as both commits have been
in linux-next since (at least) Sept 3.

I have applied this merge fix patch (which reverts part of d7ce484eeec4):

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 8 Sep 2014 14:17:21 +1000
Subject: [PATCH] drm/i915: fix up for recent merge

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/gpu/drm/i915/intel_display.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a1acf8376c0f..18da8349a070 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8253,6 +8253,7 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
 				     uint32_t width, uint32_t height)
 {
 	struct drm_device *dev = crtc->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 	enum pipe pipe = intel_crtc->pipe;
 	unsigned old_width, stride;
-- 
2.1.0

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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)