diff for duplicates of <20161005094922.GA4329@intel.com> diff --git a/a/1.txt b/N1/1.txt index 96f57a9..f1118ae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Mon, Oct 03, 2016 at 02:39:16PM +0300, Ander Conselvan De Oliveira wrote: > On Mon, 2016-10-03 at 10:55 +0300, ville.syrjala@linux.intel.com wrote: -> > From: Ville Syrjälä <ville.syrjala@linux.intel.com> +> > From: Ville Syrj�l� <ville.syrjala@linux.intel.com> > > > > We can't rely on connector->status in the detect() hook if the long hpd > > was already handled by the dig_port_work as that won't update @@ -28,11 +28,11 @@ Thanks. I added a small note to 1/2 and pushed both patches to dinq. > > Cc: stable@vger.kernel.org > > Tested-by: Arno <blouin.arno@gmail.com> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83348 -> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> +> > Signed-off-by: Ville Syrj�l� <ville.syrjala@linux.intel.com> > > --- -> > drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++------------------ +> > �drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++------------------ > > --- -> > 1 file changed, 23 insertions(+), 25 deletions(-) +> > �1 file changed, 23 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > > index 9448d898d80b..96caa469e3a8 100644 @@ -40,17 +40,17 @@ Thanks. I added a small note to 1/2 and pushed both patches to dinq. > > +++ b/drivers/gpu/drm/i915/intel_dp.c > > @@ -4827,36 +4827,34 @@ intel_dp_hpd_pulse(struct intel_digital_port > > *intel_dig_port, bool long_hpd) -> > port_name(intel_dig_port->port), -> > long_hpd ? "long" : "short"); -> > +> > � ������port_name(intel_dig_port->port), +> > � ������long_hpd ? "long" : "short"); +> > � > > + if (long_hpd) { > > + intel_dp->detect_done = false; > > + return IRQ_NONE; > > + } > > + -> > power_domain = intel_display_port_aux_power_domain(intel_encoder); -> > intel_display_power_get(dev_priv, power_domain); -> > +> > � power_domain = intel_display_port_aux_power_domain(intel_encoder); +> > � intel_display_power_get(dev_priv, power_domain); +> > � > > - if (long_hpd) { > > - intel_dp_long_pulse(intel_dp->attached_connector); > > - if (intel_dp->is_mst) @@ -61,12 +61,12 @@ Thanks. I added a small note to 1/2 and pushed both patches to dinq. > > - if (intel_dp->is_mst) { > > - if (intel_dp_check_mst_status(intel_dp) == -EINVAL) { > > - /* -> > - * If we were in MST mode, and device is not -> > - * there, get out of MST mode -> > - */ +> > - �* If we were in MST mode, and device is not +> > - �* there, get out of MST mode +> > - �*/ > > - DRM_DEBUG_KMS("MST device may have > > disappeared %d vs %d\n", -> > - intel_dp->is_mst, intel_dp- +> > - ������intel_dp->is_mst, intel_dp- > > >mst_mgr.mst_state); > > - intel_dp->is_mst = false; > > - drm_dp_mst_topology_mgr_set_mst(&intel_dp- @@ -78,21 +78,21 @@ Thanks. I added a small note to 1/2 and pushed both patches to dinq. > > + if (intel_dp->is_mst) { > > + if (intel_dp_check_mst_status(intel_dp) == -EINVAL) { > > + /* -> > + * If we were in MST mode, and device is not -> > + * there, get out of MST mode -> > + */ +> > + �* If we were in MST mode, and device is not +> > + �* there, get out of MST mode +> > + �*/ > > + DRM_DEBUG_KMS("MST device may have disappeared %d vs > > %d\n", -> > + intel_dp->is_mst, intel_dp- +> > + ������intel_dp->is_mst, intel_dp- > > >mst_mgr.mst_state); > > + intel_dp->is_mst = false; > > + drm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr, > > + intel_dp->is_mst); > > + intel_dp->detect_done = false; > > + goto put_power; -> > } +> > � } > > + } -> > +> > � > > - if (!intel_dp->is_mst) { > > - if (!intel_dp_short_pulse(intel_dp)) { > > - intel_dp_long_pulse(intel_dp- @@ -103,14 +103,10 @@ Thanks. I added a small note to 1/2 and pushed both patches to dinq. > > + if (!intel_dp_short_pulse(intel_dp)) { > > + intel_dp->detect_done = false; > > + goto put_power; -> > } -> > } -> > +> > � } +> > � } +> > � -- -Ville Syrjälä +Ville Syrj�l� Intel OTC -_______________________________________________ -Intel-gfx mailing list -Intel-gfx@lists.freedesktop.org -https://lists.freedesktop.org/mailman/listinfo/intel-gfx diff --git a/a/content_digest b/N1/content_digest index 69c488f..5b1093a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,17 +4,18 @@ "Subject\0Re: [PATCH 1/2] drm/i915: Move long hpd handling into the hotplug work\0" "Date\0Wed, 5 Oct 2016 12:49:22 +0300\0" "To\0Ander Conselvan De Oliveira <conselvan2@gmail.com>\0" - "Cc\0Damien Cassou <damien@cassou.me>" - intel-gfx@lists.freedesktop.org - stable@vger.kernel.org - Shubhangi Shrivastava <shubhangi.shrivastava@intel.com> + "Cc\0intel-gfx@lists.freedesktop.org" + Damien Cassou <damien@cassou.me> + freedesktop.org@gp.mailgun.org Arno <blouin.arno@gmail.com> - " freedesktop.org@gp.mailgun.org\0" + Shubhangi Shrivastava <shubhangi.shrivastava@intel.com> + Sivakumar Thulasimani <sivakumar.thulasimani@intel.com> + " stable@vger.kernel.org\0" "\00:1\0" "b\0" "On Mon, Oct 03, 2016 at 02:39:16PM +0300, Ander Conselvan De Oliveira wrote:\n" "> On Mon, 2016-10-03 at 10:55 +0300, ville.syrjala@linux.intel.com wrote:\n" - "> > From: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n" + "> > From: Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 <ville.syrjala@linux.intel.com>\n" "> > \n" "> > We can't rely on connector->status in the detect() hook if the long hpd\n" "> > was already handled by the dig_port_work as that won't update\n" @@ -42,11 +43,11 @@ "> > Cc: stable@vger.kernel.org\n" "> > Tested-by: Arno <blouin.arno@gmail.com>\n" "> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83348\n" - "> > Signed-off-by: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n" + "> > Signed-off-by: Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 <ville.syrjala@linux.intel.com>\n" "> > ---\n" - "> > \302\240drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++------------------\n" + "> > \303\257\302\277\302\275drivers/gpu/drm/i915/intel_dp.c | 48 ++++++++++++++++++++------------------\n" "> > ---\n" - "> > \302\2401 file changed, 23 insertions(+), 25 deletions(-)\n" + "> > \303\257\302\277\302\2751 file changed, 23 insertions(+), 25 deletions(-)\n" "> > \n" "> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c\n" "> > index 9448d898d80b..96caa469e3a8 100644\n" @@ -54,17 +55,17 @@ "> > +++ b/drivers/gpu/drm/i915/intel_dp.c\n" "> > @@ -4827,36 +4827,34 @@ intel_dp_hpd_pulse(struct intel_digital_port\n" "> > *intel_dig_port, bool long_hpd)\n" - "> > \302\240\t\t\302\240\302\240\302\240\302\240\302\240\302\240port_name(intel_dig_port->port),\n" - "> > \302\240\t\t\302\240\302\240\302\240\302\240\302\240\302\240long_hpd ? \"long\" : \"short\");\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275port_name(intel_dig_port->port),\n" + "> > \303\257\302\277\302\275\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275long_hpd ? \"long\" : \"short\");\n" + "> > \303\257\302\277\302\275\n" "> > +\tif (long_hpd) {\n" "> > +\t\tintel_dp->detect_done = false;\n" "> > +\t\treturn IRQ_NONE;\n" "> > +\t}\n" "> > +\n" - "> > \302\240\tpower_domain = intel_display_port_aux_power_domain(intel_encoder);\n" - "> > \302\240\tintel_display_power_get(dev_priv, power_domain);\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\tpower_domain = intel_display_port_aux_power_domain(intel_encoder);\n" + "> > \303\257\302\277\302\275\tintel_display_power_get(dev_priv, power_domain);\n" + "> > \303\257\302\277\302\275\n" "> > -\tif (long_hpd) {\n" "> > -\t\tintel_dp_long_pulse(intel_dp->attached_connector);\n" "> > -\t\tif (intel_dp->is_mst)\n" @@ -75,12 +76,12 @@ "> > -\t\tif (intel_dp->is_mst) {\n" "> > -\t\t\tif (intel_dp_check_mst_status(intel_dp) == -EINVAL) {\n" "> > -\t\t\t\t/*\n" - "> > -\t\t\t\t\302\240* If we were in MST mode, and device is not\n" - "> > -\t\t\t\t\302\240* there, get out of MST mode\n" - "> > -\t\t\t\t\302\240*/\n" + "> > -\t\t\t\t\303\257\302\277\302\275* If we were in MST mode, and device is not\n" + "> > -\t\t\t\t\303\257\302\277\302\275* there, get out of MST mode\n" + "> > -\t\t\t\t\303\257\302\277\302\275*/\n" "> > -\t\t\t\tDRM_DEBUG_KMS(\"MST device may have\n" "> > disappeared %d vs %d\\n\",\n" - "> > -\t\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240intel_dp->is_mst, intel_dp-\n" + "> > -\t\t\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275intel_dp->is_mst, intel_dp-\n" "> > >mst_mgr.mst_state);\n" "> > -\t\t\t\tintel_dp->is_mst = false;\n" "> > -\t\t\t\tdrm_dp_mst_topology_mgr_set_mst(&intel_dp-\n" @@ -92,21 +93,21 @@ "> > +\tif (intel_dp->is_mst) {\n" "> > +\t\tif (intel_dp_check_mst_status(intel_dp) == -EINVAL) {\n" "> > +\t\t\t/*\n" - "> > +\t\t\t\302\240* If we were in MST mode, and device is not\n" - "> > +\t\t\t\302\240* there, get out of MST mode\n" - "> > +\t\t\t\302\240*/\n" + "> > +\t\t\t\303\257\302\277\302\275* If we were in MST mode, and device is not\n" + "> > +\t\t\t\303\257\302\277\302\275* there, get out of MST mode\n" + "> > +\t\t\t\303\257\302\277\302\275*/\n" "> > +\t\t\tDRM_DEBUG_KMS(\"MST device may have disappeared %d vs\n" "> > %d\\n\",\n" - "> > +\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240intel_dp->is_mst, intel_dp-\n" + "> > +\t\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275intel_dp->is_mst, intel_dp-\n" "> > >mst_mgr.mst_state);\n" "> > +\t\t\tintel_dp->is_mst = false;\n" "> > +\t\t\tdrm_dp_mst_topology_mgr_set_mst(&intel_dp->mst_mgr,\n" "> > +\t\t\t\t\t\t\tintel_dp->is_mst);\n" "> > +\t\t\tintel_dp->detect_done = false;\n" "> > +\t\t\tgoto put_power;\n" - "> > \302\240\t\t}\n" + "> > \303\257\302\277\302\275\t\t}\n" "> > +\t}\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\n" "> > -\t\tif (!intel_dp->is_mst) {\n" "> > -\t\t\tif (!intel_dp_short_pulse(intel_dp)) {\n" "> > -\t\t\t\tintel_dp_long_pulse(intel_dp-\n" @@ -117,16 +118,12 @@ "> > +\t\tif (!intel_dp_short_pulse(intel_dp)) {\n" "> > +\t\t\tintel_dp->detect_done = false;\n" "> > +\t\t\tgoto put_power;\n" - "> > \302\240\t\t}\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\t\t}\n" + "> > \303\257\302\277\302\275\t}\n" + "> > \303\257\302\277\302\275\n" "\n" "-- \n" - "Ville Syrj\303\244l\303\244\n" - "Intel OTC\n" - "_______________________________________________\n" - "Intel-gfx mailing list\n" - "Intel-gfx@lists.freedesktop.org\n" - https://lists.freedesktop.org/mailman/listinfo/intel-gfx + "Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275\n" + Intel OTC -50be344f11ee70fdc8d53fb5687ff1de319b419f5d6caaf9cccfee6298d95bf5 +2ab8c2f2d88f0ef12392979db56658bef127ee6f2c204edebfdf4bb0a8725473
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.