All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Nuke 'mode' argument to intel_get_load_detect_pipe()
Date: Wed, 30 Oct 2019 16:43:50 +0200	[thread overview]
Message-ID: <87lft28fa1.fsf@intel.com> (raw)
In-Reply-To: <20191029132323.18113-1-ville.syrjala@linux.intel.com>

On Tue, 29 Oct 2019, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We always pass mode==NULL to intel_get_load_detect_pipe(). Remove
> the pointless function argument.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_crt.c     | 2 +-
>  drivers/gpu/drm/i915/display/intel_display.c | 7 ++-----
>  drivers/gpu/drm/i915/display/intel_display.h | 1 -
>  drivers/gpu/drm/i915/display/intel_tv.c      | 2 +-
>  4 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index ff6126ea793c..25118619e240 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -844,7 +844,7 @@ intel_crt_detect(struct drm_connector *connector,
>  	}
>  
>  	/* for pre-945g platforms use load detect */
> -	ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
> +	ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
>  	if (ret > 0) {
>  		if (intel_crt_detect_ddc(connector))
>  			status = connector_status_connected;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e56a75c07043..1862546356fd 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -11328,7 +11328,6 @@ static int intel_modeset_disable_planes(struct drm_atomic_state *state,
>  }
>  
>  int intel_get_load_detect_pipe(struct drm_connector *connector,
> -			       const struct drm_display_mode *mode,
>  			       struct intel_load_detect_pipe *old,
>  			       struct drm_modeset_acquire_ctx *ctx)
>  {
> @@ -11435,10 +11434,8 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
>  
>  	crtc_state->base.active = crtc_state->base.enable = true;
>  
> -	if (!mode)
> -		mode = &load_detect_mode;
> -
> -	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
> +	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base,
> +					   &load_detect_mode);
>  	if (ret)
>  		goto fail;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index ca7ca2804d8b..355c50088589 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -509,7 +509,6 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
>  			 struct intel_digital_port *dport,
>  			 unsigned int expected_mask);
>  int intel_get_load_detect_pipe(struct drm_connector *connector,
> -			       const struct drm_display_mode *mode,
>  			       struct intel_load_detect_pipe *old,
>  			       struct drm_modeset_acquire_ctx *ctx);
>  void intel_release_load_detect_pipe(struct drm_connector *connector,
> diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
> index 70726b481244..5556d8300a88 100644
> --- a/drivers/gpu/drm/i915/display/intel_tv.c
> +++ b/drivers/gpu/drm/i915/display/intel_tv.c
> @@ -1701,7 +1701,7 @@ intel_tv_detect(struct drm_connector *connector,
>  		struct intel_load_detect_pipe tmp;
>  		int ret;
>  
> -		ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
> +		ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
>  		if (ret < 0)
>  			return ret;

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Nuke 'mode' argument to intel_get_load_detect_pipe()
Date: Wed, 30 Oct 2019 16:43:50 +0200	[thread overview]
Message-ID: <87lft28fa1.fsf@intel.com> (raw)
Message-ID: <20191030144350.Uue6FiH9IBNvLh97CMGKxLCO3QCcYsMFXOvwqszBrR4@z> (raw)
In-Reply-To: <20191029132323.18113-1-ville.syrjala@linux.intel.com>

On Tue, 29 Oct 2019, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> We always pass mode==NULL to intel_get_load_detect_pipe(). Remove
> the pointless function argument.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_crt.c     | 2 +-
>  drivers/gpu/drm/i915/display/intel_display.c | 7 ++-----
>  drivers/gpu/drm/i915/display/intel_display.h | 1 -
>  drivers/gpu/drm/i915/display/intel_tv.c      | 2 +-
>  4 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_crt.c b/drivers/gpu/drm/i915/display/intel_crt.c
> index ff6126ea793c..25118619e240 100644
> --- a/drivers/gpu/drm/i915/display/intel_crt.c
> +++ b/drivers/gpu/drm/i915/display/intel_crt.c
> @@ -844,7 +844,7 @@ intel_crt_detect(struct drm_connector *connector,
>  	}
>  
>  	/* for pre-945g platforms use load detect */
> -	ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
> +	ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
>  	if (ret > 0) {
>  		if (intel_crt_detect_ddc(connector))
>  			status = connector_status_connected;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index e56a75c07043..1862546356fd 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -11328,7 +11328,6 @@ static int intel_modeset_disable_planes(struct drm_atomic_state *state,
>  }
>  
>  int intel_get_load_detect_pipe(struct drm_connector *connector,
> -			       const struct drm_display_mode *mode,
>  			       struct intel_load_detect_pipe *old,
>  			       struct drm_modeset_acquire_ctx *ctx)
>  {
> @@ -11435,10 +11434,8 @@ int intel_get_load_detect_pipe(struct drm_connector *connector,
>  
>  	crtc_state->base.active = crtc_state->base.enable = true;
>  
> -	if (!mode)
> -		mode = &load_detect_mode;
> -
> -	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base, mode);
> +	ret = drm_atomic_set_mode_for_crtc(&crtc_state->base,
> +					   &load_detect_mode);
>  	if (ret)
>  		goto fail;
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index ca7ca2804d8b..355c50088589 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -509,7 +509,6 @@ void vlv_wait_port_ready(struct drm_i915_private *dev_priv,
>  			 struct intel_digital_port *dport,
>  			 unsigned int expected_mask);
>  int intel_get_load_detect_pipe(struct drm_connector *connector,
> -			       const struct drm_display_mode *mode,
>  			       struct intel_load_detect_pipe *old,
>  			       struct drm_modeset_acquire_ctx *ctx);
>  void intel_release_load_detect_pipe(struct drm_connector *connector,
> diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c
> index 70726b481244..5556d8300a88 100644
> --- a/drivers/gpu/drm/i915/display/intel_tv.c
> +++ b/drivers/gpu/drm/i915/display/intel_tv.c
> @@ -1701,7 +1701,7 @@ intel_tv_detect(struct drm_connector *connector,
>  		struct intel_load_detect_pipe tmp;
>  		int ret;
>  
> -		ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
> +		ret = intel_get_load_detect_pipe(connector, &tmp, ctx);
>  		if (ret < 0)
>  			return ret;

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-10-30 14:43 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-29 13:23 [PATCH] drm/i915: Nuke 'mode' argument to intel_get_load_detect_pipe() Ville Syrjala
2019-10-29 13:23 ` [Intel-gfx] " Ville Syrjala
2019-10-29 16:11 ` ✓ Fi.CI.BAT: success for " Patchwork
2019-10-29 16:11   ` [Intel-gfx] " Patchwork
2019-10-30  6:06 ` ✓ Fi.CI.IGT: " Patchwork
2019-10-30  6:06   ` [Intel-gfx] " Patchwork
2019-10-30 14:43 ` Jani Nikula [this message]
2019-10-30 14:43   ` [Intel-gfx] [PATCH] " Jani Nikula

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=87lft28fa1.fsf@intel.com \
    --to=jani.nikula@linux.intel.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 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.