On ma, 2016-07-25 at 08:44 +0100, Chris Wilson wrote:
> When we refer to intel_engine_cs, we want to use engine so as not to
> confuse ourselves about ringbuffers.
>
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_cmd_parser.c | 4 ++--
> drivers/gpu/drm/i915/i915_drv.h | 5 +++--
> drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +++++-----
> 3 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
> index b0fd6a7b0603..b5b520176c59 100644
> --- a/drivers/gpu/drm/i915/i915_cmd_parser.c
> +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
> @@ -636,7 +636,7 @@ static bool validate_cmds_sorted(struct intel_engine_cs *engine,
> return ret;
> }
>
> -static bool check_sorted(int ring_id,
> +static bool check_sorted(int engine_id,
> const struct drm_i915_reg_descriptor *reg_table,
> int reg_count)
> {
> @@ -649,7 +649,7 @@ static bool check_sorted(int ring_id,
>
> if (curr < previous) {
> DRM_ERROR("CMD: table not sorted ring=%d entry=%d reg=0x%08X prev=0x%08X\n",
How about the message?
> - ring_id, i, curr, previous);
> + engine_id, i, curr, previous);
> ret = false;
> }
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 9f655e2add66..d4c5c2edf252 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2500,8 +2500,9 @@ struct drm_i915_cmd_descriptor {
> /*
> * A table of commands requiring special handling by the command parser.
> *
> - * Each ring has an array of tables. Each table consists of an array of command
> - * descriptors, which must be sorted with command opcodes in ascending order.
> + * Each engine has an array of tables. Each table consists of an array of
> + * command descriptors, which must be sorted with command opcodes in
> + * ascending order.
> */
> struct drm_i915_cmd_table {
> const struct drm_i915_cmd_descriptor *table;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 0f8019488d33..0a830c116886 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -340,7 +340,7 @@ struct intel_engine_cs {
>
> /*
> * Table of commands the command parser needs to know about
> - * for this ring.
> + * for this engine.
> */
> DECLARE_HASHTABLE(cmd_hash, I915_CMD_HASH_ORDER);
>
> @@ -354,11 +354,11 @@ struct intel_engine_cs {
> * Returns the bitmask for the length field of the specified command.
> * Return 0 for an unrecognized/invalid command.
> *
> - * If the command parser finds an entry for a command in the ring's
> + * If the command parser finds an entry for a command in the engines's
s/engines's/engine's/
> * cmd_tables, it gets the command's length based on the table entry.
> - * If not, it calls this function to determine the per-ring length field
> - * encoding for the command (i.e. certain opcode ranges use certain bits
> - * to encode the command length in the header).
> + * If not, it calls this function to determine the per-engine length
> + * field encoding for the command (i.e. different opcode ranges use
> + * certain bits to encode the command length in the header).
> */
> u32 (*get_cmd_length_mask)(u32 cmd_header);
> };
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
