Commit 90d63a15 authored by Rob Clark's avatar Rob Clark Committed by Neil Armstrong

drm/doc: Relax fdinfo string constraints

The restriction about no whitespace, etc, really only applies to the
usage of strings in keys.  Values can contain anything (other than
newline).
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230524155956.382440-8-robdclark@gmail.com
parent 3e9757f5
...@@ -24,7 +24,7 @@ File format specification ...@@ -24,7 +24,7 @@ File format specification
- All keys shall be prefixed with `drm-`. - All keys shall be prefixed with `drm-`.
- Whitespace between the delimiter and first non-whitespace character shall be - Whitespace between the delimiter and first non-whitespace character shall be
ignored when parsing. ignored when parsing.
- Neither keys or values are allowed to contain whitespace characters. - Keys are not allowed to contain whitespace characters.
- Numerical key value pairs can end with optional unit string. - Numerical key value pairs can end with optional unit string.
- Data type of the value is fixed as defined in the specification. - Data type of the value is fixed as defined in the specification.
...@@ -39,12 +39,13 @@ Data types ...@@ -39,12 +39,13 @@ Data types
---------- ----------
- <uint> - Unsigned integer without defining the maximum value. - <uint> - Unsigned integer without defining the maximum value.
- <str> - String excluding any above defined reserved characters or whitespace. - <keystr> - String excluding any above defined reserved characters or whitespace.
- <valstr> - String.
Mandatory fully standardised keys Mandatory fully standardised keys
--------------------------------- ---------------------------------
- drm-driver: <str> - drm-driver: <valstr>
String shall contain the name this driver registered as via the respective String shall contain the name this driver registered as via the respective
`struct drm_driver` data structure. `struct drm_driver` data structure.
...@@ -75,10 +76,10 @@ the above described criteria in order to associate data to individual clients. ...@@ -75,10 +76,10 @@ the above described criteria in order to associate data to individual clients.
Utilization Utilization
^^^^^^^^^^^ ^^^^^^^^^^^
- drm-engine-<str>: <uint> ns - drm-engine-<keystr>: <uint> ns
GPUs usually contain multiple execution engines. Each shall be given a stable GPUs usually contain multiple execution engines. Each shall be given a stable
and unique name (str), with possible values documented in the driver specific and unique name (keystr), with possible values documented in the driver specific
documentation. documentation.
Value shall be in specified time units which the respective GPU engine spent Value shall be in specified time units which the respective GPU engine spent
...@@ -90,19 +91,19 @@ larger value within a reasonable period. Upon observing a value lower than what ...@@ -90,19 +91,19 @@ larger value within a reasonable period. Upon observing a value lower than what
was previously read, userspace is expected to stay with that larger previous was previously read, userspace is expected to stay with that larger previous
value until a monotonic update is seen. value until a monotonic update is seen.
- drm-engine-capacity-<str>: <uint> - drm-engine-capacity-<keystr>: <uint>
Engine identifier string must be the same as the one specified in the Engine identifier string must be the same as the one specified in the
drm-engine-<str> tag and shall contain a greater than zero number in case the drm-engine-<keystr> tag and shall contain a greater than zero number in case the
exported engine corresponds to a group of identical hardware engines. exported engine corresponds to a group of identical hardware engines.
In the absence of this tag parser shall assume capacity of one. Zero capacity In the absence of this tag parser shall assume capacity of one. Zero capacity
is not allowed. is not allowed.
- drm-cycles-<str>: <uint> - drm-cycles-<keystr>: <uint>
Engine identifier string must be the same as the one specified in the Engine identifier string must be the same as the one specified in the
drm-engine-<str> tag and shall contain the number of busy cycles for the given drm-engine-<keystr> tag and shall contain the number of busy cycles for the given
engine. engine.
Values are not required to be constantly monotonic if it makes the driver Values are not required to be constantly monotonic if it makes the driver
...@@ -111,12 +112,12 @@ larger value within a reasonable period. Upon observing a value lower than what ...@@ -111,12 +112,12 @@ larger value within a reasonable period. Upon observing a value lower than what
was previously read, userspace is expected to stay with that larger previous was previously read, userspace is expected to stay with that larger previous
value until a monotonic update is seen. value until a monotonic update is seen.
- drm-maxfreq-<str>: <uint> [Hz|MHz|KHz] - drm-maxfreq-<keystr>: <uint> [Hz|MHz|KHz]
Engine identifier string must be the same as the one specified in the Engine identifier string must be the same as the one specified in the
drm-engine-<str> tag and shall contain the maximum frequency for the given drm-engine-<keystr> tag and shall contain the maximum frequency for the given
engine. Taken together with drm-cycles-<str>, this can be used to calculate engine. Taken together with drm-cycles-<keystr>, this can be used to calculate
percentage utilization of the engine, whereas drm-engine-<str> only reflects percentage utilization of the engine, whereas drm-engine-<keystr> only reflects
time active without considering what frequency the engine is operating as a time active without considering what frequency the engine is operating as a
percentage of it's maximum frequency. percentage of it's maximum frequency.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment