Skip to content

Commit

Permalink
drm/i915: fix documentation build warnings
Browse files Browse the repository at this point in the history
Just a straightforward bag of fixes for a clean htmldocs build.

Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190605095657.23601-2-jani.nikula@intel.com
  • Loading branch information
Jani Nikula committed Jun 6, 2019
1 parent 8a6f43d commit affa22b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 9 deletions.
6 changes: 0 additions & 6 deletions Documentation/gpu/i915.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
====

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_reg.h
Original file line number Diff line number Diff line change
Expand Up @@ -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().
*
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_vma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/intel_guc_fwif.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/intel_runtime_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down

0 comments on commit affa22b

Please sign in to comment.