[Intel-xe] [PATCH v2 10/14] drm/xe/uapi: Crystal Reference Clock updates
Souza, Jose
jose.souza at intel.com
Wed Nov 29 18:33:14 UTC 2023
On Wed, 2023-11-29 at 15:08 +0100, Francois Dugast wrote:
> On Fri, Nov 24, 2023 at 07:38:04PM +0100, Souza, Jose wrote:
> > On Wed, 2023-11-22 at 14:38 +0000, Francois Dugast wrote:
> > > From: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > >
> > > First of all, let's remove the duplication.
> > > But also, let's rename it to remove the word 'frequency'
> > > out of it. In general, the first thing people think of frequency
> > > is the frequency in which the GTs are operating to execute the
> > > GPU instructions.
> > >
> > > While this frequency here is a crystal reference clock frequency
> > > which is the base of everything else, and in this case of this
> > > uAPI it is used to calculate a better and precise timestamp.
> > >
> > > v2: (Suggested by Jose) Remove the engine_cs and keep the GT info one
> > > since it might be useful for other SRIOV cases where the engine_cs
> > > will be zeroed. So, grabbing from the GT_LIST should be cleaner.
> > >
> > > Cc: Matt Roper <matthew.d.roper at intel.com>
> > > Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
> > > Cc: Jose Souza <jose.souza at intel.com>
> > >
> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > > Signed-off-by: Francois Dugast <francois.dugast at intel.com>
> > > ---
> > > drivers/gpu/drm/xe/xe_gt_clock.c | 4 ++--
> > > drivers/gpu/drm/xe/xe_gt_types.h | 4 ++--
> > > drivers/gpu/drm/xe/xe_query.c | 8 +-------
> > > include/uapi/drm/xe_drm.h | 11 ++++-------
> > > 4 files changed, 9 insertions(+), 18 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/xe/xe_gt_clock.c b/drivers/gpu/drm/xe/xe_gt_clock.c
> > > index 25a18eaad9c4..937054e31d72 100644
> > > --- a/drivers/gpu/drm/xe/xe_gt_clock.c
> > > +++ b/drivers/gpu/drm/xe/xe_gt_clock.c
> > > @@ -75,11 +75,11 @@ int xe_gt_clock_init(struct xe_gt *gt)
> > > freq >>= 3 - REG_FIELD_GET(RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK, c0);
> > > }
> > >
> > > - gt->info.clock_freq = freq;
> > > + gt->info.reference_clock = freq;
> > > return 0;
> > > }
> > >
> > > u64 xe_gt_clock_cycles_to_ns(const struct xe_gt *gt, u64 count)
> > > {
> > > - return DIV_ROUND_CLOSEST_ULL(count * NSEC_PER_SEC, gt->info.clock_freq);
> > > + return DIV_ROUND_CLOSEST_ULL(count * NSEC_PER_SEC, gt->info.reference_clock);
> > > }
> > > diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
> > > index d3f2793684e2..56b0f22ee78d 100644
> > > --- a/drivers/gpu/drm/xe/xe_gt_types.h
> > > +++ b/drivers/gpu/drm/xe/xe_gt_types.h
> > > @@ -107,8 +107,8 @@ struct xe_gt {
> > > enum xe_gt_type type;
> > > /** @id: Unique ID of this GT within the PCI Device */
> > > u8 id;
> > > - /** @clock_freq: clock frequency */
> > > - u32 clock_freq;
> > > + /** @reference_clock: clock frequency */
> > > + u32 reference_clock;
> > > /** @engine_mask: mask of engines present on GT */
> > > u64 engine_mask;
> > > /**
> > > diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
> > > index 8bf0fe6b09e0..77cab66d337f 100644
> > > --- a/drivers/gpu/drm/xe/xe_query.c
> > > +++ b/drivers/gpu/drm/xe/xe_query.c
> > > @@ -147,8 +147,6 @@ query_engine_cycles(struct xe_device *xe,
> > > if (!hwe)
> > > return -EINVAL;
> > >
> > > - resp.engine_frequency = gt->info.clock_freq;
> > > -
> > > xe_device_mem_access_get(xe);
> > > xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
> > >
> > > @@ -164,10 +162,6 @@ query_engine_cycles(struct xe_device *xe,
> > > xe_device_mem_access_put(xe);
> > > resp.width = 36;
> > >
> > > - /* Only write to the output fields of user query */
> >
> > the comment is relevant to to other put_user() calls.
>
> Indeed, it will be back in the next revision.
With that:
Reviewed-by: José Roberto de Souza <jose.souza at intel.com>
>
> Francois
>
> >
> > > - if (put_user(resp.engine_frequency, &query_ptr->engine_frequency))
> > > - return -EFAULT;
> > > -
> > > if (put_user(resp.cpu_timestamp, &query_ptr->cpu_timestamp))
> > > return -EFAULT;
> > >
> > > @@ -383,7 +377,7 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query
> > > else
> > > gt_list->gt_list[id].type = DRM_XE_QUERY_GT_TYPE_MAIN;
> > > gt_list->gt_list[id].gt_id = gt->info.id;
> > > - gt_list->gt_list[id].clock_freq = gt->info.clock_freq;
> > > + gt_list->gt_list[id].reference_clock = gt->info.reference_clock;
> > > if (!IS_DGFX(xe))
> > > gt_list->gt_list[id].near_mem_regions = 0x1;
> > > else
> > > diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
> > > index 85b0affc9f89..a94c751450d5 100644
> > > --- a/include/uapi/drm/xe_drm.h
> > > +++ b/include/uapi/drm/xe_drm.h
> > > @@ -280,8 +280,8 @@ struct drm_xe_mem_region {
> > > * in .data. struct drm_xe_query_engine_cycles is allocated by the user and
> > > * .data points to this allocated structure.
> > > *
> > > - * The query returns the engine cycles and the frequency that can
> > > - * be used to calculate the engine timestamp. In addition the
> > > + * The query returns the engine cycles, which along with GT's @reference_clock,
> > > + * can be used to calculate the engine timestamp. In addition the
> > > * query returns a set of cpu timestamps that indicate when the command
> > > * streamer cycle count was captured.
> > > */
> > > @@ -309,9 +309,6 @@ struct drm_xe_query_engine_cycles {
> > > */
> > > __u64 engine_cycles;
> > >
> > > - /** @engine_frequency: Frequency of the engine cycles in Hz. */
> > > - __u64 engine_frequency;
> > > -
> > > /**
> > > * @cpu_timestamp: CPU timestamp in ns. The timestamp is captured before
> > > * reading the engine_cycles register using the reference clockid set by the
> > > @@ -382,8 +379,8 @@ struct drm_xe_gt {
> > > __u16 type;
> > > /** @gt_id: Unique ID of this GT within the PCI Device */
> > > __u16 gt_id;
> > > - /** @clock_freq: A clock frequency for timestamp */
> > > - __u32 clock_freq;
> > > + /** @reference_clock: A clock frequency for timestamp */
> > > + __u32 reference_clock;
> > > /**
> > > * @near_mem_regions: Bit mask of instances from
> > > * drm_xe_query_mem_regions that are nearest to the current engines
> >
More information about the Intel-xe
mailing list