diff for duplicates of <20161026184556.GT4617@intel.com> diff --git a/a/1.txt b/N1/1.txt index 4919207..e993604 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Wed, Oct 26, 2016 at 11:31:55AM -0700, Carlos Santa wrote: > On Wed, 2016-10-26 at 02:05 -0700, ville.syrjala@linux.intel.com wrote: -> > From: Ville Syrjälä <ville.syrjala@linux.intel.com> +> > From: Ville Syrj�l� <ville.syrjala@linux.intel.com> > > > > Only certain types of pdts have the DDC bus registered, so check for > > that before we attempt the EDID read. Othwewise we risk playing @@ -25,10 +25,10 @@ Can't hurt. > > Tested-by: Carlos Santa <carlos.santa@intel.com> > > Tested-by: Kirill A. Shutemov <kirill@shutemov.name> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97666 -> > 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/drm_dp_mst_topology.c | 4 +++- -> > 1 file changed, 3 insertions(+), 1 deletion(-) +> > �drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++- +> > �1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c > > b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -37,22 +37,22 @@ Can't hurt. > > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c > > @@ -1162,7 +1162,9 @@ static void drm_dp_add_port(struct > > drm_dp_mst_branch *mstb, -> > drm_dp_put_port(port); -> > goto out; -> > } +> > � drm_dp_put_port(port); +> > � goto out; +> > � } > > - if (port->port_num >= DP_MST_LOGICAL_PORT_0) { > > + if ((port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV || -> > + port->pdt == DP_PEER_DEVICE_SST_SINK) && -> > + port->port_num >= DP_MST_LOGICAL_PORT_0) { -> > port->cached_edid = drm_get_edid(port- +> > + �����port->pdt == DP_PEER_DEVICE_SST_SINK) && +> > + ����port->port_num >= DP_MST_LOGICAL_PORT_0) { +> > � port->cached_edid = drm_get_edid(port- > > >connector, &port->aux.ddc); -> > drm_mode_connector_set_tile_property(port- +> > � drm_mode_connector_set_tile_property(port- > > >connector); -> > } -> > -- +> > � } +> > --� > > 2.7.4 > > -- -Ville Syrjälä +Ville Syrj�l� Intel OTC diff --git a/a/content_digest b/N1/content_digest index 61c6d10..de676ef 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,7 +12,7 @@ "b\0" "On Wed, Oct 26, 2016 at 11:31:55AM -0700, Carlos Santa wrote:\n" "> On Wed, 2016-10-26 at 02:05 -0700, 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" "> > Only certain types of pdts have the DDC bus registered, so check for\n" "> > that before we attempt the EDID read. Othwewise we risk playing \n" @@ -37,10 +37,10 @@ "> > Tested-by: Carlos Santa <carlos.santa@intel.com>\n" "> > Tested-by: Kirill A. Shutemov <kirill@shutemov.name>\n" "> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97666\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/drm_dp_mst_topology.c | 4 +++-\n" - "> > \302\2401 file changed, 3 insertions(+), 1 deletion(-)\n" + "> > \303\257\302\277\302\275drivers/gpu/drm/drm_dp_mst_topology.c | 4 +++-\n" + "> > \303\257\302\277\302\2751 file changed, 3 insertions(+), 1 deletion(-)\n" "> > \n" "> > diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c\n" "> > b/drivers/gpu/drm/drm_dp_mst_topology.c\n" @@ -49,24 +49,24 @@ "> > +++ b/drivers/gpu/drm/drm_dp_mst_topology.c\n" "> > @@ -1162,7 +1162,9 @@ static void drm_dp_add_port(struct\n" "> > drm_dp_mst_branch *mstb,\n" - "> > \302\240\t\t\tdrm_dp_put_port(port);\n" - "> > \302\240\t\t\tgoto out;\n" - "> > \302\240\t\t}\n" + "> > \303\257\302\277\302\275\t\t\tdrm_dp_put_port(port);\n" + "> > \303\257\302\277\302\275\t\t\tgoto out;\n" + "> > \303\257\302\277\302\275\t\t}\n" "> > -\t\tif (port->port_num >= DP_MST_LOGICAL_PORT_0) {\n" "> > +\t\tif ((port->pdt == DP_PEER_DEVICE_DP_LEGACY_CONV ||\n" - "> > +\t\t\302\240\302\240\302\240\302\240\302\240port->pdt == DP_PEER_DEVICE_SST_SINK) &&\n" - "> > +\t\t\302\240\302\240\302\240\302\240port->port_num >= DP_MST_LOGICAL_PORT_0) {\n" - "> > \302\240\t\t\tport->cached_edid = drm_get_edid(port-\n" + "> > +\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\275port->pdt == DP_PEER_DEVICE_SST_SINK) &&\n" + "> > +\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\275port->port_num >= DP_MST_LOGICAL_PORT_0) {\n" + "> > \303\257\302\277\302\275\t\t\tport->cached_edid = drm_get_edid(port-\n" "> > >connector, &port->aux.ddc);\n" - "> > \302\240\t\t\tdrm_mode_connector_set_tile_property(port-\n" + "> > \303\257\302\277\302\275\t\t\tdrm_mode_connector_set_tile_property(port-\n" "> > >connector);\n" - "> > \302\240\t\t}\n" - "> > --\302\240\n" + "> > \303\257\302\277\302\275\t\t}\n" + "> > --\303\257\302\277\302\275\n" "> > 2.7.4\n" "> > \n" "\n" "-- \n" - "Ville Syrj\303\244l\303\244\n" + "Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275\n" Intel OTC -084df63e5639a501c1995d327f3064af4ef19818f49e1f38d9035febf4f9681a +090456bdcb6066ab9f313bcc2adcb5c115470904460f9908ff2bd9648ef51971
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.