diff for duplicates of <4E61086C.3050102@gmx.de> diff --git a/a/1.txt b/N1/1.txt index 79b2ab5..a52e3c3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ On 09/02/2011 04:06 PM, Guennadi Liakhovetski wrote: >> I am scheduling Herton's patch for the next merge window. > > So, the patch looks simple and correct, when applied on top of -> http://marc.info/?l=linux-kernel&m\x130833638508657&w=2 +> http://marc.info/?l=linux-kernel&m=130833638508657&w=2 > But it doesn't apply anymore and after fixing a trivial merge conflict, it > fails to build, which is also trivially fixed. Please, add my > @@ -52,7 +52,7 @@ Florian Tobias Schandinat > > + info = hdmi->info; > + -> if (hdmi->hp_state = HDMI_HOTPLUG_CONNECTED) { +> if (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) { > - struct fb_info *info = hdmi->info; > unsigned long parent_rate = 0, hdmi_rate; > @@ -67,7 +67,7 @@ Florian Tobias Schandinat > > - /* HDMI plug in */ > - if (!sh_hdmi_must_reconfigure(hdmi) && -> - info->state = FBINFO_STATE_RUNNING) { +> - info->state == FBINFO_STATE_RUNNING) { > - /* > - * First activation with the default monitor - just turn > - * on, if we run a resume here, the logo disappears @@ -75,7 +75,7 @@ Florian Tobias Schandinat > - if (lock_fb_info(info)) { > + /* HDMI plug in */ > + if (!sh_hdmi_must_reconfigure(hdmi) && -> + info->state = FBINFO_STATE_RUNNING) { +> + info->state == FBINFO_STATE_RUNNING) { > + /* > + * First activation with the default monitor - just turn > + * on, if we run a resume here, the logo disappears @@ -178,7 +178,7 @@ Florian Tobias Schandinat >>>> more work: >>>> - drivers/video/sh_mobile_hdmi.c: sh_hdmi_edid_work_fn() >>>> Should get changed to ->>>> a) right locking order in case (hdmi->hp_state = HDMI_HOTPLUG_CONNECTED) +>>>> a) right locking order in case (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) >>>> b) lock fb_info in the other case >>>> For this one fb_set_suspend() does get call in a hotplug worker, >>>> thus independently on suspend/resume process. @@ -188,7 +188,7 @@ Florian Tobias Schandinat >>>> Bruno >>>> >>>> ->>>>> References: https://bugzilla.kernel.org/show_bug.cgi?id&232 +>>>>> References: https://bugzilla.kernel.org/show_bug.cgi?id=26232 >>>>> Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br> >>>>> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> >>>>> Cc: stable@kernel.org @@ -251,7 +251,7 @@ Florian Tobias Schandinat >>> >>> - /* HDMI plug in */ >>> - if (!sh_hdmi_must_reconfigure(hdmi) && ->>> - info->state = FBINFO_STATE_RUNNING) { +>>> - info->state == FBINFO_STATE_RUNNING) { >>> - /* >>> - * First activation with the default monitor - just turn >>> - * on, if we run a resume here, the logo disappears @@ -259,7 +259,7 @@ Florian Tobias Schandinat >>> - if (lock_fb_info(info)) { >>> + /* HDMI plug in */ >>> + if (!sh_hdmi_must_reconfigure(hdmi) && ->>> + info->state = FBINFO_STATE_RUNNING) { +>>> + info->state == FBINFO_STATE_RUNNING) { >>> + /* >>> + * First activation with the default monitor - just turn >>> + * on, if we run a resume here, the logo disappears diff --git a/a/content_digest b/N1/content_digest index 09193be..6f521a4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -33,7 +33,7 @@ ">> I am scheduling Herton's patch for the next merge window.\n" "> \n" "> So, the patch looks simple and correct, when applied on top of \n" - "> http://marc.info/?l=linux-kernel&m\0230833638508657&w=2\n" + "> http://marc.info/?l=linux-kernel&m=130833638508657&w=2\n" "> But it doesn't apply anymore and after fixing a trivial merge conflict, it \n" "> fails to build, which is also trivially fixed. Please, add my\n" "> \n" @@ -72,7 +72,7 @@ "> \n" "> +\tinfo = hdmi->info;\n" "> +\n" - "> \tif (hdmi->hp_state = HDMI_HOTPLUG_CONNECTED) {\n" + "> \tif (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED) {\n" "> -\t\tstruct fb_info *info = hdmi->info;\n" "> \t\tunsigned long parent_rate = 0, hdmi_rate;\n" "> \n" @@ -87,7 +87,7 @@ "> \n" "> -\t\t/* HDMI plug in */\n" "> -\t\tif (!sh_hdmi_must_reconfigure(hdmi) &&\n" - "> -\t\t info->state = FBINFO_STATE_RUNNING) {\n" + "> -\t\t info->state == FBINFO_STATE_RUNNING) {\n" "> -\t\t\t/*\n" "> -\t\t\t * First activation with the default monitor - just turn\n" "> -\t\t\t * on, if we run a resume here, the logo disappears\n" @@ -95,7 +95,7 @@ "> -\t\t\tif (lock_fb_info(info)) {\n" "> +\t\t\t/* HDMI plug in */\n" "> +\t\t\tif (!sh_hdmi_must_reconfigure(hdmi) &&\n" - "> +\t\t\t info->state = FBINFO_STATE_RUNNING) {\n" + "> +\t\t\t info->state == FBINFO_STATE_RUNNING) {\n" "> +\t\t\t\t/*\n" "> +\t\t\t\t * First activation with the default monitor - just turn\n" "> +\t\t\t\t * on, if we run a resume here, the logo disappears\n" @@ -198,7 +198,7 @@ ">>>> more work:\n" ">>>> - drivers/video/sh_mobile_hdmi.c: sh_hdmi_edid_work_fn()\n" ">>>> Should get changed to\n" - ">>>> a) right locking order in case (hdmi->hp_state = HDMI_HOTPLUG_CONNECTED)\n" + ">>>> a) right locking order in case (hdmi->hp_state == HDMI_HOTPLUG_CONNECTED)\n" ">>>> b) lock fb_info in the other case\n" ">>>> For this one fb_set_suspend() does get call in a hotplug worker,\n" ">>>> thus independently on suspend/resume process.\n" @@ -208,7 +208,7 @@ ">>>> Bruno\n" ">>>>\n" ">>>>\n" - ">>>>> References: https://bugzilla.kernel.org/show_bug.cgi?id&232\n" + ">>>>> References: https://bugzilla.kernel.org/show_bug.cgi?id=26232\n" ">>>>> Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>\n" ">>>>> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>\n" ">>>>> Cc: stable@kernel.org\n" @@ -271,7 +271,7 @@ ">>> \n" ">>> -\t\t/* HDMI plug in */\n" ">>> -\t\tif (!sh_hdmi_must_reconfigure(hdmi) &&\n" - ">>> -\t\t info->state = FBINFO_STATE_RUNNING) {\n" + ">>> -\t\t info->state == FBINFO_STATE_RUNNING) {\n" ">>> -\t\t\t/*\n" ">>> -\t\t\t * First activation with the default monitor - just turn\n" ">>> -\t\t\t * on, if we run a resume here, the logo disappears\n" @@ -279,7 +279,7 @@ ">>> -\t\t\tif (lock_fb_info(info)) {\n" ">>> +\t\t\t/* HDMI plug in */\n" ">>> +\t\t\tif (!sh_hdmi_must_reconfigure(hdmi) &&\n" - ">>> +\t\t\t info->state = FBINFO_STATE_RUNNING) {\n" + ">>> +\t\t\t info->state == FBINFO_STATE_RUNNING) {\n" ">>> +\t\t\t\t/*\n" ">>> +\t\t\t\t * First activation with the default monitor - just turn\n" ">>> +\t\t\t\t * on, if we run a resume here, the logo disappears\n" @@ -337,4 +337,4 @@ "> http://www.open-technology.de/\n" > -45d602fc58862d648e76e8b394c9bdc1b855f908e3da8a018aab7b56121e707f +4a131aa180eb269510d28f6aa4d1152375f7d6c475e902d59f35352e90b73ba8
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.