Attachment 113497 Details for Bug 86883 – The patch in https://freedesktop.org/patch/42259/ adapted to Debian Jessie's linux_3.16.7-ckt4-3

[patch] The patch in https://freedesktop.org/patch/42259/ adapted to Debian Jessie's linux_3.16.7-ckt4-3

drm-i915-Align-initial-plane-backing-objects-correctly-debian-jessie.patch (text/plain), 2.56 KB, created by Johannes W on 2015-02-14 21:27:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes W

Created: 2015-02-14 21:27:53 UTC

Size: 2.56 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
>index 9365716..b95f80a 100644
>--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
>+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
>@@ -432,10 +432,7 @@ i915_gem_object_create_stolen_for_preallocated(struct drm_device *dev,
> 			stolen_offset, gtt_offset, size);
> 
> 	/* KISS and expect everything to be page-aligned */
>-	BUG_ON(stolen_offset & 4095);
>-	BUG_ON(size & 4095);
>-
>-	if (WARN_ON(size == 0))
>+	if (WARN_ON(size == 0 || stolen_offset & 4095 || size & 4095))
> 		return NULL;
> 
> 	stolen = kzalloc(sizeof(*stolen), GFP_KERNEL);
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index abed8ee..ce21e74 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -2297,13 +2297,19 @@ static bool intel_alloc_plane_obj(struct intel_crtc *crtc,
> 	struct drm_device *dev = crtc->base.dev;
> 	struct drm_i915_gem_object *obj = NULL;
> 	struct drm_mode_fb_cmd2 mode_cmd = { 0 };
>-	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;
> 
>-	obj = i915_gem_object_create_stolen_for_preallocated(dev, base, base,
>-							     plane_config->size);
>+	obj = i915_gem_object_create_stolen_for_preallocated(dev,
>+							     base_aligned,
>+							     base_aligned,
>+							     size_aligned);
> 	if (!obj)
> 		return false;
> 
>@@ -6134,8 +6140,7 @@ static void i9xx_get_plane_config(struct intel_crtc *crtc,
> 	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
> 					    plane_config->tiled);
> 
>-	plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
>-				   aligned_height, PAGE_SIZE);
>+	plane_config->size = crtc->base.primary->fb->pitches[0] * aligned_height;
> 
> 	DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
> 		      pipe, plane, crtc->base.primary->fb->width,
>@@ -7154,8 +7159,7 @@ static void ironlake_get_plane_config(struct intel_crtc *crtc,
> 	aligned_height = intel_align_height(dev, crtc->base.primary->fb->height,
> 					    plane_config->tiled);
> 
>-	plane_config->size = ALIGN(crtc->base.primary->fb->pitches[0] *
>-				   aligned_height, PAGE_SIZE);
>+	plane_config->size = crtc->base.primary->fb->pitches[0] * aligned_height;
> 
> 	DRM_DEBUG_KMS("pipe/plane %d/%d with fb: size=%dx%d@%d, offset=%x, pitch %d, size 0x%x\n",
> 		      pipe, plane, crtc->base.primary->fb->width,

Actions: View | Splinter Review

Attachments on bug 86883: 110320 | 110791 | 113497

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.