All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Add Sphinx-compatible references to struct fields
@ 2019-10-03 17:28 Jonathan Neuschäfer
  2019-10-03 18:45 ` ✗ Fi.CI.BUILD: failure for " Patchwork
  0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Neuschäfer @ 2019-10-03 17:28 UTC (permalink / raw)
  To: intel-gfx
  Cc: Jonathan Neuschäfer, Jani Nikula, Joonas Lahtinen,
	Rodrigo Vivi, David Airlie, Daniel Vetter, dri-devel,
	linux-kernel

This fixes the following kernel-doc warnings and makes the corrsponding fields
show up in the generated HTML:

./drivers/gpu/drm/i915/i915_drv.h:1143: warning: Incorrect use of kernel-doc format:          * State of the OA buffer.
./drivers/gpu/drm/i915/i915_drv.h:1154: warning: Incorrect use of kernel-doc format:                  * Locks reads and writes to all head/tail state
./drivers/gpu/drm/i915/i915_drv.h:1176: warning: Incorrect use of kernel-doc format:                  * One 'aging' tail pointer and one 'aged' tail pointer ready to
./drivers/gpu/drm/i915/i915_drv.h:1188: warning: Incorrect use of kernel-doc format:                  * Index for the aged tail ready to read() data up to.
./drivers/gpu/drm/i915/i915_drv.h:1193: warning: Incorrect use of kernel-doc format:                  * A monotonic timestamp for when the current aging tail pointer
./drivers/gpu/drm/i915/i915_drv.h:1199: warning: Incorrect use of kernel-doc format:                  * Although we can always read back the head pointer register,

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 drivers/gpu/drm/i915/i915_drv.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 772154e4073e..55782e78f026 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1140,7 +1140,7 @@ struct i915_perf_stream {
 	int period_exponent;

 	/**
-	 * State of the OA buffer.
+	 * @oa_buffer: State of the OA buffer.
 	 */
 	struct {
 		struct i915_vma *vma;
@@ -1151,6 +1151,7 @@ struct i915_perf_stream {
 		int size_exponent;

 		/**
+		 * @oa_buffer.ptr_lock:
 		 * Locks reads and writes to all head/tail state
 		 *
 		 * Consider: the head and tail pointer state needs to be read
@@ -1173,6 +1174,7 @@ struct i915_perf_stream {
 		spinlock_t ptr_lock;

 		/**
+		 * @oa_buffer.tails:
 		 * One 'aging' tail pointer and one 'aged' tail pointer ready to
 		 * used for reading.
 		 *
@@ -1185,17 +1187,20 @@ struct i915_perf_stream {
 		} tails[2];

 		/**
+		 * @oa_buffer.aged_tail_idx:
 		 * Index for the aged tail ready to read() data up to.
 		 */
 		unsigned int aged_tail_idx;

 		/**
+		 * @oa_buffer.aging_timestamp:
 		 * A monotonic timestamp for when the current aging tail pointer
 		 * was read; used to determine when it is old enough to trust.
 		 */
 		u64 aging_timestamp;

 		/**
+		 * @oa_buffer.head:
 		 * Although we can always read back the head pointer register,
 		 * we prefer to avoid trusting the HW state, just to avoid any
 		 * risk that some hardware condition could * somehow bump the
--
2.20.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
  2019-10-03 17:28 [PATCH] drm/i915: Add Sphinx-compatible references to struct fields Jonathan Neuschäfer
@ 2019-10-03 18:45 ` Patchwork
  2019-10-04 13:26   ` Jonathan Neuschäfer
  0 siblings, 1 reply; 5+ messages in thread
From: Patchwork @ 2019-10-03 18:45 UTC (permalink / raw)
  To: Jonathan Neuschäfer; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Add Sphinx-compatible references to struct fields
URL   : https://patchwork.freedesktop.org/series/67550/
State : failure

== Summary ==

Applying: drm/i915: Add Sphinx-compatible references to struct fields
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/i915_drv.h
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/i915_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 drm/i915: Add Sphinx-compatible references to struct fields
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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
  2019-10-03 18:45 ` ✗ Fi.CI.BUILD: failure for " Patchwork
