From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Wessel <jason.wessel@windriver•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chris Wilson <chris@chris-wilson•co.uk>,
Dave Airlie <airlied@linux•ie>
Subject: linux-next: build failure after merge of the final tree (kgdb and Linus trees interaction)
Date: Wed, 8 Sep 2010 12:04:45 +1000 [thread overview]
Message-ID: <20100908120445.ffafbf11.sfr@canb.auug.org.au> (raw)
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@canb•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@canb•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@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
reply other threads:[~2010-09-08 2:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100908120445.ffafbf11.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@linux$(echo .)ie \
--cc=chris@chris-wilson$(echo .)co.uk \
--cc=jason.wessel@windriver$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox