diff for duplicates of <52DFA1DE.6030709@freescale.com> diff --git a/a/1.txt b/N1/1.txt index a74c1f5..df8ad35 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -56,13 +56,13 @@ On 01/22/2014 05:35 PM, Jani Nikula wrote: >> if (!bd->ops->check_fb || >> bd->ops->check_fb(bd, evdata->info)) { >> - bd->props.fb_blank = *(int *)evdata->data; ->> - if (bd->props.fb_blank = FB_BLANK_UNBLANK) +>> - if (bd->props.fb_blank == FB_BLANK_UNBLANK) >> - bd->props.state &= ~BL_CORE_FBBLANK; >> - else >> - bd->props.state |= BL_CORE_FBBLANK; >> - backlight_update_status(bd); >> + fb_blank = *(int *)evdata->data; ->> + if (fb_blank = FB_BLANK_UNBLANK && +>> + if (fb_blank == FB_BLANK_UNBLANK && >> + !bd->fb_bl_on[node]) { >> + bd->fb_bl_on[node] = true; >> + if (!bd->use_count++) { diff --git a/a/content_digest b/N1/content_digest index 904cdfb..a77f9f8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\087sisg5pfo.fsf@intel.com\0" "From\0Liu Ying <Ying.Liu@freescale.com>\0" "Subject\0Re: [PATCH v2] backlight: turn backlight on/off when necessary\0" - "Date\0Wed, 22 Jan 2014 10:47:58 +0000\0" + "Date\0Wed, 22 Jan 2014 18:47:58 +0800\0" "To\0Jani Nikula <jani.nikula@linux.intel.com>\0" "Cc\0jg1.han@samsung.com" linux-fbdev@vger.kernel.org @@ -70,13 +70,13 @@ ">> \t\tif (!bd->ops->check_fb ||\n" ">> \t\t bd->ops->check_fb(bd, evdata->info)) {\n" ">> -\t\t\tbd->props.fb_blank = *(int *)evdata->data;\n" - ">> -\t\t\tif (bd->props.fb_blank = FB_BLANK_UNBLANK)\n" + ">> -\t\t\tif (bd->props.fb_blank == FB_BLANK_UNBLANK)\n" ">> -\t\t\t\tbd->props.state &= ~BL_CORE_FBBLANK;\n" ">> -\t\t\telse\n" ">> -\t\t\t\tbd->props.state |= BL_CORE_FBBLANK;\n" ">> -\t\t\tbacklight_update_status(bd);\n" ">> +\t\t\tfb_blank = *(int *)evdata->data;\n" - ">> +\t\t\tif (fb_blank = FB_BLANK_UNBLANK &&\n" + ">> +\t\t\tif (fb_blank == FB_BLANK_UNBLANK &&\n" ">> +\t\t\t !bd->fb_bl_on[node]) {\n" ">> +\t\t\t\tbd->fb_bl_on[node] = true;\n" ">> +\t\t\t\tif (!bd->use_count++) {\n" @@ -172,4 +172,4 @@ ">> http://lists.freedesktop.org/mailman/listinfo/dri-devel\n" > -044128462429f60bd803d1fba6d7c6dc0625d5a17f00e72b9af1a1b69abd3bfe +4018f61571deafa7478e17767ba3e1746240700a888d7d751a7e87eb35f381e8
diff --git a/a/1.txt b/N2/1.txt index a74c1f5..df8ad35 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -56,13 +56,13 @@ On 01/22/2014 05:35 PM, Jani Nikula wrote: >> if (!bd->ops->check_fb || >> bd->ops->check_fb(bd, evdata->info)) { >> - bd->props.fb_blank = *(int *)evdata->data; ->> - if (bd->props.fb_blank = FB_BLANK_UNBLANK) +>> - if (bd->props.fb_blank == FB_BLANK_UNBLANK) >> - bd->props.state &= ~BL_CORE_FBBLANK; >> - else >> - bd->props.state |= BL_CORE_FBBLANK; >> - backlight_update_status(bd); >> + fb_blank = *(int *)evdata->data; ->> + if (fb_blank = FB_BLANK_UNBLANK && +>> + if (fb_blank == FB_BLANK_UNBLANK && >> + !bd->fb_bl_on[node]) { >> + bd->fb_bl_on[node] = true; >> + if (!bd->use_count++) { diff --git a/a/content_digest b/N2/content_digest index 904cdfb..8c2c33e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,14 +2,14 @@ "ref\087sisg5pfo.fsf@intel.com\0" "From\0Liu Ying <Ying.Liu@freescale.com>\0" "Subject\0Re: [PATCH v2] backlight: turn backlight on/off when necessary\0" - "Date\0Wed, 22 Jan 2014 10:47:58 +0000\0" + "Date\0Wed, 22 Jan 2014 18:47:58 +0800\0" "To\0Jani Nikula <jani.nikula@linux.intel.com>\0" - "Cc\0jg1.han@samsung.com" - linux-fbdev@vger.kernel.org - tomi.valkeinen@ti.com - plagnioj@jcrosoft.com - linux-kernel@vger.kernel.org - " dri-devel@lists.freedesktop.org\0" + "Cc\0<jg1.han@samsung.com>" + <linux-fbdev@vger.kernel.org> + <tomi.valkeinen@ti.com> + <plagnioj@jcrosoft.com> + <linux-kernel@vger.kernel.org> + " <dri-devel@lists.freedesktop.org>\0" "\00:1\0" "b\0" "On 01/22/2014 05:35 PM, Jani Nikula wrote:\n" @@ -70,13 +70,13 @@ ">> \t\tif (!bd->ops->check_fb ||\n" ">> \t\t bd->ops->check_fb(bd, evdata->info)) {\n" ">> -\t\t\tbd->props.fb_blank = *(int *)evdata->data;\n" - ">> -\t\t\tif (bd->props.fb_blank = FB_BLANK_UNBLANK)\n" + ">> -\t\t\tif (bd->props.fb_blank == FB_BLANK_UNBLANK)\n" ">> -\t\t\t\tbd->props.state &= ~BL_CORE_FBBLANK;\n" ">> -\t\t\telse\n" ">> -\t\t\t\tbd->props.state |= BL_CORE_FBBLANK;\n" ">> -\t\t\tbacklight_update_status(bd);\n" ">> +\t\t\tfb_blank = *(int *)evdata->data;\n" - ">> +\t\t\tif (fb_blank = FB_BLANK_UNBLANK &&\n" + ">> +\t\t\tif (fb_blank == FB_BLANK_UNBLANK &&\n" ">> +\t\t\t !bd->fb_bl_on[node]) {\n" ">> +\t\t\t\tbd->fb_bl_on[node] = true;\n" ">> +\t\t\t\tif (!bd->use_count++) {\n" @@ -172,4 +172,4 @@ ">> http://lists.freedesktop.org/mailman/listinfo/dri-devel\n" > -044128462429f60bd803d1fba6d7c6dc0625d5a17f00e72b9af1a1b69abd3bfe +6a58f0f5aa0ef85af483a58691eced8c661049bdb70c4fe5c868846b2cdd2051
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.