@ 2019-10-04 13:26   ` Jonathan Neuschäfer
  2019-10-07 11:36     ` Jani Nikula
  0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Neuschäfer @ 2019-10-04 13:26 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jonathan Neuschäfer


[-- Attachment #1.1: Type: text/plain, Size: 769 bytes --]

On Thu, Oct 03, 2019 at 06:45:56PM -0000, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: Add Sphinx-compatible references to struct fields
> URL   : https://patchwork.freedesktop.org/series/67550/
> State : failure
> 
> == Summary ==
> 
> Applying: drm/i915: Add Sphinx-compatible references to struct fields
> Using index info to reconstruct a base tree...
> M	drivers/gpu/drm/i915/i915_drv.h
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/gpu/drm/i915/i915_drv.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h

I'm not sure what's wrong here. The patch applies cleanly to v5.4-rc1
and linux-next. Maybe patchwork is applying it to an older base?


Thanks,
Jonathan Neuschäfer

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
  2019-10-04 13:26   ` Jonathan Neuschäfer
@ 2019-10-07 11:36     ` Jani Nikula
  2019-10-07 17:44       ` Jonathan Neuschäfer
  0 siblings, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2019-10-07 11:36 UTC (permalink / raw)
  To: intel-gfx; +Cc: Jonathan Neuschäfer

On Fri, 04 Oct 2019, Jonathan Neuschäfer <j.neuschaefer@gmx.net> wrote:
> On Thu, Oct 03, 2019 at 06:45:56PM -0000, Patchwork wrote:
>> == Series Details ==
>> 
>> Series: drm/i915: Add Sphinx-compatible references to struct fields
>> URL   : https://patchwork.freedesktop.org/series/67550/
>> State : failure
>> 
>> == Summary ==
>> 
>> Applying: drm/i915: Add Sphinx-compatible references to struct fields
>> Using index info to reconstruct a base tree...
>> M	drivers/gpu/drm/i915/i915_drv.h
>> Falling back to patching base and 3-way merge...
>> Auto-merging drivers/gpu/drm/i915/i915_drv.h
>> CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
>
> I'm not sure what's wrong here. The patch applies cleanly to v5.4-rc1
> and linux-next. Maybe patchwork is applying it to an older base?

On the contrary, to a much newer base. Try drm-tip branch of [1].

BR,
Jani.


[1] https://cgit.freedesktop.org/drm/drm-tip


>
>
> Thanks,
> Jonathan Neuschäfer
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: ✗ Fi.CI.BUILD: failure for drm/i915: Add Sphinx-compatible references to struct fields
  2019-10-07 11:36     ` Jani Nikula
@ 2019-10-07 17:44       ` Jonathan Neuschäfer
  0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Neuschäfer @ 2019-10-07 17:44 UTC (permalink / raw)
  To: Jani Nikula; +Cc: intel-gfx, Jonathan Neuschäfer


[-- Attachment #1.1: Type: text/plain, Size: 627 bytes --]

On Mon, Oct 07, 2019 at 02:36:30PM +0300, Jani Nikula wrote:
> On Fri, 04 Oct 2019, Jonathan Neuschäfer <j.neuschaefer@gmx.net> wrote:
[...]
> > I'm not sure what's wrong here. The patch applies cleanly to v5.4-rc1
> > and linux-next. Maybe patchwork is applying it to an older base?
> 
> On the contrary, to a much newer base. Try drm-tip branch of [1].
> 
> BR,
> Jani.
> 
> [1] https://cgit.freedesktop.org/drm/drm-tip

Thanks for the hint!

Turns out someone already sent a similar fix, commit 56316cbc9c98
("drm/i915/perf: Fix use of kernel-doc format in structure members").



Jonathan Neuschäfer

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-10-07 17:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-03 17:28 [PATCH] drm/i915: Add Sphinx-compatible references to struct fields Jonathan Neuschäfer
2019-10-03 18:45 ` ✗ Fi.CI.BUILD: failure for " Patchwork
2019-10-04 13:26   ` Jonathan Neuschäfer
2019-10-07 11:36     ` Jani Nikula
2019-10-07 17:44       ` Jonathan Neuschäfer

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.