[lkml]   [2010]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subjectlinux-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 <>
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 <>
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) {
Stephen Rothwell

 \ /
  Last update: 2010-09-08 04:07    [W:0.018 / U:9.152 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site