From: "Sharma, Shashank" <shashank.sharma@intel.com>
To: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org
Cc: Dave Airlie <airlied@redhat.com>
Subject: Re: [PATCH 02/12] drm/i915: Remove encoder type checks from MST suspend/resume
Date: Thu, 16 Jun 2016 18:11:50 +0530 [thread overview]
Message-ID: <57629E8E.6020007@intel.com> (raw)
In-Reply-To: <1465382507-23085-3-git-send-email-ville.syrjala@linux.intel.com>
Regards
Shashank
On 6/8/2016 4:11 PM, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Now that eDP encoders won't have can_mst==true, we can throw out
> the encoder type checks from the MST suspend/resume paths.
>
> Cc: Dave Airlie <airlied@redhat.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 28 ++++++++++------------------
> 1 file changed, 10 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 0ab4f319f88f..29fb0d907f7b 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5659,15 +5659,12 @@ void intel_dp_mst_suspend(struct drm_device *dev)
> /* disable MST */
> for (i = 0; i < I915_MAX_PORTS; i++) {
> struct intel_digital_port *intel_dig_port = dev_priv->hotplug.irq_port[i];
> - if (!intel_dig_port)
> +
> + if (!intel_dig_port || !intel_dig_port->dp.can_mst)
> continue;
>
> - if (intel_dig_port->base.type == INTEL_OUTPUT_DISPLAYPORT) {
> - if (!intel_dig_port->dp.can_mst)
> - continue;
> - if (intel_dig_port->dp.is_mst)
> - drm_dp_mst_topology_mgr_suspend(&intel_dig_port->dp.mst_mgr);
> - }
> + if (intel_dig_port->dp.is_mst)
> + drm_dp_mst_topology_mgr_suspend(&intel_dig_port->dp.mst_mgr);
> }
> }
>
> @@ -5678,18 +5675,13 @@ void intel_dp_mst_resume(struct drm_device *dev)
>
> for (i = 0; i < I915_MAX_PORTS; i++) {
> struct intel_digital_port *intel_dig_port = dev_priv->hotplug.irq_port[i];
> - if (!intel_dig_port)
> - continue;
> - if (intel_dig_port->base.type == INTEL_OUTPUT_DISPLAYPORT) {
> - int ret;
> + int ret;
>
> - if (!intel_dig_port->dp.can_mst)
> - continue;
> + if (!intel_dig_port || !intel_dig_port->dp.can_mst)
> + continue;
>
> - ret = drm_dp_mst_topology_mgr_resume(&intel_dig_port->dp.mst_mgr);
> - if (ret != 0) {
> - intel_dp_check_mst_status(&intel_dig_port->dp);
> - }
> - }
> + ret = drm_dp_mst_topology_mgr_resume(&intel_dig_port->dp.mst_mgr);
> + if (ret)
> + intel_dp_check_mst_status(&intel_dig_port->dp);
Now when we are modifying this code, can we please check the return
value of this function 'intel_dp_check_mst_status' which returns an int ?
- Shashank
> }
> }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-06-16 12:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 10:41 [PATCH 00/12] drm/i915: Eliminate DDI encoder->type frobbery ville.syrjala
2016-06-08 10:41 ` [PATCH 01/12] drm/i915: Don't mark eDP encoders as MST capable ville.syrjala
2016-06-16 12:27 ` Sharma, Shashank
2016-06-16 20:35 ` Dave Airlie
2016-06-17 14:25 ` Ville Syrjälä
2016-06-08 10:41 ` [PATCH 02/12] drm/i915: Remove encoder type checks from MST suspend/resume ville.syrjala
2016-06-16 12:41 ` Sharma, Shashank [this message]
2016-06-16 13:40 ` Ville Syrjälä
2016-06-16 17:48 ` Sharma, Shashank
2016-06-08 10:41 ` [PATCH 03/12] drm/i915: Add output_types bitmask into the crtc state ville.syrjala
2016-06-08 13:25 ` Chris Wilson
2016-06-08 13:33 ` Ville Syrjälä
2016-06-13 14:25 ` Daniel Vetter
2016-06-13 16:24 ` Ville Syrjälä
2016-06-08 10:41 ` [PATCH 04/12] drm/i915: Unify intel_pipe_has_type() and intel_pipe_will_have_type() ville.syrjala
2016-06-08 10:41 ` [PATCH 05/12] drm/i915: Replace manual lvds and sdvo/hdmi counting with intel_crtc_has_type() ville.syrjala
2016-06-08 10:41 ` [PATCH 06/12] drm/i915: Kill has_dp_encoder from pipe_config ville.syrjala
2016-06-08 10:41 ` [PATCH 07/12] drm/i915: Replace some open coded intel_crtc_has_dp_encoder()s ville.syrjala
2016-06-08 10:41 ` [PATCH 08/12] drm/i915: s/INTEL_OUTPUT_DISPLAYPORT/INTEL_OUTPUT_DP/ ville.syrjala
2016-06-08 13:05 ` Kahola, Mika
2016-06-08 10:41 ` [PATCH 09/12] drm/i915: Kill has_dsi_encoder ville.syrjala
2016-06-08 10:41 ` [PATCH 10/12] drm/i915: Simplify hdmi_12bpc_possible() ville.syrjala
2016-06-08 10:41 ` [PATCH 11/12] drm/i915: Check for invalid cloning earlier during modeset ville.syrjala
2016-06-08 13:15 ` Chris Wilson
2016-06-08 13:27 ` Ville Syrjälä
2016-06-20 13:54 ` Maarten Lankhorst
2016-06-08 10:41 ` [PATCH 12/12] drm/i915: Stop frobbing with DDI encoder->type ville.syrjala
2016-06-08 11:13 ` ✓ Ro.CI.BAT: success for drm/i915: Eliminate DDI encoder->type frobbery Patchwork
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=57629E8E.6020007@intel.com \
--to=shashank.sharma@intel.com \
--cc=airlied@redhat.com \
--cc=intel-gfx@lists.freedesktop.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