intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Ander Conselvan De Oliveira <conselvan2@gmail.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v2 09/12] drm/i915: Remove connectors_active from intel_dp.c.
Date: Wed, 29 Jul 2015 16:26:25 +0300	[thread overview]
Message-ID: <1438176385.3839.12.camel@gmail.com> (raw)
In-Reply-To: <1438000541-3219-10-git-send-email-maarten.lankhorst@linux.intel.com>

On Mon, 2015-07-27 at 14:35 +0200, Maarten Lankhorst wrote:
> Now that everything's atomic, checking encoder->base.crtc is enough.

Don't you need to check encoder->base.crtc->state->active too?

> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_dp.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index cea7d1785d13..dccd9a0e2526 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -2624,7 +2624,7 @@ static void vlv_steal_power_sequencer(struct drm_device *dev,
>  		DRM_DEBUG_KMS("stealing pipe %c power sequencer from port %c\n",
>  			      pipe_name(pipe), port_name(port));
>  
> -		WARN(encoder->connectors_active,
> +		WARN(encoder->base.crtc,
>  		     "stealing pipe %c power sequencer from active eDP port %c\n",
>  		     pipe_name(pipe), port_name(port));
>  
> @@ -4240,10 +4240,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
>  
>  	WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
>  
> -	if (!intel_encoder->connectors_active)
> -		return;
> -
> -	if (WARN_ON(!intel_encoder->base.crtc))
> +	if (!intel_encoder->base.crtc)
>  		return;
>  
>  	if (!to_intel_crtc(intel_encoder->base.crtc)->active)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-07-29 13:26 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-27 12:35 [PATCH v2 00/12] DPMS updates and atomic state checking Maarten Lankhorst
2015-07-27 12:35 ` [PATCH v2 01/12] drm/i915: Make the force_thru workaround atomic Maarten Lankhorst
2015-07-27 14:04   ` Daniel Vetter
2015-07-28  7:57     ` Maarten Lankhorst
2015-07-28  8:25       ` Daniel Vetter
2015-07-28  9:04         ` [PATCH v2.1 01/12] drm/i915: Make the force_thru workaround atomic, v2 Maarten Lankhorst
2015-07-27 12:35 ` [PATCH v2 02/12] drm/i915: Update atomic state when removing mst connector Maarten Lankhorst
2015-07-28 12:13   ` Ander Conselvan De Oliveira
2015-08-03  8:10     ` [PATCH v2.1 2.7/12] drm/i915: Update atomic state when removing mst connector, v2 Maarten Lankhorst
2015-08-06  5:34   ` [PATCH v2 02/12] drm/i915: Update atomic state when removing mst connector Sivakumar Thulasimani
2015-08-06  7:28     ` Maarten Lankhorst
2015-07-27 12:35 ` [PATCH v2 03/12] drm/i915: Convert connector checking to atomic Maarten Lankhorst
2015-07-28 13:13   ` Ander Conselvan De Oliveira
2015-07-28 15:51     ` Maarten Lankhorst
2015-07-30 12:57     ` [PATCH v2.1 2.5/12] drm/i915: Validate the state after an atomic modeset, only, and pass the state Maarten Lankhorst
2015-07-31  9:32       ` Ander Conselvan De Oliveira
2015-07-30 12:57     ` [PATCH v2.1 03/12] drm/i915: Convert connector checking to atomic, v2 Maarten Lankhorst
2015-07-31  9:37       ` Ander Conselvan De Oliveira
2015-07-27 12:35 ` [PATCH v2 04/12] drm/i915: Remove some unneeded checks from check_crtc_state Maarten Lankhorst
2015-07-28 13:29   ` Ander Conselvan De Oliveira
2015-07-27 12:35 ` [PATCH v2 05/12] drm/i915: Remove connectors_active from state checking Maarten Lankhorst
2015-07-28 13:48   ` Ander Conselvan De Oliveira
2015-07-27 12:35 ` [PATCH v2 06/12] drm/i915: Make crtc checking use the atomic state Maarten Lankhorst
2015-07-29 11:49   ` Ander Conselvan De Oliveira
2015-07-29 12:04     ` Daniel Vetter
2015-07-29 12:31       ` Ander Conselvan De Oliveira
2015-07-29 12:44         ` Maarten Lankhorst
2015-07-30 12:59         ` [PATCH v2.1 06/12] drm/i915: Make crtc checking use the atomic state, v2 Maarten Lankhorst
2015-07-27 12:35 ` [PATCH v2 07/12] drm/i915: Get rid of dpms handling Maarten Lankhorst
2015-07-31  9:40   ` Ander Conselvan De Oliveira
2015-07-27 12:35 ` [PATCH v2 08/12] drm/i915: Remove connectors_active from sanitization Maarten Lankhorst
2015-07-29 13:09   ` Ander Conselvan De Oliveira
2015-07-30  7:11     ` Maarten Lankhorst
2015-07-30 13:00     ` [PATCH v2.1 08/12] drm/i915: Remove connectors_active from sanitization, v2 Maarten Lankhorst
2015-07-27 12:35 ` [PATCH v2 09/12] drm/i915: Remove connectors_active from intel_dp.c Maarten Lankhorst
2015-07-29 13:26   ` Ander Conselvan De Oliveira [this message]
2015-07-30  6:54     ` Maarten Lankhorst
2015-07-30  9:16       ` Ander Conselvan De Oliveira
2015-07-30 13:01         ` [PATCH v2.1 09/12] drm/i915: Remove connectors_active from intel_dp.c, v2 Maarten Lankhorst
2015-07-27 12:35 ` [PATCH v2 10/12] drm/i915: Remove connectors_active Maarten Lankhorst
2015-07-31  9:41   ` Ander Conselvan De Oliveira
2015-07-27 12:35 ` [PATCH v2 11/12] drm/i915: Only update mode related state if a modeset happened Maarten Lankhorst
2015-07-30 12:19   ` Ander Conselvan De Oliveira
2015-07-27 12:35 ` [PATCH v2 12/12] drm/i915: Handle return value in intel_pin_and_fence_fb_obj, v2 Maarten Lankhorst
2015-07-28  8:39   ` shuang.he

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=1438176385.3839.12.camel@gmail.com \
    --to=conselvan2@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=maarten.lankhorst@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).