diff for duplicates of <20170220175331.GC963@e110455-lin.cambridge.arm.com>

diff --git a/a/1.txt b/N1/1.txt
index 601e6d3..3ee11a6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -37,11 +37,4 @@ Liviu
 | giving me the   |
  \ source code!  /
   ---------------
-    ?\_(?)_/?
--------------- next part --------------
-A non-text attachment was scrubbed...
-Name: 0001-arm-hdlcd-Fix-the-calculation-of-scanout-start-addre.patch
-Type: text/x-diff
-Size: 1635 bytes
-Desc: not available
-URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170220/c264b8a0/attachment.bin>
+    ¯\_(ツ)_/¯
diff --git a/N1/2.hdr b/N1/2.hdr
new file mode 100644
index 0000000..589bdf8
--- /dev/null
+++ b/N1/2.hdr
@@ -0,0 +1,2 @@
+Content-Type: text/x-diff; charset=utf-8
+Content-Disposition: attachment; filename="0001-arm-hdlcd-Fix-the-calculation-of-scanout-start-addre.patch"
diff --git a/N1/2.txt b/N1/2.txt
new file mode 100644
index 0000000..1a25872
--- /dev/null
+++ b/N1/2.txt
@@ -0,0 +1,47 @@
+>From a495d262cb91fdeccb00685646ddb71774c18e7e Mon Sep 17 00:00:00 2001
+From: Liviu Dudau <Liviu.Dudau@arm.com>
+Date: Mon, 20 Feb 2017 17:44:42 +0000
+Subject: [PATCH] arm: hdlcd: Fix the calculation of scanout start address
+
+The framebuffer start address uses the CRTC's x,y position rather
+than the source framebuffer's. Fix that.
+
+Reported-by: Russell King <rmk+kernel@armlinux.org.uk>
+Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
+---
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c
+index 798a3cc480a2..4c1ab73d9e07 100644
+--- a/drivers/gpu/drm/arm/hdlcd_crtc.c
++++ b/drivers/gpu/drm/arm/hdlcd_crtc.c
+@@ -244,21 +244,20 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane,
+ 	struct drm_framebuffer *fb = plane->state->fb;
+ 	struct hdlcd_drm_private *hdlcd;
+ 	struct drm_gem_cma_object *gem;
+-	u32 src_w, src_h, dest_w, dest_h;
++	u32 src_x, src_y, dest_w, dest_h;
+ 	dma_addr_t scanout_start;
+ 
+ 	if (!fb)
+ 		return;
+ 
+-	src_w = plane->state->src_w >> 16;
+-	src_h = plane->state->src_h >> 16;
++	src_x = plane->state->src_x >> 16;
++	src_y = plane->state->src_y >> 16;
+ 	dest_w = plane->state->crtc_w;
+ 	dest_h = plane->state->crtc_h;
+ 	gem = drm_fb_cma_get_gem_obj(fb, 0);
+ 	scanout_start = gem->paddr + fb->offsets[0] +
+-		plane->state->crtc_y * fb->pitches[0] +
+-		plane->state->crtc_x *
+-		fb->format->cpp[0];
++		src_y * fb->pitches[0] +
++		src_x *	fb->format->cpp[0];
+ 
+ 	hdlcd = plane->dev->dev_private;
+ 	hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, fb->pitches[0]);
+-- 
+2.11.0
diff --git a/N1/3.hdr b/N1/3.hdr
new file mode 100644
index 0000000..5216513
--- /dev/null
+++ b/N1/3.hdr
@@ -0,0 +1,4 @@
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: base64
+Content-Disposition: inline
diff --git a/N1/3.txt b/N1/3.txt
new file mode 100644
index 0000000..3b3a377
--- /dev/null
+++ b/N1/3.txt
@@ -0,0 +1,4 @@
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index bf873f3..f3b6332 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,10 +1,13 @@
  "ref\020161118233733.GP1041@n2100.armlinux.org.uk\0"
  "ref\020170220121603.GA1132@n2100.armlinux.org.uk\0"
- "From\0liviu.dudau@arm.com (Liviu Dudau)\0"
- "Subject\0[BUG] hdlcd gets confused about base address\0"
+ "From\0Liviu Dudau <liviu.dudau@arm.com>\0"
+ "Subject\0Re: [BUG] hdlcd gets confused about base address\0"
  "Date\0Mon, 20 Feb 2017 17:53:31 +0000\0"
