diff for duplicates of <20130318195046.GA32067@kroah.com> diff --git a/a/1.txt b/N1/1.txt index d165a1d..e4ffa35 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -On Mon, Mar 18, 2013 at 12:40:35PM -0700, Stéphane Marchesin wrote: +On Mon, Mar 18, 2013 at 12:40:35PM -0700, St�phane Marchesin wrote: > > > @@ -7,12 +7,12 @@ On Mon, Mar 18, 2013 at 12:40:35PM -0700, Stéphane Marchesin wrote: > > On Mon, Mar 18, 2013 at 01:11:09AM +0000, Ben Hutchings wrote: > > On Tue, 2013-03-12 at 15:31 -0700, Greg Kroah-Hartman wrote: -> > > 3.8-stable review patch. If anyone has any objections, please let me +> > > 3.8-stable review patch. �If anyone has any objections, please let me > know. > > > > > > ------------------ > > > -> > > From: Stéphane Marchesin <marcheu@chromium.org> +> > > From: St�phane Marchesin <marcheu@chromium.org> > > > > > > commit 0920a48719f1ceefc909387a64f97563848c7854 upstream. > > > @@ -20,26 +20,26 @@ On Mon, Mar 18, 2013 at 12:40:35PM -0700, Stéphane Marchesin wrote: > > > reason this avoids the gen6_gt_check_fifodbg.isra warnings and > > > associated GPU lockups, which makes my ivy bridge machine stable. > > > -> > > Signed-off-by: Stéphane Marchesin <marcheu@chromium.org> +> > > Signed-off-by: St�phane Marchesin <marcheu@chromium.org> > > > Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> > > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > > > > > --- -> > > drivers/gpu/drm/i915/intel_pm.c | 2 +- -> > > 1 file changed, 1 insertion(+), 1 deletion(-) +> > > �drivers/gpu/drm/i915/intel_pm.c | � �2 +- +> > > �1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > --- a/drivers/gpu/drm/i915/intel_pm.c > > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > > @@ -2572,7 +2572,7 @@ static void gen6_enable_rps(struct drm_d -> > > I915_WRITE(GEN6_RC_SLEEP, 0); -> > > I915_WRITE(GEN6_RC1e_THRESHOLD, 1000); -> > > I915_WRITE(GEN6_RC6_THRESHOLD, 50000); -> > > - I915_WRITE(GEN6_RC6p_THRESHOLD, 100000); -> > > + I915_WRITE(GEN6_RC6p_THRESHOLD, 150000); -> > > I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */ -> > > -> > > /* Check if we are enabling RC6 */ +> > > � � I915_WRITE(GEN6_RC_SLEEP, 0); +> > > � � I915_WRITE(GEN6_RC1e_THRESHOLD, 1000); +> > > � � I915_WRITE(GEN6_RC6_THRESHOLD, 50000); +> > > - � I915_WRITE(GEN6_RC6p_THRESHOLD, 100000); +> > > + � I915_WRITE(GEN6_RC6p_THRESHOLD, 150000); +> > > � � I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */ +> > > +> > > � � /* Check if we are enabling RC6 */ > > > > Is there any reason why this shouldn't be applied to 3.2.y and 3.4.y? > > The same function and writes are present, only in intel_display.c rather diff --git a/a/content_digest b/N1/content_digest index 6f444ee..ee72959 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,7 +14,7 @@ " Daniel Vetter <daniel.vetter@ffwll.ch>\0" "\00:1\0" "b\0" - "On Mon, Mar 18, 2013 at 12:40:35PM -0700, St\303\251phane Marchesin wrote:\n" + "On Mon, Mar 18, 2013 at 12:40:35PM -0700, St\303\257\302\277\302\275phane Marchesin wrote:\n" "> \n" "> \n" "> \n" @@ -23,12 +23,12 @@ "> \n" "> On Mon, Mar 18, 2013 at 01:11:09AM +0000, Ben Hutchings wrote:\n" "> > On Tue, 2013-03-12 at 15:31 -0700, Greg Kroah-Hartman wrote:\n" - "> > > 3.8-stable review patch. \302\240If anyone has any objections, please let me\n" + "> > > 3.8-stable review patch. \303\257\302\277\302\275If anyone has any objections, please let me\n" "> know.\n" "> > >\n" "> > > ------------------\n" "> > >\n" - "> > > From: St\303\251phane Marchesin <marcheu@chromium.org>\n" + "> > > From: St\303\257\302\277\302\275phane Marchesin <marcheu@chromium.org>\n" "> > >\n" "> > > commit 0920a48719f1ceefc909387a64f97563848c7854 upstream.\n" "> > >\n" @@ -36,26 +36,26 @@ "> > > reason this avoids the gen6_gt_check_fifodbg.isra warnings and\n" "> > > associated GPU lockups, which makes my ivy bridge machine stable.\n" "> > >\n" - "> > > Signed-off-by: St\303\251phane Marchesin <marcheu@chromium.org>\n" + "> > > Signed-off-by: St\303\257\302\277\302\275phane Marchesin <marcheu@chromium.org>\n" "> > > Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>\n" "> > > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>\n" "> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "> > >\n" "> > > ---\n" - "> > > \302\240drivers/gpu/drm/i915/intel_pm.c | \302\240 \302\2402 +-\n" - "> > > \302\2401 file changed, 1 insertion(+), 1 deletion(-)\n" + "> > > \303\257\302\277\302\275drivers/gpu/drm/i915/intel_pm.c | \303\257\302\277\302\275 \303\257\302\277\302\2752 +-\n" + "> > > \303\257\302\277\302\2751 file changed, 1 insertion(+), 1 deletion(-)\n" "> > >\n" "> > > --- a/drivers/gpu/drm/i915/intel_pm.c\n" "> > > +++ b/drivers/gpu/drm/i915/intel_pm.c\n" "> > > @@ -2572,7 +2572,7 @@ static void gen6_enable_rps(struct drm_d\n" - "> > > \302\240 \302\240 I915_WRITE(GEN6_RC_SLEEP, 0);\n" - "> > > \302\240 \302\240 I915_WRITE(GEN6_RC1e_THRESHOLD, 1000);\n" - "> > > \302\240 \302\240 I915_WRITE(GEN6_RC6_THRESHOLD, 50000);\n" - "> > > - \302\240 I915_WRITE(GEN6_RC6p_THRESHOLD, 100000);\n" - "> > > + \302\240 I915_WRITE(GEN6_RC6p_THRESHOLD, 150000);\n" - "> > > \302\240 \302\240 I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */\n" + "> > > \303\257\302\277\302\275 \303\257\302\277\302\275 I915_WRITE(GEN6_RC_SLEEP, 0);\n" + "> > > \303\257\302\277\302\275 \303\257\302\277\302\275 I915_WRITE(GEN6_RC1e_THRESHOLD, 1000);\n" + "> > > \303\257\302\277\302\275 \303\257\302\277\302\275 I915_WRITE(GEN6_RC6_THRESHOLD, 50000);\n" + "> > > - \303\257\302\277\302\275 I915_WRITE(GEN6_RC6p_THRESHOLD, 100000);\n" + "> > > + \303\257\302\277\302\275 I915_WRITE(GEN6_RC6p_THRESHOLD, 150000);\n" + "> > > \303\257\302\277\302\275 \303\257\302\277\302\275 I915_WRITE(GEN6_RC6pp_THRESHOLD, 64000); /* unused */\n" "> > >\n" - "> > > \302\240 \302\240 /* Check if we are enabling RC6 */\n" + "> > > \303\257\302\277\302\275 \303\257\302\277\302\275 /* Check if we are enabling RC6 */\n" "> >\n" "> > Is there any reason why this shouldn't be applied to 3.2.y and 3.4.y?\n" "> > The same function and writes are present, only in intel_display.c rather\n" @@ -77,4 +77,4 @@ "\n" greg k-h -182f2a7aad03e7ff2ec63d01bcba637ec94ba7c5d7af64a5e2febc772679605b +e53daac4a2140eb7ebe2d8dc05cd0e0fc7b5507fa88315ea77f602cd00c399ca
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.