diff for duplicates of <1488547649.2940.5.camel@synopsys.com>

diff --git a/a/1.txt b/N1/1.txt
index 74b67fa..7cb29cf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 Hi Daniel,
 
-On Thu, 2017-03-02@20:54 +0100, Daniel Vetter wrote:
-> On Thu, Mar 02, 2017@08:27:54PM +0300, Alexey Brodkin wrote:
+On Thu, 2017-03-02 at 20:54 +0100, Daniel Vetter wrote:
+> On Thu, Mar 02, 2017 at 08:27:54PM +0300, Alexey Brodkin wrote:
 > > 
 > > Since we cannot always generate exactly requested pixel clock
 > > there's not much sense in checking requested_clock == clk_round_rate().
@@ -13,27 +13,27 @@ On Thu, 2017-03-02@20:54 +0100, Daniel Vetter wrote:
 > > PLL on the board may generate. So we just do a fixup to what current
 > > board may provide.
 > > 
-> > Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>
-> > Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
-> > Cc: David Airlie <airlied at linux.ie>
-> > Cc: Jose Abreu <joabreu at synopsys.com>
+> > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
+> > Cc: David Airlie <airlied@linux.ie>
+> > Cc: Jose Abreu <joabreu@synopsys.com>
 > > ---
-> > ?drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +++++++---------
-> > ?1 file changed, 7 insertions(+), 9 deletions(-)
+> >  drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +++++++---------
+> >  1 file changed, 7 insertions(+), 9 deletions(-)
 > > 
 > > diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c
 > > index ad9a95916f1f..3f2823c1efc3 100644
 > > --- a/drivers/gpu/drm/arc/arcpgu_crtc.c
 > > +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
 > > @@ -129,18 +129,16 @@ static void arc_pgu_crtc_disable(struct drm_crtc *crtc)
-> > ?			??????~ARCPGU_CTRL_ENABLE_MASK);
-> > ?}
-> > ?
+> >  			      ~ARCPGU_CTRL_ENABLE_MASK);
+> >  }
+> >  
 > > -static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc,
-> > -				?????struct drm_crtc_state *state)
+> > -				     struct drm_crtc_state *state)
 > > +static bool arc_pgu_crtc_mode_fixup(struct drm_crtc *crtc,
-> > +				????const struct drm_display_mode *mode,
-> > +				????struct drm_display_mode *adjusted_mode)
+> > +				    const struct drm_display_mode *mode,
+> > +				    struct drm_display_mode *adjusted_mode)
 > 
 > This isn't required at all, see drm_crtc_state.adjusted_mode. Just update
 > that and you're good - .mode_fixup is the backwards compatibility function
@@ -47,33 +47,33 @@ index ad9a95916f1f..86f1555914e8 100644
 --- a/drivers/gpu/drm/arc/arcpgu_crtc.c
 +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c
 @@ -129,20 +129,6 @@ static void arc_pgu_crtc_disable(struct drm_crtc *crtc)
-??????????????????????????????~ARCPGU_CTRL_ENABLE_MASK);
-?}
-?
+                              ~ARCPGU_CTRL_ENABLE_MASK);
+ }
+ 
 -static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc,
--????????????????????????????????????struct drm_crtc_state *state)
+-                                    struct drm_crtc_state *state)
 -{
--???????struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
--???????struct drm_display_mode *mode = &state->adjusted_mode;
--???????long rate, clk_rate = mode->clock * 1000;
+-       struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
+-       struct drm_display_mode *mode = &state->adjusted_mode;
+-       long rate, clk_rate = mode->clock * 1000;
 -
--???????rate = clk_round_rate(arcpgu->clk, clk_rate);
--???????if (rate != clk_rate)
--???????????????return -EINVAL;
+-       rate = clk_round_rate(arcpgu->clk, clk_rate);
+-       if (rate != clk_rate)
+-               return -EINVAL;
 -
--???????return 0;
+-       return 0;
 -}
 -