- "To\0linux-arm-kernel@lists.infradead.org\0"
- "\00:1\0"
+ "To\0Russell King - ARM Linux <linux@armlinux.org.uk>\0"
+ "Cc\0dri-devel@lists.freedesktop.org"
+  Mali DP Maintainers <malidp@foss.arm.com>
+ " linux-arm-kernel@lists.infradead.org\0"
+ "\01:1\0"
  "b\0"
  "Hi Russell,\n"
  "\n"
@@ -45,13 +48,62 @@
  "| giving me the   |\n"
  " \\ source code!  /\n"
  "  ---------------\n"
- "    ?\\_(?)_/?\n"
- "-------------- next part --------------\n"
- "A non-text attachment was scrubbed...\n"
- "Name: 0001-arm-hdlcd-Fix-the-calculation-of-scanout-start-addre.patch\n"
- "Type: text/x-diff\n"
- "Size: 1635 bytes\n"
- "Desc: not available\n"
- URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170220/c264b8a0/attachment.bin>
+ "    \302\257\\_(\343\203\204)_/\302\257"
+ "\01:2\0"
+ "fn\00001-arm-hdlcd-Fix-the-calculation-of-scanout-start-addre.patch\0"
+ "b\0"
+ ">From a495d262cb91fdeccb00685646ddb71774c18e7e Mon Sep 17 00:00:00 2001\n"
+ "From: Liviu Dudau <Liviu.Dudau@arm.com>\n"
+ "Date: Mon, 20 Feb 2017 17:44:42 +0000\n"
+ "Subject: [PATCH] arm: hdlcd: Fix the calculation of scanout start address\n"
+ "\n"
+ "The framebuffer start address uses the CRTC's x,y position rather\n"
+ "than the source framebuffer's. Fix that.\n"
+ "\n"
+ "Reported-by: Russell King <rmk+kernel@armlinux.org.uk>\n"
+ "Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>\n"
+ "---\n"
+ " drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +++++------\n"
+ " 1 file changed, 5 insertions(+), 6 deletions(-)\n"
+ "\n"
+ "diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c\n"
+ "index 798a3cc480a2..4c1ab73d9e07 100644\n"
+ "--- a/drivers/gpu/drm/arm/hdlcd_crtc.c\n"
+ "+++ b/drivers/gpu/drm/arm/hdlcd_crtc.c\n"
+ "@@ -244,21 +244,20 @@ static void hdlcd_plane_atomic_update(struct drm_plane *plane,\n"
+ " \tstruct drm_framebuffer *fb = plane->state->fb;\n"
+ " \tstruct hdlcd_drm_private *hdlcd;\n"
+ " \tstruct drm_gem_cma_object *gem;\n"
+ "-\tu32 src_w, src_h, dest_w, dest_h;\n"
+ "+\tu32 src_x, src_y, dest_w, dest_h;\n"
+ " \tdma_addr_t scanout_start;\n"
+ " \n"
+ " \tif (!fb)\n"
+ " \t\treturn;\n"
+ " \n"
+ "-\tsrc_w = plane->state->src_w >> 16;\n"
+ "-\tsrc_h = plane->state->src_h >> 16;\n"
+ "+\tsrc_x = plane->state->src_x >> 16;\n"
+ "+\tsrc_y = plane->state->src_y >> 16;\n"
+ " \tdest_w = plane->state->crtc_w;\n"
+ " \tdest_h = plane->state->crtc_h;\n"
+ " \tgem = drm_fb_cma_get_gem_obj(fb, 0);\n"
+ " \tscanout_start = gem->paddr + fb->offsets[0] +\n"
+ "-\t\tplane->state->crtc_y * fb->pitches[0] +\n"
+ "-\t\tplane->state->crtc_x *\n"
+ "-\t\tfb->format->cpp[0];\n"
+ "+\t\tsrc_y * fb->pitches[0] +\n"
+ "+\t\tsrc_x *\tfb->format->cpp[0];\n"
+ " \n"
+ " \thdlcd = plane->dev->dev_private;\n"
+ " \thdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, fb->pitches[0]);\n"
+ "-- \n"
+ 2.11.0
+ "\01:3\0"
+ "b\0"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ https://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-317219a9c76b86b6b383a70114a378df892ce0a667e12b4d940f6fbfea1e5664
+8c032848072aade9c7eaa64920170b983793d4404cd5e5357baa9dab37b12c20
