* [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files
@ 2019-06-05 9:56 Jani Nikula
2019-06-05 9:56 ` [PATCH 2/2] drm/i915: fix documentation build warnings Jani Nikula
2019-06-05 10:29 ` [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Mika Kuoppala
0 siblings, 2 replies; 5+ messages in thread
From: Jani Nikula @ 2019-06-05 9:56 UTC (permalink / raw)
To: intel-gfx; +Cc: linux-doc, jani.nikula, Chris Wilson, Mika Kuoppala
The error messages could be more descriptive, but fix these caused by
file moves:
WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -internal
./drivers/gpu/drm/i915/i915_gem_shrinker.c' failed with return code 2
WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -function
User command execution ./drivers/gpu/drm/i915/i915_gem_execbuffer.c'
failed with return code 1
WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -internal
./drivers/gpu/drm/i915/i915_gem_tiling.c' failed with return code 2
WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -function
buffer object tiling ./drivers/gpu/drm/i915/i915_gem_tiling.c'
failed with return code 1
Fixes: 10be98a77c55 ("drm/i915: Move more GEM objects under gem/")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Documentation/gpu/i915.rst | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 6c75380b2928..f98ee95da90f 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -349,7 +349,7 @@ of buffer object caches. Shrinking is used to make main memory
available. Note that this is mostly orthogonal to evicting buffer
objects, which has the goal to make space in gpu virtual address spaces.
-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_shrinker.c
+.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
:internal:
Batchbuffer Parsing
@@ -373,7 +373,7 @@ Batchbuffer Pools
User Batchbuffer Execution
--------------------------
-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_execbuffer.c
+.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
:doc: User command execution
Logical Rings, Logical Ring Contexts and Execlists
@@ -382,9 +382,6 @@ Logical Rings, Logical Ring Contexts and Execlists
.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c
:doc: Logical Rings, Logical Ring Contexts and Execlists
-.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c
- :internal:
-
Global GTT views
----------------
@@ -415,10 +412,10 @@ Hardware Tiling and Swizzling Details
Object Tiling IOCTLs
--------------------
-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
+.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c
:internal:
-.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
+.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c
:doc: buffer object tiling
WOPCM
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] drm/i915: fix documentation build warnings
2019-06-05 9:56 [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Jani Nikula
@ 2019-06-05 9:56 ` Jani Nikula
2019-06-05 12:35 ` [Intel-gfx] " Mika Kuoppala
2019-06-05 10:29 ` [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Mika Kuoppala
1 sibling, 1 reply; 5+ messages in thread
From: Jani Nikula @ 2019-06-05 9:56 UTC (permalink / raw)
To: intel-gfx; +Cc: linux-doc, jani.nikula
Just a straightforward bag of fixes for a clean htmldocs build.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
Documentation/gpu/i915.rst | 6 ------
drivers/gpu/drm/i915/i915_reg.h | 2 +-
drivers/gpu/drm/i915/i915_vma.h | 2 ++
drivers/gpu/drm/i915/intel_guc_fwif.h | 2 ++
drivers/gpu/drm/i915/intel_runtime_pm.c | 2 --
5 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index f98ee95da90f..300220c4b498 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -475,12 +475,6 @@ i915_context_create and i915_context_free
.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h
:doc: i915_context_create and i915_context_free tracepoints
-switch_mm
----------
-
-.. kernel-doc:: drivers/gpu/drm/i915/i915_trace.h
- :doc: switch_mm tracepoint
-
Perf
====
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 07e3f861a92e..b7c13d5deb15 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -153,7 +153,7 @@
* REG_FIELD_PREP() - Prepare a u32 bitfield value
* @__mask: shifted mask defining the field's length and position
* @__val: value to put in the field
-
+ *
* Local copy of FIELD_PREP() to generate an integer constant expression, force
* u32 and for consistency with REG_FIELD_GET(), REG_BIT() and REG_GENMASK().
*
diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
index 2657c99fe187..bc15083bd479 100644
--- a/drivers/gpu/drm/i915/i915_vma.h
+++ b/drivers/gpu/drm/i915/i915_vma.h
@@ -40,6 +40,8 @@
enum i915_cache_level;
/**
+ * DOC: Virtual Memory Address
+ *
* A VMA represents a GEM BO that is bound into an address space. Therefore, a
* VMA's presence cannot be guaranteed before binding, or after unbinding the
* object into/from the address space.
diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
index 3d1de288d96c..f55f3bc8524d 100644
--- a/drivers/gpu/drm/i915/intel_guc_fwif.h
+++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
@@ -500,6 +500,8 @@ enum guc_log_buffer_type {
};
/**
+ * struct guc_log_buffer_state - GuC log buffer state
+ *
* Below state structure is used for coordination of retrieval of GuC firmware
* logs. Separate state is maintained for each log buffer type.
* read_ptr points to the location where i915 read last in log buffer and
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 3bdeea596ad5..af3c1ada1b2e 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -391,8 +391,6 @@ static intel_wakeref_t __intel_runtime_pm_get(struct drm_i915_private *i915,
* asynchronous PM management from display code) and ensures that it is powered
* up. Raw references are not considered during wakelock assert checks.
*
- * Returns:
- * True when the power domain is enabled, false otherwise.
* Any runtime pm reference obtained by this function must have a symmetric
* call to intel_runtime_pm_put_raw() to release the reference again.
*
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files
2019-06-05 9:56 [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Jani Nikula
2019-06-05 9:56 ` [PATCH 2/2] drm/i915: fix documentation build warnings Jani Nikula
@ 2019-06-05 10:29 ` Mika Kuoppala
2019-06-06 8:23 ` Jani Nikula
1 sibling, 1 reply; 5+ messages in thread
From: Mika Kuoppala @ 2019-06-05 10:29 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: linux-doc, jani.nikula, Chris Wilson
Jani Nikula <jani.nikula@intel.com> writes:
> The error messages could be more descriptive, but fix these caused by
> file moves:
>
> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -internal
> ./drivers/gpu/drm/i915/i915_gem_shrinker.c' failed with return code 2
> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -function
> User command execution ./drivers/gpu/drm/i915/i915_gem_execbuffer.c'
> failed with return code 1
> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -internal
> ./drivers/gpu/drm/i915/i915_gem_tiling.c' failed with return code 2
> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -function
> buffer object tiling ./drivers/gpu/drm/i915/i915_gem_tiling.c'
> failed with return code 1
>
> Fixes: 10be98a77c55 ("drm/i915: Move more GEM objects under gem/")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
/o\
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> ---
> Documentation/gpu/i915.rst | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> index 6c75380b2928..f98ee95da90f 100644
> --- a/Documentation/gpu/i915.rst
> +++ b/Documentation/gpu/i915.rst
> @@ -349,7 +349,7 @@ of buffer object caches. Shrinking is used to make main memory
> available. Note that this is mostly orthogonal to evicting buffer
> objects, which has the goal to make space in gpu virtual address spaces.
>
> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_shrinker.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
> :internal:
>
> Batchbuffer Parsing
> @@ -373,7 +373,7 @@ Batchbuffer Pools
> User Batchbuffer Execution
> --------------------------
>
> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
> :doc: User command execution
>
> Logical Rings, Logical Ring Contexts and Execlists
> @@ -382,9 +382,6 @@ Logical Rings, Logical Ring Contexts and Execlists
> .. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c
> :doc: Logical Rings, Logical Ring Contexts and Execlists
>
> -.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c
> - :internal:
> -
> Global GTT views
> ----------------
>
> @@ -415,10 +412,10 @@ Hardware Tiling and Swizzling Details
> Object Tiling IOCTLs
> --------------------
>
> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> :internal:
>
> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c
> :doc: buffer object tiling
>
> WOPCM
> --
> 2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files
2019-06-05 10:29 ` [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Mika Kuoppala
@ 2019-06-06 8:23 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2019-06-06 8:23 UTC (permalink / raw)
To: Mika Kuoppala, intel-gfx; +Cc: linux-doc, Chris Wilson
On Wed, 05 Jun 2019, Mika Kuoppala <mika.kuoppala@linux.intel.com> wrote:
> Jani Nikula <jani.nikula@intel.com> writes:
>
>> The error messages could be more descriptive, but fix these caused by
>> file moves:
>>
>> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -internal
>> ./drivers/gpu/drm/i915/i915_gem_shrinker.c' failed with return code 2
>> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -function
>> User command execution ./drivers/gpu/drm/i915/i915_gem_execbuffer.c'
>> failed with return code 1
>> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -internal
>> ./drivers/gpu/drm/i915/i915_gem_tiling.c' failed with return code 2
>> WARNING: kernel-doc './scripts/kernel-doc -rst -enable-lineno -function
>> buffer object tiling ./drivers/gpu/drm/i915/i915_gem_tiling.c'
>> failed with return code 1
>>
>> Fixes: 10be98a77c55 ("drm/i915: Move more GEM objects under gem/")
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> /o\
>
> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Thanks for the reviews, I took the liberty of pushing these to dinq with
just BAT results, as these are purely documentation/comment changes.
BR,
Jani.
>
>> ---
>> Documentation/gpu/i915.rst | 11 ++++-------
>> 1 file changed, 4 insertions(+), 7 deletions(-)
>>
>> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
>> index 6c75380b2928..f98ee95da90f 100644
>> --- a/Documentation/gpu/i915.rst
>> +++ b/Documentation/gpu/i915.rst
>> @@ -349,7 +349,7 @@ of buffer object caches. Shrinking is used to make main memory
>> available. Note that this is mostly orthogonal to evicting buffer
>> objects, which has the goal to make space in gpu virtual address spaces.
>>
>> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_shrinker.c
>> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
>> :internal:
>>
>> Batchbuffer Parsing
>> @@ -373,7 +373,7 @@ Batchbuffer Pools
>> User Batchbuffer Execution
>> --------------------------
>>
>> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_execbuffer.c
>> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> :doc: User command execution
>>
>> Logical Rings, Logical Ring Contexts and Execlists
>> @@ -382,9 +382,6 @@ Logical Rings, Logical Ring Contexts and Execlists
>> .. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c
>> :doc: Logical Rings, Logical Ring Contexts and Execlists
>>
>> -.. kernel-doc:: drivers/gpu/drm/i915/gt/intel_lrc.c
>> - :internal:
>> -
>> Global GTT views
>> ----------------
>>
>> @@ -415,10 +412,10 @@ Hardware Tiling and Swizzling Details
>> Object Tiling IOCTLs
>> --------------------
>>
>> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
>> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>> :internal:
>>
>> -.. kernel-doc:: drivers/gpu/drm/i915/i915_gem_tiling.c
>> +.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_tiling.c
>> :doc: buffer object tiling
>>
>> WOPCM
>> --
>> 2.20.1
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-06 8:20 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-05 9:56 [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Jani Nikula
2019-06-05 9:56 ` [PATCH 2/2] drm/i915: fix documentation build warnings Jani Nikula
2019-06-05 12:35 ` [Intel-gfx] " Mika Kuoppala
2019-06-05 10:29 ` [PATCH 1/2] Documentation/i915: Fix kernel-doc references to moved gem files Mika Kuoppala
2019-06-06 8:23 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).