| Message ID | 20180618153649.2015346-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | eeb2c3c2a614f003cd42cc3d96d23f5c29ff6727 |
| Headers | show |
| Series | [1/2] amdgpu: display: use modern ktime accessors | expand |
On 2018-06-18 11:35 AM, Arnd Bergmann wrote: > getrawmonotonic64() is deprecated because of the nonstandard naming. > > The replacement functions ktime_get_raw_ns() also simplifies the callers. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Harry Wentland <harry.wentland@amd.com> Harry > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 8 -------- > drivers/gpu/drm/amd/display/dc/dm_services.h | 5 ++++- > 2 files changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c > index 5a3346124a01..e861929dd981 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c > @@ -35,14 +35,6 @@ > #include "amdgpu_dm_irq.h" > #include "amdgpu_pm.h" > > -unsigned long long dm_get_timestamp(struct dc_context *ctx) > -{ > - struct timespec64 time; > - > - getrawmonotonic64(&time); > - return timespec64_to_ns(&time); > -} > - > unsigned long long dm_get_elapse_time_in_ns(struct dc_context *ctx, > unsigned long long current_time_stamp, > unsigned long long last_time_stamp) > diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h > index 4ff9b2bba178..eb5ab3978e84 100644 > --- a/drivers/gpu/drm/amd/display/dc/dm_services.h > +++ b/drivers/gpu/drm/amd/display/dc/dm_services.h > @@ -339,7 +339,10 @@ bool dm_dmcu_set_pipe(struct dc_context *ctx, unsigned int controller_id); > #define dm_log_to_buffer(buffer, size, fmt, args)\ > vsnprintf(buffer, size, fmt, args) > > -unsigned long long dm_get_timestamp(struct dc_context *ctx); > +static inline unsigned long long dm_get_timestamp(struct dc_context *ctx) > +{ > + return ktime_get_raw_ns(); > +} > > unsigned long long dm_get_elapse_time_in_ns(struct dc_context *ctx, > unsigned long long current_time_stamp, >
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c index 5a3346124a01..e861929dd981 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c @@ -35,14 +35,6 @@ #include "amdgpu_dm_irq.h" #include "amdgpu_pm.h" -unsigned long long dm_get_timestamp(struct dc_context *ctx) -{ - struct timespec64 time; - - getrawmonotonic64(&time); - return timespec64_to_ns(&time); -} - unsigned long long dm_get_elapse_time_in_ns(struct dc_context *ctx, unsigned long long current_time_stamp, unsigned long long last_time_stamp) diff --git a/drivers/gpu/drm/amd/display/dc/dm_services.h b/drivers/gpu/drm/amd/display/dc/dm_services.h index 4ff9b2bba178..eb5ab3978e84 100644 --- a/drivers/gpu/drm/amd/display/dc/dm_services.h +++ b/drivers/gpu/drm/amd/display/dc/dm_services.h @@ -339,7 +339,10 @@ bool dm_dmcu_set_pipe(struct dc_context *ctx, unsigned int controller_id); #define dm_log_to_buffer(buffer, size, fmt, args)\ vsnprintf(buffer, size, fmt, args) -unsigned long long dm_get_timestamp(struct dc_context *ctx); +static inline unsigned long long dm_get_timestamp(struct dc_context *ctx) +{ + return ktime_get_raw_ns(); +} unsigned long long dm_get_elapse_time_in_ns(struct dc_context *ctx, unsigned long long current_time_stamp,
getrawmonotonic64() is deprecated because of the nonstandard naming. The replacement functions ktime_get_raw_ns() also simplifies the callers. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 8 -------- drivers/gpu/drm/amd/display/dc/dm_services.h | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-)