diff for duplicates of <20160316195941.GV4329@intel.com> diff --git a/a/1.txt b/N1/1.txt index e508d72..5cce428 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ On Wed, Mar 16, 2016 at 03:44:37PM -0400, Lyude Paul wrote: -> On Wed, 2016-03-16 at 21:39 +0200, Ville Syrjälä wrote: +> On Wed, 2016-03-16 at 21:39 +0200, Ville Syrj�l� wrote: > > On Wed, Mar 16, 2016 at 03:18:04PM -0400, Lyude wrote: > > > > > > After unplugging a DP MST display from the system, we have to go through @@ -12,8 +12,8 @@ On Wed, Mar 16, 2016 at 03:44:37PM -0400, Lyude Paul wrote: > > > * Take all modeset locks > > > * Clear the configuration of the crtc on the connector, if there is one > > > * Drop all modeset locks, this is required because of circular -> > > dependency issues that arise with trying to remove the connector from -> > > sysfs with modeset locks held +> > > � dependency issues that arise with trying to remove the connector from +> > > � sysfs with modeset locks held > > > * Unregister the connector > > > * Take all modeset locks, again > > > * Do the rest of the required cleaning for destroying the connector @@ -69,13 +69,13 @@ killing the system or something. > just moving the connector->unregister() call to the top of the function. > > > -> > Patch itself does make sense to me, so -> > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> +> > Patch itself does make sense to me, so� +> > Reviewed-by: Ville Syrj�l� <ville.syrjala@linux.intel.com> > > > > > > > > --- -> > > drivers/gpu/drm/i915/intel_dp_mst.c | 6 ++---- -> > > 1 file changed, 2 insertions(+), 4 deletions(-) +> > > �drivers/gpu/drm/i915/intel_dp_mst.c | 6 ++---- +> > > �1 file changed, 2 insertions(+), 4 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c > > > b/drivers/gpu/drm/i915/intel_dp_mst.c @@ -84,29 +84,29 @@ killing the system or something. > > > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c > > > @@ -499,6 +499,8 @@ static void intel_dp_destroy_mst_connector(struct > > > drm_dp_mst_topology_mgr *mgr, -> > > struct intel_connector *intel_connector = +> > > � struct intel_connector *intel_connector = > > > to_intel_connector(connector); -> > > struct drm_device *dev = connector->dev; -> > > +> > > � struct drm_device *dev = connector->dev; +> > > � > > > + intel_connector->unregister(intel_connector); > > > + -> > > /* need to nuke the connector */ -> > > drm_modeset_lock_all(dev); -> > > if (connector->state->crtc) { +> > > � /* need to nuke the connector */ +> > > � drm_modeset_lock_all(dev); +> > > � if (connector->state->crtc) { > > > @@ -512,11 +514,7 @@ static void intel_dp_destroy_mst_connector(struct > > > drm_dp_mst_topology_mgr *mgr, -> > > -> > > WARN(ret, "Disabling mst crtc failed with %i\n", ret); -> > > } +> > > � +> > > � WARN(ret, "Disabling mst crtc failed with %i\n", ret); +> > > � } > > > - drm_modeset_unlock_all(dev); -> > > +> > > � > > > - intel_connector->unregister(intel_connector); > > > - > > > - drm_modeset_lock_all(dev); -> > > intel_connector_remove_from_fbdev(intel_connector); -> > > drm_connector_cleanup(connector); -> > > drm_modeset_unlock_all(dev); -> > > -- +> > > � intel_connector_remove_from_fbdev(intel_connector); +> > > � drm_connector_cleanup(connector); +> > > � drm_modeset_unlock_all(dev); +> > > --� > > > 2.5.0 > > > > > > _______________________________________________ @@ -115,9 +115,5 @@ killing the system or something. > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- -Ville Syrjälä +Ville Syrj�l� Intel OTC -_______________________________________________ -dri-devel mailing list -dri-devel@lists.freedesktop.org -https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/a/content_digest b/N1/content_digest index 5e70380..3cfc802 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,17 +5,17 @@ "Subject\0Re: [PATCH] drm/i915: Fix race condition in intel_dp_destroy_mst_connector()\0" "Date\0Wed, 16 Mar 2016 21:59:41 +0200\0" "To\0Lyude Paul <cpaul@redhat.com>\0" - "Cc\0Daniel Vetter <daniel.vetter@intel.com>" - intel-gfx@lists.freedesktop.org + "Cc\0intel-gfx@lists.freedesktop.org" Rob Clark <rclark@redhat.com> - stable@vger.kernel.org open list:INTEL DRM DRIVERS excluding Poulsbo Moorestow... - " linux-kernel@vger.kernel.org open list <dri-devel@lists.freedesktop.org>\0" + linux-kernel@vger.kernel.org open list <dri-devel@lists.freedesktop.org> + stable@vger.kernel.org + " Daniel Vetter <daniel.vetter@intel.com>\0" "\00:1\0" "b\0" "On Wed, Mar 16, 2016 at 03:44:37PM -0400, Lyude Paul wrote:\n" - "> On Wed, 2016-03-16 at 21:39 +0200, Ville Syrj\303\244l\303\244 wrote:\n" + "> On Wed, 2016-03-16 at 21:39 +0200, Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 wrote:\n" "> > On Wed, Mar 16, 2016 at 03:18:04PM -0400, Lyude wrote:\n" "> > > \n" "> > > After unplugging a DP MST display from the system, we have to go through\n" @@ -28,8 +28,8 @@ "> > > * Take all modeset locks\n" "> > > * Clear the configuration of the crtc on the connector, if there is one\n" "> > > * Drop all modeset locks, this is required because of circular\n" - "> > > \302\240 dependency issues that arise with trying to remove the connector from\n" - "> > > \302\240 sysfs with modeset locks held\n" + "> > > \303\257\302\277\302\275 dependency issues that arise with trying to remove the connector from\n" + "> > > \303\257\302\277\302\275 sysfs with modeset locks held\n" "> > > * Unregister the connector\n" "> > > * Take all modeset locks, again\n" "> > > * Do the rest of the required cleaning for destroying the connector\n" @@ -85,13 +85,13 @@ "> just moving the connector->unregister() call to the top of the function.\n" "> \n" "> > \n" - "> > Patch itself does make sense to me, so\302\240\n" - "> > Reviewed-by: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n" + "> > Patch itself does make sense to me, so\303\257\302\277\302\275\n" + "> > Reviewed-by: Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 <ville.syrjala@linux.intel.com>\n" "> > \n" "> > > \n" "> > > ---\n" - "> > > \302\240drivers/gpu/drm/i915/intel_dp_mst.c | 6 ++----\n" - "> > > \302\2401 file changed, 2 insertions(+), 4 deletions(-)\n" + "> > > \303\257\302\277\302\275drivers/gpu/drm/i915/intel_dp_mst.c | 6 ++----\n" + "> > > \303\257\302\277\302\2751 file changed, 2 insertions(+), 4 deletions(-)\n" "> > > \n" "> > > diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c\n" "> > > b/drivers/gpu/drm/i915/intel_dp_mst.c\n" @@ -100,29 +100,29 @@ "> > > +++ b/drivers/gpu/drm/i915/intel_dp_mst.c\n" "> > > @@ -499,6 +499,8 @@ static void intel_dp_destroy_mst_connector(struct\n" "> > > drm_dp_mst_topology_mgr *mgr,\n" - "> > > \302\240\tstruct intel_connector *intel_connector =\n" + "> > > \303\257\302\277\302\275\tstruct intel_connector *intel_connector =\n" "> > > to_intel_connector(connector);\n" - "> > > \302\240\tstruct drm_device *dev = connector->dev;\n" - "> > > \302\240\n" + "> > > \303\257\302\277\302\275\tstruct drm_device *dev = connector->dev;\n" + "> > > \303\257\302\277\302\275\n" "> > > +\tintel_connector->unregister(intel_connector);\n" "> > > +\n" - "> > > \302\240\t/* need to nuke the connector */\n" - "> > > \302\240\tdrm_modeset_lock_all(dev);\n" - "> > > \302\240\tif (connector->state->crtc) {\n" + "> > > \303\257\302\277\302\275\t/* need to nuke the connector */\n" + "> > > \303\257\302\277\302\275\tdrm_modeset_lock_all(dev);\n" + "> > > \303\257\302\277\302\275\tif (connector->state->crtc) {\n" "> > > @@ -512,11 +514,7 @@ static void intel_dp_destroy_mst_connector(struct\n" "> > > drm_dp_mst_topology_mgr *mgr,\n" - "> > > \302\240\n" - "> > > \302\240\t\tWARN(ret, \"Disabling mst crtc failed with %i\\n\", ret);\n" - "> > > \302\240\t}\n" + "> > > \303\257\302\277\302\275\n" + "> > > \303\257\302\277\302\275\t\tWARN(ret, \"Disabling mst crtc failed with %i\\n\", ret);\n" + "> > > \303\257\302\277\302\275\t}\n" "> > > -\tdrm_modeset_unlock_all(dev);\n" - "> > > \302\240\n" + "> > > \303\257\302\277\302\275\n" "> > > -\tintel_connector->unregister(intel_connector);\n" "> > > -\n" "> > > -\tdrm_modeset_lock_all(dev);\n" - "> > > \302\240\tintel_connector_remove_from_fbdev(intel_connector);\n" - "> > > \302\240\tdrm_connector_cleanup(connector);\n" - "> > > \302\240\tdrm_modeset_unlock_all(dev);\n" - "> > > --\302\240\n" + "> > > \303\257\302\277\302\275\tintel_connector_remove_from_fbdev(intel_connector);\n" + "> > > \303\257\302\277\302\275\tdrm_connector_cleanup(connector);\n" + "> > > \303\257\302\277\302\275\tdrm_modeset_unlock_all(dev);\n" + "> > > --\303\257\302\277\302\275\n" "> > > 2.5.0\n" "> > > \n" "> > > _______________________________________________\n" @@ -131,11 +131,7 @@ "> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel\n" "\n" "-- \n" - "Ville Syrj\303\244l\303\244\n" - "Intel OTC\n" - "_______________________________________________\n" - "dri-devel mailing list\n" - "dri-devel@lists.freedesktop.org\n" - https://lists.freedesktop.org/mailman/listinfo/dri-devel + "Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275\n" + Intel OTC -abc95ef1dcb2e18929d11c77d39af2376cd01d73a566700dc79157eb7bac241b +55c2616b2fe43b1006e34515bde0b0b78a26ae86ce2332ec35505a4fd0ffa5df
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.