linux-next: manual merge of the drm-misc tree with the drm-intel-fixes tree

From: Stephen Rothwell
Date: Tue Nov 17 2015 - 19:42:30 EST

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:


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).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

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);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at