linux-kernel - linux-next: build failure after merge of the final tree (kgdb and Linus trees interaction)

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: <20100908120445.ffafbf11.sfr@canb.auug.org.au>
Date:	Wed, 8 Sep 2010 12:04:45 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Wessel <jason.wessel@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chris Wilson <chris@...is-wilson.co.uk>,
	Dave Airlie <airlied@...ux.ie>
Subject: linux-next: build failure after merge of the final tree (kgdb and
 Linus trees interaction)

Hi all,

After merging the final tree, today's linux-next build (i386 defconfig)
failed like this:

drivers/gpu/drm/i915/intel_display.c: In function 'intel_pipe_set_base':
drivers/gpu/drm/i915/intel_display.c:1582: error: too few arguments to function 'intel_pipe_set_base_atomic'

Caused by commit 1c5b2529a07ff343731d2b7a44ddedf22951dc6c ("drm,kdb,kms:
Add an enter argument to mode_set_base_atomic() API") (from the kgdb
tree) interacting with commit 4e6cfefc729be2aa20647415317577ed98d4f7bf
("drm/i915: Re-use set_base_atomic to share setting of the display
registers") from Linus' tree (drm fix).

I applied the following merge fix up patch and can carry it for a while.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Wed, 8 Sep 2010 12:02:08 +1000
Subject: [PATCH] kgdb: merge fix for mode_set_base_atomic API change

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

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 4342b42..0dcb647 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1579,7 +1579,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 		return ret;
 	}
 
-	ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y);
+	ret = intel_pipe_set_base_atomic(crtc, crtc->fb, x, y, 0);
 	if (ret) {
 		i915_gem_object_unpin(obj);
 		mutex_unlock(&dev->struct_mutex);
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/