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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 25 Feb 2015 12:05:08 +1100

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit f37b5c2be897
("drm/i915: Align initial plane backing objects correctly") from the
drm-intel-fixes tree and commit 6bf129df6ffa ("drm/i915: Use an
intermediate variable to avoid repeating ourselves") from the drm-intel
tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/i915/intel_display.c
index bf19a5cce4a8,2ac93909cfc5..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2371,11 -2376,8 +2376,12 @@@ intel_alloc_plane_obj(struct intel_crt
  	struct drm_device *dev = crtc->base.dev;
  	struct drm_i915_gem_object *obj = NULL;
  	struct drm_mode_fb_cmd2 mode_cmd = { 0 };
+ 	struct drm_framebuffer *fb = &plane_config->fb->base;
 -	u32 base = plane_config->base;
 +	u32 base_aligned = round_down(plane_config->base, PAGE_SIZE);
 +	u32 size_aligned = round_up(plane_config->base + plane_config->size,
 +				    PAGE_SIZE);
 +
 +	size_aligned -= base_aligned;
  
  	if (plane_config->size == 0)
  		return false;
@@@ -6640,9 -6678,10 +6693,10 @@@ i9xx_get_initial_plane_config(struct in
  	fb->pitches[0] = val & 0xffffffc0;
  
  	aligned_height = intel_fb_align_height(dev, fb->height,
- 					       plane_config->tiling);
+ 					       fb->pixel_format,
+ 					       fb->modifier[0]);
  
 -	plane_config->size = PAGE_ALIGN(fb->pitches[0] * aligned_height);
 +	plane_config->size = fb->pitches[0] * aligned_height;
  
  	DRM_DEBUG_KMS("pipe/plane %c/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
  		      pipe_name(pipe), plane, fb->width, fb->height,
@@@ -7677,9 -7721,10 +7736,10 @@@ skylake_get_initial_plane_config(struc
  	fb->pitches[0] = (val & 0x3ff) * stride_mult;
  
  	aligned_height = intel_fb_align_height(dev, fb->height,
- 					       plane_config->tiling);
+ 					       fb->pixel_format,
+ 					       fb->modifier[0]);
  
 -	plane_config->size = ALIGN(fb->pitches[0] * aligned_height, PAGE_SIZE);
 +	plane_config->size = fb->pitches[0] * aligned_height;
  
  	DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
  		      pipe_name(pipe), fb->width, fb->height,
@@@ -7768,9 -7818,10 +7833,10 @@@ ironlake_get_initial_plane_config(struc
  	fb->pitches[0] = val & 0xffffffc0;
  
  	aligned_height = intel_fb_align_height(dev, fb->height,
- 					       plane_config->tiling);
+ 					       fb->pixel_format,
+ 					       fb->modifier[0]);
  
 -	plane_config->size = PAGE_ALIGN(fb->pitches[0] * aligned_height);
 +	plane_config->size = fb->pitches[0] * aligned_height;
  
  	DRM_DEBUG_KMS("pipe %c with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
  		      pipe_name(pipe), fb->width, fb->height,