From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org
Cc: Jani Nikula <jani.nikula@intel•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the drm-misc tree with the drm-intel-fixes tree
Date: Wed, 18 Nov 2015 11:41:47 +1100 [thread overview]
Message-ID: <20151118114147.0bbfbbc8@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commit:
76dc3769d7c3 ("drm/i915: Don't clobber the addfb2 ioctl params")
from the drm-intel-fixes tree and commit:
528344410b5c ("drm: Pass the user drm_mode_fb_cmd2 as const to .fb_create()")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
BTW, that drm-misc patch looks incomplete without the drm-intel-fixes
patch and presumably caused a new build warning (unless you only tested
the combined branches).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/gpu/drm/i915/intel_display.c
index 98eaea3e5ed6,e78bd7f69d72..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -14583,14 -14364,12 +14583,14 @@@ static int intel_framebuffer_init(struc
static struct drm_framebuffer *
intel_user_framebuffer_create(struct drm_device *dev,
struct drm_file *filp,
- struct drm_mode_fb_cmd2 *user_mode_cmd)
- const struct drm_mode_fb_cmd2 *mode_cmd)
++ const struct drm_mode_fb_cmd2 *user_mode_cmd)
{
+ struct drm_framebuffer *fb;
struct drm_i915_gem_object *obj;
+ struct drm_mode_fb_cmd2 mode_cmd = *user_mode_cmd;
obj = to_intel_bo(drm_gem_object_lookup(dev, filp,
- mode_cmd->handles[0]));
+ mode_cmd.handles[0]));
if (&obj->base == NULL)
return ERR_PTR(-ENOENT);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists•freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
reply other threads:[~2015-11-18 0:41 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=20151118114147.0bbfbbc8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@intel$(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