From: Carlos Santa <carlos.santa@intel.com>
To: "ville.syrjala@linux.intel.com" <ville.syrjala@linux.intel.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Cc: "Kirill A . Shutemov" <kirill@shutemov.name>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH 4/4] drm/dp/mst: Check peer device type before attempting EDID read
Date: Wed, 26 Oct 2016 11:31:55 -0700 [thread overview]
Message-ID: <1477506715.5667.1.camel@intel.com> (raw)
In-Reply-To: <1477472755-15288-5-git-send-email-ville.syrjala@linux.intel.com>
On Wed, 2016-10-26 at 02:05 -0700, ville.syrjala@linux.intel.com wrote:
> 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
typo above
> around
> with an i2c adapter that doesn't actually exist.
>
Would it be worth pasting the stack trace of the crash??
Carlos
> Cc: stable@vger.kernel.org
> Cc: Carlos Santa <carlos.santa@intel.com>
> Cc: Kirill A. Shutemov <kirill@shutemov.name>
> 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>
> ---
> 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
> index 956babc161e5..690d1b407a90 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ 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;
> }
> - 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-
> >connector, &port->aux.ddc);
> drm_mode_connector_set_tile_property(port-
> >connector);
> }
> --
> 2.7.4
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-10-26 18:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-26 9:05 [PATCH 0/4] drm: Fix MST oopses in fbdev restore ville.syrjala
2016-10-26 9:05 ` [PATCH 1/4] drm/fb-helper: Fix connector ref leak on error ville.syrjala
2016-10-26 9:48 ` Chris Wilson
2016-10-26 9:05 ` [PATCH 2/4] drm/fb-helper: Keep references for the current set of used connectors ville.syrjala
2016-10-26 9:52 ` Chris Wilson
2016-10-26 12:34 ` Ville Syrjälä
2016-10-26 13:31 ` [PATCH v2 " ville.syrjala
2016-10-26 13:54 ` Chris Wilson
2016-10-26 14:11 ` Ville Syrjälä
2016-10-26 14:41 ` [PATCH v3 " ville.syrjala
2016-10-26 9:05 ` [PATCH 3/4] drm/dp/mst: Clear port->pdt when tearing down the i2c adapter ville.syrjala
2016-10-26 12:53 ` Daniel Vetter
2016-10-26 13:02 ` Ville Syrjälä
2016-10-26 13:30 ` [PATCH v2 " ville.syrjala
2016-10-26 13:35 ` Ville Syrjälä
2016-10-26 14:02 ` Daniel Vetter
2016-10-26 16:54 ` Daniel Vetter
2016-10-26 9:05 ` [PATCH 4/4] drm/dp/mst: Check peer device type before attempting EDID read ville.syrjala
2016-10-26 12:55 ` Daniel Vetter
2016-10-26 13:05 ` Ville Syrjälä
2016-10-26 18:31 ` Carlos Santa [this message]
2016-10-26 18:45 ` Ville Syrjälä
2016-10-26 13:38 ` [PATCH 0/4] drm: Fix MST oopses in fbdev restore Ville Syrjälä
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477506715.5667.1.camel@intel.com \
--to=carlos.santa@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kirill@shutemov.name \
--cc=stable@vger.kernel.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).