-?static void arc_pgu_crtc_atomic_begin(struct drm_crtc *crtc,
-??????????????????????????????????????struct drm_crtc_state *state)
-?{
+ static void arc_pgu_crtc_atomic_begin(struct drm_crtc *crtc,
+                                      struct drm_crtc_state *state)
+ {
 @@ -165,7 +151,6 @@ static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = {
-????????.disable????????= arc_pgu_crtc_disable,
-????????.prepare????????= arc_pgu_crtc_disable,
-????????.commit?????????= arc_pgu_crtc_enable,
--???????.atomic_check???= arc_pgu_crtc_atomic_check,
-????????.atomic_begin???= arc_pgu_crtc_atomic_begin,
-?};
+        .disable        = arc_pgu_crtc_disable,
+        .prepare        = arc_pgu_crtc_disable,
+        .commit         = arc_pgu_crtc_enable,
+-       .atomic_check   = arc_pgu_crtc_atomic_check,
+        .atomic_begin   = arc_pgu_crtc_atomic_begin,
+ };
 ------------------------------->8-------------------------------
 
 > Please also make sure the documentation properly explains this, and if
@@ -83,3 +83,7 @@ You mean explains what? That .mode_fixup is not meant to be used in
 new code?
 
 -Alexey
+_______________________________________________
+linux-snps-arc mailing list
+linux-snps-arc@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-snps-arc
diff --git a/a/content_digest b/N1/content_digest
index 3e28602..10f15f0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,15 +1,21 @@
  "ref\01488475674-6694-1-git-send-email-abrodkin@synopsys.com\0"
  "ref\020170302195437.mlhzia2q2oav27mr@phenom.ffwll.local\0"
- "From\0Alexey.Brodkin@synopsys.com (Alexey Brodkin)\0"
- "Subject\0[PATCH] drm/arcpgu: use .mode_fixup instead of .atomic_check\0"
+ "From\0Alexey Brodkin <Alexey.Brodkin@synopsys.com>\0"
+ "Subject\0Re: [PATCH] drm/arcpgu: use .mode_fixup instead of .atomic_check\0"
  "Date\0Fri, 3 Mar 2017 13:27:30 +0000\0"
- "To\0linux-snps-arc@lists.infradead.org\0"
+ "To\0daniel@ffwll.ch <daniel@ffwll.ch>\0"
+ "Cc\0Jose.Abreu@synopsys.com <Jose.Abreu@synopsys.com>"
+  airlied@linux.ie <airlied@linux.ie>
+  daniel.vetter@ffwll.ch <daniel.vetter@ffwll.ch>
+  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
+  dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org>
+ " linux-snps-arc@lists.infradead.org <linux-snps-arc@lists.infradead.org>\0"
  "\00:1\0"
  "b\0"
  "Hi Daniel,\n"
  "\n"
- "On Thu, 2017-03-02@20:54 +0100, Daniel Vetter wrote:\n"
- "> On Thu, Mar 02, 2017@08:27:54PM +0300, Alexey Brodkin wrote:\n"
+ "On Thu, 2017-03-02 at 20:54 +0100, Daniel Vetter wrote:\n"
+ "> On Thu, Mar 02, 2017 at 08:27:54PM +0300, Alexey Brodkin wrote:\n"
  "> > \n"
  "> > Since we cannot always generate exactly requested pixel clock\n"
  "> > there's not much sense in checking requested_clock == clk_round_rate().\n"
@@ -21,27 +27,27 @@
  "> > PLL on the board may generate. So we just do a fixup to what current\n"
  "> > board may provide.\n"
  "> > \n"
- "> > Signed-off-by: Alexey Brodkin <abrodkin at synopsys.com>\n"
- "> > Cc: Daniel Vetter <daniel.vetter at ffwll.ch>\n"
- "> > Cc: David Airlie <airlied at linux.ie>\n"
- "> > Cc: Jose Abreu <joabreu at synopsys.com>\n"
+ "> > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>\n"
+ "> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>\n"
+ "> > Cc: David Airlie <airlied@linux.ie>\n"
+ "> > Cc: Jose Abreu <joabreu@synopsys.com>\n"
  "> > ---\n"
- "> > ?drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +++++++---------\n"
- "> > ?1 file changed, 7 insertions(+), 9 deletions(-)\n"
+ "> > \302\240drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +++++++---------\n"
+ "> > \302\2401 file changed, 7 insertions(+), 9 deletions(-)\n"
  "> > \n"
  "> > diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c\n"
  "> > index ad9a95916f1f..3f2823c1efc3 100644\n"
  "> > --- a/drivers/gpu/drm/arc/arcpgu_crtc.c\n"
  "> > +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c\n"
  "> > @@ -129,18 +129,16 @@ static void arc_pgu_crtc_disable(struct drm_crtc *crtc)\n"
- "> > ?\t\t\t??????~ARCPGU_CTRL_ENABLE_MASK);\n"
- "> > ?}\n"
- "> > ?\n"
+ "> > \302\240\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240~ARCPGU_CTRL_ENABLE_MASK);\n"
+ "> > \302\240}\n"
+ "> > \302\240\n"
  "> > -static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc,\n"
- "> > -\t\t\t\t?????struct drm_crtc_state *state)\n"
+ "> > -\t\t\t\t\302\240\302\240\302\240\302\240\302\240struct drm_crtc_state *state)\n"
  "> > +static bool arc_pgu_crtc_mode_fixup(struct drm_crtc *crtc,\n"
- "> > +\t\t\t\t????const struct drm_display_mode *mode,\n"
- "> > +\t\t\t\t????struct drm_display_mode *adjusted_mode)\n"
+ "> > +\t\t\t\t\302\240\302\240\302\240\302\240const struct drm_display_mode *mode,\n"
+ "> > +\t\t\t\t\302\240\302\240\302\240\302\240struct drm_display_mode *adjusted_mode)\n"
  "> \n"
  "> This isn't required at all, see drm_crtc_state.adjusted_mode. Just update\n"
  "> that and you're good - .mode_fixup is the backwards compatibility function\n"
@@ -55,33 +61,33 @@
  "--- a/drivers/gpu/drm/arc/arcpgu_crtc.c\n"
  "+++ b/drivers/gpu/drm/arc/arcpgu_crtc.c\n"
  "@@ -129,20 +129,6 @@ static void arc_pgu_crtc_disable(struct drm_crtc *crtc)\n"
- "??????????????????????????????~ARCPGU_CTRL_ENABLE_MASK);\n"
- "?}\n"
- "?\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240~ARCPGU_CTRL_ENABLE_MASK);\n"
+ "\302\240}\n"
+ "\302\240\n"
  "-static int arc_pgu_crtc_atomic_check(struct drm_crtc *crtc,\n"
- "-????????????????????????????????????struct drm_crtc_state *state)\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct drm_crtc_state *state)\n"
  "-{\n"
- "-???????struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);\n"
- "-???????struct drm_display_mode *mode = &state->adjusted_mode;\n"
- "-???????long rate, clk_rate = mode->clock * 1000;\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct drm_display_mode *mode = &state->adjusted_mode;\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240long rate, clk_rate = mode->clock * 1000;\n"
  "-\n"
- "-???????rate = clk_round_rate(arcpgu->clk, clk_rate);\n"
- "-???????if (rate != clk_rate)\n"
- "-???????????????return -EINVAL;\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240rate = clk_round_rate(arcpgu->clk, clk_rate);\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (rate != clk_rate)\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return -EINVAL;\n"
  "-\n"
- "-???????return 0;\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240return 0;\n"
  "-}\n"
  "-\n"
- "?static void arc_pgu_crtc_atomic_begin(struct drm_crtc *crtc,\n"
- "??????????????????????????????????????struct drm_crtc_state *state)\n"
- "?{\n"
+ "\302\240static void arc_pgu_crtc_atomic_begin(struct drm_crtc *crtc,\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct drm_crtc_state *state)\n"
+ "\302\240{\n"
  "@@ -165,7 +151,6 @@ static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = {\n"
- "????????.disable????????= arc_pgu_crtc_disable,\n"
- "????????.prepare????????= arc_pgu_crtc_disable,\n"
- "????????.commit?????????= arc_pgu_crtc_enable,\n"
- "-???????.atomic_check???= arc_pgu_crtc_atomic_check,\n"
- "????????.atomic_begin???= arc_pgu_crtc_atomic_begin,\n"
- "?};\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.disable\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240= arc_pgu_crtc_disable,\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.prepare\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240= arc_pgu_crtc_disable,\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.commit\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240= arc_pgu_crtc_enable,\n"
+ "-\302\240\302\240\302\240\302\240\302\240\302\240\302\240.atomic_check\302\240\302\240\302\240= arc_pgu_crtc_atomic_check,\n"
+ "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240.atomic_begin\302\240\302\240\302\240= arc_pgu_crtc_atomic_begin,\n"
+ "\302\240};\n"
  "------------------------------->8-------------------------------\n"
  "\n"
  "> Please also make sure the documentation properly explains this, and if\n"
@@ -90,6 +96,10 @@
  "You mean explains what? That .mode_fixup is not meant to be used in\n"
  "new code?\n"
  "\n"
- -Alexey
+ "-Alexey\n"
+ "_______________________________________________\n"
+ "linux-snps-arc mailing list\n"
+ "linux-snps-arc@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-snps-arc
 
-a17ab4f352f30879cf6996e3dbc9a71249817ea1b97bb19070a5d102cf8b3933
+210797d86ee3255009b87fea444b46785556729dc88e73022422a70acaba432c
