Skip to contentSkip to conversation

drm/i915: Fix spelling mistake in intel_psr

PATCH In review Sean Paul 3 participants 3 messages Oct 26, 2018

Subsystems (2)
lore
Share & tools
lore

Sean Paul

author
#0 lore raw

PATCH 1/1 drm/i915: Fix spelling mistake in intel_psr

From: Sean Paul <[email protected]>

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

---
 drivers/gpu/drm/i915/intel_psr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_psr.c +1 -1
index 4bd5768731ee..562718cbb198 100644
@@ -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);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Sean Paul

From: Sean Paul <[email protected]>

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

Quoted 24 lines
---
 drivers/gpu/drm/i915/intel_psr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_psr.c +1 -1
index 4bd5768731ee..562718cbb198 100644
@@ -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);
Signature · 6 lines
Sean Paul, Software Engineer, Google / Chromium OS

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

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

In reply to Sean Paul
== Series Details ==

== 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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx