[PATCH] drm/i915: Fix spelling mistake in intel_psr

[PATCH] drm/i915: Fix spelling mistake in intel_psr

[Sean Paul]

From: Sean Paul <seanpaul@chromium.org>

Noticed this while reading the comments, s/defesive/defensive/

Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
 drivers/gpu/drm/i915/intel_psr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index 4bd5768731ee..562718cbb198 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -748,7 +748,7 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state)
 	/*
 	 * Max time for PSR to idle = Inverse of the refresh rate +
 	 * 6 ms of exit training time + 1.5 ms of aux channel
-	 * handshake. 50 msec is defesive enough to cover everything.
+	 * handshake. 50 msec is defensive enough to cover everything.
 	 */
 	return intel_wait_for_register(dev_priv, reg, mask,
 				       EDP_PSR_STATUS_STATE_IDLE, 50);
-- 
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Fix spelling mistake in intel_psr

[Rodrigo Vivi]

On Fri, Oct 26, 2018 at 03:45:04PM -0400, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
> 
> Noticed this while reading the comments, s/defesive/defensive/
> 
> Signed-off-by: Sean Paul <seanpaul@chromium.org>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_psr.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index 4bd5768731ee..562718cbb198 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -748,7 +748,7 @@ int intel_psr_wait_for_idle(const struct intel_crtc_state *new_crtc_state)
>  	/*
>  	 * Max time for PSR to idle = Inverse of the refresh rate +
>  	 * 6 ms of exit training time + 1.5 ms of aux channel
> -	 * handshake. 50 msec is defesive enough to cover everything.
> +	 * handshake. 50 msec is defensive enough to cover everything.
>  	 */
>  	return intel_wait_for_register(dev_priv, reg, mask,
>  				       EDP_PSR_STATUS_STATE_IDLE, 50);
> -- 
> Sean Paul, Software Engineer, Google / Chromium OS
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for drm/i915: Fix spelling mistake in intel_psr

[Patchwork]

== Series Details ==

Series: drm/i915: Fix spelling mistake in intel_psr
URL   : https://patchwork.freedesktop.org/series/51621/
State : failure

== Summary ==

Applying: drm/i915: Fix spelling mistake in intel_psr
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/intel_psr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/intel_psr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_psr.c
error: Failed to merge in the changes.
Patch failed at 0001 drm/i915: Fix spelling mistake in intel_psr
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx