Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Lucas De Marchi <lucas.demarchi@intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 2/8] drm/i915/display: add namespace to intel_finish_reset
Date: Mon, 09 Nov 2020 11:00:07 +0200	[thread overview]
Message-ID: <87blg6ucq0.fsf@intel.com> (raw)
In-Reply-To: <20201106225531.920641-2-lucas.demarchi@intel.com>

On Fri, 06 Nov 2020, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> Rename intel_finish_reset to intel_display_finish_reset, so it's clear
> from gt/ that we are calling out the display code.

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

>
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>  drivers/gpu/drm/i915/display/intel_display.h | 2 +-
>  drivers/gpu/drm/i915/gt/intel_reset.c        | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 4050bc60f632..ab04c89cdf05 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -5011,7 +5011,7 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv)
>  	state->acquire_ctx = ctx;
>  }
>  
> -void intel_finish_reset(struct drm_i915_private *dev_priv)
> +void intel_display_finish_reset(struct drm_i915_private *dev_priv)
>  {
>  	struct drm_device *dev = &dev_priv->drm;
>  	struct drm_modeset_acquire_ctx *ctx = &dev_priv->reset_ctx;
> diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
> index 30960cc8b8a6..a988f9518ece 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.h
> +++ b/drivers/gpu/drm/i915/display/intel_display.h
> @@ -591,7 +591,7 @@ int lpt_get_iclkip(struct drm_i915_private *dev_priv);
>  bool intel_fuzzy_clock_check(int clock1, int clock2);
>  
>  void intel_display_prepare_reset(struct drm_i915_private *dev_priv);
> -void intel_finish_reset(struct drm_i915_private *dev_priv);
> +void intel_display_finish_reset(struct drm_i915_private *dev_priv);
>  void intel_dp_get_m_n(struct intel_crtc *crtc,
>  		      struct intel_crtc_state *pipe_config);
>  void intel_dp_set_m_n(const struct intel_crtc_state *crtc_state,
> diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c
> index d71bad8c07b7..6b07ff5249f5 100644
> --- a/drivers/gpu/drm/i915/gt/intel_reset.c
> +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
> @@ -1198,7 +1198,7 @@ static void intel_gt_reset_global(struct intel_gt *gt,
>  
>  		intel_gt_reset(gt, engine_mask, reason);
>  
> -		intel_finish_reset(gt->i915);
> +		intel_display_finish_reset(gt->i915);
>  	}
>  
>  	if (!test_bit(I915_WEDGED, &gt->reset.flags))

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

  reply	other threads:[~2020-11-09  9:00 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-06 22:55 [Intel-gfx] [PATCH 1/8] drm/i915/display: add namespace to intel_prepare_reset Lucas De Marchi
2020-11-06 22:55 ` [Intel-gfx] [PATCH 2/8] drm/i915/display: add namespace to intel_finish_reset Lucas De Marchi
2020-11-09  9:00   ` Jani Nikula [this message]
2020-11-06 22:55 ` [Intel-gfx] [PATCH 3/8] drm/i915/display: Do not reset display when there is none Lucas De Marchi
2020-11-09  9:00   ` Jani Nikula
2020-11-06 22:55 ` [Intel-gfx] [PATCH 4/8] drm/i915/display: return earlier from intel_modeset_init() without display Lucas De Marchi
2020-11-09 20:46   ` Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 5/8] drm/i915/display: Do not set any power wells when there is no display Lucas De Marchi
2020-11-06 23:18   ` Lucas De Marchi
2020-11-06 22:55 ` [Intel-gfx] [PATCH 6/8] drm/i915: re-order if/else ladder for hpd_irq_setup Lucas De Marchi
2020-11-09 20:47   ` Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 7/8] drm/i915: move display-related to the end of intel_irq_init() Lucas De Marchi
2020-11-09 20:48   ` Souza, Jose
2020-11-06 22:55 ` [Intel-gfx] [PATCH 8/8] drm/i915: Do not setup hpd without display Lucas De Marchi
2020-11-09 20:48   ` Souza, Jose
2020-11-06 23:20 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/8] drm/i915/display: add namespace to intel_prepare_reset Patchwork
2020-11-06 23:48 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2020-11-07  1:22 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-11-09  8:59 ` [Intel-gfx] [PATCH 1/8] " 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=87blg6ucq0.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=lucas.demarchi@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