drm: Add DRM_GEM_FOPS
Subsystems (6)
PATCH v3 1/2 drm: Add DRM_GEM_FOPS
From: Rob Clark <[email protected]>
The DEFINE_DRM_GEM_FOPS() helper is a bit limiting if a driver wants to provide additional file ops, like show_fdinfo().
v2: Split out DRM_GEM_FOPS instead of making DEFINE_DRM_GEM_FOPS
varardic
v3: nits
--- include/drm/drm_gem.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
include/drm/drm_gem.h +18 -8
@@ -314,6 +314,23 @@ struct drm_gem_object {const struct drm_gem_object_funcs *funcs; }; +/** +* DRM_GEM_FOPS - Default drm GEM file operations +* +* This macro provides a shorthand for setting the GEM file ops in the +* &file_operations structure. If all you need are the default ops, use +* DEFINE_DRM_GEM_FOPS instead. +*/ +#define DRM_GEM_FOPS \ + .open = drm_open,\ + .release = drm_release,\ + .unlocked_ioctl = drm_ioctl,\ + .compat_ioctl = drm_compat_ioctl,\ + .poll = drm_poll,\ + .read = drm_read,\ + .llseek = noop_llseek,\ + .mmap = drm_gem_mmap +/** * DEFINE_DRM_GEM_FOPS() - macro to generate file operations for GEM drivers * @name: name for the generated structure
@@ -330,14 +347,7 @@ struct drm_gem_object {#define DEFINE_DRM_GEM_FOPS (name) \ static const struct file_operations name = {\ .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap,\ + DRM_GEM_FOPS,\ }void drm_gem_object_release (struct drm_gem_object *obj);
Signature · 1 line
2.36.1
PATCH v3 2/2 drm/msm: Expose client engine utilization via fdinfo
From: Rob Clark <[email protected]>
Similar to AMD commit
874442541133 ("drm/amdgpu: Add show_fdinfo() interface"), using the infrastructure added in previous patches, we add basic client info and GPU engine utilisation for msm.
Example output:
# cat /proc/`pgrep glmark2`/fdinfo/6 pos: 0 flags: 02400002 mnt_id: 21 ino: 162 drm-driver: msm drm-client-id: 7 drm-engine-gpu: 1734371319 ns drm-cycles-gpu: 1153645024 drm-maxfreq-gpu: 800000000 Hz
See also: https://patchwork.freedesktop.org/patch/468505/
v2: Add dev-maxfreq-$engine and update drm-usage-stats.rst
v3: spelling and compiler warning
--- Documentation/gpu/drm-usage-stats.rst | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 19 ++++++++++++++++++- drivers/gpu/drm/msm/msm_gpu.c | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/msm_gpu.h | 19 +++++++++++++++++++ 4 files changed, 77 insertions(+), 3 deletions(-)
Documentation/gpu/drm-usage-stats.rst +21 -0
@@ -105,6 +105,27 @@ object belong to this client, in the respective memory region. Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' indicating kibi- or mebi-bytes. +- drm-cycles-<str> <uint> + +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 +engine. + +Values are not required to be constantly monotonic if it makes the driver +implementation easier, but are required to catch up with the previously reported +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 +value until a monotonic update is seen. + +- drm-maxfreq-<str> <uint> [Hz|MHz|KHz] + +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 +engine. Taken together with drm-cycles-<str>, this can be used to calculate +percentage utilization of the engine, whereas drm-engine-<str> only reflects +time active without considering what frequency the engine is operating as a +percentage of it's maximum frequency. + =============================== Driver specific implementations ===============================
drivers/gpu/drm/msm/msm_drv.c +18 -1
@@ -948,7 +948,24 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_FOPS (fops); +static void msm_fop_show_fdinfo (struct seq_file *m,struct file *f) +{ +struct drm_file *file = f->private_data; +struct drm_device *dev = file->minor->dev; +struct msm_drm_private *priv = dev->dev_private; +struct drm_printer p =drm_seq_file_printer (m); + +if (!priv->gpu) +return ; + +msm_gpu_show_fdinfo (priv->gpu, file->driver_priv, &p); +} + +static const struct file_operations fops = { + .owner =THIS_MODULE , +DRM_GEM_FOPS , + .show_fdinfo = msm_fop_show_fdinfo, +};static const struct drm_driver msm_driver = { .driver_features = DRIVER_GEM |
drivers/gpu/drm/msm/msm_gpu.c +19 -2
@@ -4,6 +4,8 @@* Author: Rob Clark <[email protected]> */ +#include "drm/drm_drv.h" +#include "msm_gpu.h" #include "msm_gem.h" #include "msm_mmu.h"
@@ -146,6 +148,16 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu)return 0 ; } +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +struct drm_printer *p) +{ +drm_printf (p,"drm-driver:\t%s\n" , gpu->dev->driver->name); +drm_printf (p,"drm-client-id:\t%u\n" , ctx->seqno); +drm_printf (p,"drm-engine-gpu:\t%llu ns\n" , ctx->elapsed_ns); +drm_printf (p,"drm-cycles-gpu:\t%llu\n" , ctx->cycles); +drm_printf (p,"drm-maxfreq-gpu:\t%u Hz\n" , gpu->fast_rate); +} +int msm_gpu_hw_init (struct msm_gpu *gpu) {int ret;
@@ -652,7 +664,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, {int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;volatile struct msm_gpu_submit_stats *stats; -u64 elapsed, clock =0 ; +u64 elapsed, clock =0 , cycles;unsigned long flags; stats = &ring->memptrs->stats[index];
@@ -660,12 +672,17 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, elapsed = (stats->alwayson_end - stats->alwayson_start) *10000 ;do_div (elapsed,192 ); + cycles = stats->cpcycles_end - stats->cpcycles_start; +/* Calculate the clock frequency from the number of CP cycles */ if (elapsed) { - clock = (stats->cpcycles_end - stats->cpcycles_start) *1000 ; + clock = cycles *1000 ;do_div (clock, elapsed); } + submit->queue->ctx->elapsed_ns += elapsed; + submit->queue->ctx->cycles += cycles; +trace_msm_gpu_submit_retired (submit, elapsed, clock, stats->alwayson_start, stats->alwayson_end);
drivers/gpu/drm/msm/msm_gpu.h +19 -0
@@ -361,6 +361,22 @@ struct msm_file_private {/** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ char *cmdline; +/** +* elapsed: +* +* The total (cumulative) elapsed time GPU was busy with rendering +* from this context in ns. +*/ +uint64_t elapsed_ns; + +/** +* cycles: +* +* The total (cumulative) GPU cycles elapsed attributed to this +* context. +*/ +uint64_t cycles; +/** * entities: *
@@ -544,6 +560,9 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val)int msm_gpu_pm_suspend (struct msm_gpu *gpu);int msm_gpu_pm_resume (struct msm_gpu *gpu); +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +struct drm_printer *p); +int msm_submitqueue_init (struct drm_device *drm,struct msm_file_private *ctx);struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_file_private *ctx,u32 id);
Signature · 1 line
2.36.1
Re: [PATCH v3 2/2] drm/msm: Expose client engine utilization via fdinfo
Quoted 20 lines · Rob Clark
From: Rob Clark <[email protected]>
Similar to AMD commit
874442541133 ("drm/amdgpu: Addshow_fdinfo()interface"), using the infrastructure added in previous patches, we add basic client info and GPU engine utilisation for msm.Example output:
# cat /proc/`pgrep glmark2`/fdinfo/6 pos: 0 flags: 02400002 mnt_id: 21 ino: 162 drm-driver: msm drm-client-id: 7 drm-engine-gpu: 1734371319 ns drm-cycles-gpu: 1153645024 drm-maxfreq-gpu: 800000000 Hz
Quoted 6 lines
See also: https://patchwork.freedesktop.org/patch/468505/
v2: Add dev-maxfreq-$engine and update
drm-usage-stats.rst
v3: spelling and compiler warningSigned-off-by Rob Clark <[email protected]>
Quoted 164 lines
--- Documentation/gpu/drm-usage-stats.rst | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 19 ++++++++++++++++++- drivers/gpu/drm/msm/msm_gpu.c | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/msm_gpu.h | 19 +++++++++++++++++++ 4 files changed, 77 insertions(+), 3 deletions(-)Documentation/gpu/drm-usage-stats.rst +21
-0@@ -105,6 +105,27 @@ object belong to this client, in the respective memory region. Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' indicating kibi- or mebi-bytes. +- drm-cycles-<str> <uint> + +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 +engine. + +Values are not required to be constantly monotonic if it makes the driver +implementation easier, but are required to catch up with the previously reported +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 +value until a monotonic update is seen. + +- drm-maxfreq-<str> <uint> [Hz|MHz|KHz] + +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 +engine. Taken together with drm-cycles-<str>, this can be used to calculate +percentage utilization of the engine, whereas drm-engine-<str> only reflects +time active without considering what frequency the engine is operating as a +percentage of it's maximum frequency. + =============================== Driver specific implementations ===============================drivers/gpu/drm/msm/msm_drv.c +18
-1@@ -948,7 +948,24 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_FOPS (fops); +static void msm_fop_show_fdinfo (struct seq_file *m,struct file *f) +{ +struct drm_file *file = f->private_data; +struct drm_device *dev = file->minor->dev; +struct msm_drm_private *priv = dev->dev_private; +struct drm_printer p =drm_seq_file_printer (m); + +if (!priv->gpu) +return ; + +msm_gpu_show_fdinfo (priv->gpu, file->driver_priv, &p); +} + +static const struct file_operations fops = { + .owner =THIS_MODULE , +DRM_GEM_FOPS , + .show_fdinfo = msm_fop_show_fdinfo, +};static const struct drm_driver msm_driver = { .driver_features = DRIVER_GEM |drivers/gpu/drm/msm/msm_gpu.c +19
-2@@ -4,6 +4,8 @@* Author: Rob Clark <[email protected]> */ +#include "drm/drm_drv.h" +#include "msm_gpu.h" #include "msm_gem.h" #include "msm_mmu.h" @@ -146,6 +148,16 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu)return 0 ; } +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +struct drm_printer *p) +{ +drm_printf (p,"drm-driver:\t%s\n" , gpu->dev->driver->name); +drm_printf (p,"drm-client-id:\t%u\n" , ctx->seqno); +drm_printf (p,"drm-engine-gpu:\t%llu ns\n" , ctx->elapsed_ns); +drm_printf (p,"drm-cycles-gpu:\t%llu\n" , ctx->cycles); +drm_printf (p,"drm-maxfreq-gpu:\t%u Hz\n" , gpu->fast_rate); +} +int msm_gpu_hw_init (struct msm_gpu *gpu) {int ret;@@ -652,7 +664,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, {int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;volatile struct msm_gpu_submit_stats *stats; -u64 elapsed, clock =0 ; +u64 elapsed, clock =0 , cycles;unsigned long flags; stats = &ring->memptrs->stats[index];@@ -660,12 +672,17 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, elapsed = (stats->alwayson_end - stats->alwayson_start) *10000 ;do_div (elapsed,192 ); + cycles = stats->cpcycles_end - stats->cpcycles_start; +/* Calculate the clock frequency from the number of CP cycles */ if (elapsed) { - clock = (stats->cpcycles_end - stats->cpcycles_start) *1000 ; + clock = cycles *1000 ;do_div (clock, elapsed); } + submit->queue->ctx->elapsed_ns += elapsed; + submit->queue->ctx->cycles += cycles; +trace_msm_gpu_submit_retired (submit, elapsed, clock, stats->alwayson_start, stats->alwayson_end);drivers/gpu/drm/msm/msm_gpu.h +19
-0@@ -361,6 +361,22 @@ struct msm_file_private {/** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ char *cmdline; +/** +* elapsed: +* +* The total (cumulative) elapsed time GPU was busy with rendering +* from this context in ns. +*/ +uint64_t elapsed_ns; + +/** +* cycles: +* +* The total (cumulative) GPU cycles elapsed attributed to this +* context. +*/ +uint64_t cycles; +/** * entities: * @@ -544,6 +560,9 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val)int msm_gpu_pm_suspend (struct msm_gpu *gpu);int msm_gpu_pm_resume (struct msm_gpu *gpu); +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +struct drm_printer *p); +int msm_submitqueue_init (struct drm_device *drm,struct msm_file_private *ctx);struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_file_private *ctx,u32 id);
Signature · 2 lines
With best wishes Dmitry
Re: [PATCH v3 2/2] drm/msm: Expose client engine utilization via fdinfo
In reply to Rob ClarkQuoted 44 lines · Rob Clark
From: Rob Clark <[email protected]>
Similar to AMD commit
874442541133 ("drm/amdgpu: Addshow_fdinfo()interface"), using the infrastructure added in previous patches, we add basic client info and GPU engine utilisation for msm.Example output:
# cat /proc/`pgrep glmark2`/fdinfo/6 pos: 0 flags: 02400002 mnt_id: 21 ino: 162 drm-driver: msm drm-client-id: 7 drm-engine-gpu: 1734371319 ns drm-cycles-gpu: 1153645024 drm-maxfreq-gpu: 800000000 HzSee also: https://patchwork.freedesktop.org/patch/468505/
v2: Add dev-maxfreq-$engine and update
drm-usage-stats.rst
v3: spelling and compiler warningSigned-off-by Rob Clark <[email protected]>--- Documentation/gpu/drm-usage-stats.rst | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 19 ++++++++++++++++++- drivers/gpu/drm/msm/msm_gpu.c | 21 +++++++++++++++++++-- drivers/gpu/drm/msm/msm_gpu.h | 19 +++++++++++++++++++ 4 files changed, 77 insertions(+), 3 deletions(-)Documentation/gpu/drm-usage-stats.rst +3
-0@@ -105,6 +105,27 @@ object belong to this client, in the respective memory region. Default unit shall be bytes with optional unit specifiers of 'KiB' or 'MiB' indicating kibi- or mebi-bytes. +- drm-cycles-<str> <uint> + +Engine identifier string must be the same as the one specified in the
Documentation/gpu/drm-usage-stats.rst object belong to this client, in the respective memory region. · line 120
Quoted 10 lines
Documentation/gpu/drm-usage-stats.rst +10
-0+drm-engine-<str> tag and shall contain the number of busy cycles for the given +engine. + +Values are not required to be constantly monotonic if it makes the driver +implementation easier, but are required to catch up with the previously reported +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 +value until a monotonic update is seen. + +- drm-maxfreq-<str> <uint> [Hz|MHz|KHz]
Kilo should be lowercase, I *think*. Simplify and only document Hz?
Documentation/gpu/drm-usage-stats.rst object belong to this client, in the respective memory region. · line 127
Quoted 7 lines
Documentation/gpu/drm-usage-stats.rst +7
-0+ +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 +engine. Taken together with drm-cycles-<str>, this can be used to calculate +percentage utilization of the engine, whereas drm-engine-<str> only reflects +time active without considering what frequency the engine is operating as a +percentage of it's maximum frequency.
Slipped my mind to reply to v3..
Regards,
Tvrtko
Quoted 129 lines
Documentation/gpu/drm-usage-stats.rst +1
-0+ =============================== Driver specific implementations ===============================drivers/gpu/drm/msm/msm_drv.c +18
-1@@ -948,7 +948,24 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), }; -DEFINE_DRM_GEM_FOPS (fops); +static void msm_fop_show_fdinfo (struct seq_file *m,struct file *f) +{ +struct drm_file *file = f->private_data; +struct drm_device *dev = file->minor->dev; +struct msm_drm_private *priv = dev->dev_private; +struct drm_printer p =drm_seq_file_printer (m); + +if (!priv->gpu) +return ; + +msm_gpu_show_fdinfo (priv->gpu, file->driver_priv, &p); +} + +static const struct file_operations fops = { + .owner =THIS_MODULE , +DRM_GEM_FOPS , + .show_fdinfo = msm_fop_show_fdinfo, +};static const struct drm_driver msm_driver = { .driver_features = DRIVER_GEM |drivers/gpu/drm/msm/msm_gpu.c +19
-2@@ -4,6 +4,8 @@* Author: Rob Clark <[email protected]> */ +#include "drm/drm_drv.h" +#include "msm_gpu.h" #include "msm_gem.h" #include "msm_mmu.h" @@ -146,6 +148,16 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu)return 0 ; } +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +struct drm_printer *p) +{ +drm_printf (p,"drm-driver:\t%s\n" , gpu->dev->driver->name); +drm_printf (p,"drm-client-id:\t%u\n" , ctx->seqno); +drm_printf (p,"drm-engine-gpu:\t%llu ns\n" , ctx->elapsed_ns); +drm_printf (p,"drm-cycles-gpu:\t%llu\n" , ctx->cycles); +drm_printf (p,"drm-maxfreq-gpu:\t%u Hz\n" , gpu->fast_rate); +} +int msm_gpu_hw_init (struct msm_gpu *gpu) {int ret;@@ -652,7 +664,7 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, {int index = submit->seqno %MSM_GPU_SUBMIT_STATS_COUNT ;volatile struct msm_gpu_submit_stats *stats; -u64 elapsed, clock =0 ; +u64 elapsed, clock =0 , cycles;unsigned long flags; stats = &ring->memptrs->stats[index];@@ -660,12 +672,17 @@ static void retire_submit(struct msm_gpu *gpu, struct msm_ringbuffer *ring, elapsed = (stats->alwayson_end - stats->alwayson_start) *10000 ;do_div (elapsed,192 ); + cycles = stats->cpcycles_end - stats->cpcycles_start; +/* Calculate the clock frequency from the number of CP cycles */ if (elapsed) { - clock = (stats->cpcycles_end - stats->cpcycles_start) *1000 ; + clock = cycles *1000 ;do_div (clock, elapsed); } + submit->queue->ctx->elapsed_ns += elapsed; + submit->queue->ctx->cycles += cycles; +trace_msm_gpu_submit_retired (submit, elapsed, clock, stats->alwayson_start, stats->alwayson_end);drivers/gpu/drm/msm/msm_gpu.h +19
-0@@ -361,6 +361,22 @@ struct msm_file_private {/** cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE */ char *cmdline; +/** +* elapsed: +* +* The total (cumulative) elapsed time GPU was busy with rendering +* from this context in ns. +*/ +uint64_t elapsed_ns; + +/** +* cycles: +* +* The total (cumulative) GPU cycles elapsed attributed to this +* context. +*/ +uint64_t cycles; +/** * entities: * @@ -544,6 +560,9 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 lo, u32 hi, u64 val)int msm_gpu_pm_suspend (struct msm_gpu *gpu);int msm_gpu_pm_resume (struct msm_gpu *gpu); +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +struct drm_printer *p); +int msm_submitqueue_init (struct drm_device *drm,struct msm_file_private *ctx);struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_file_private *ctx,u32 id);
Quoted 11 lines · Rob Clark
From: Rob Clark <[email protected]>
The
DEFINE_DRM_GEM_FOPS()helper is a bit limiting if a driver wants to provide additional file ops, likeshow_fdinfo().v2: Split out
DRM_GEM_FOPSinstead of makingDEFINE_DRM_GEM_FOPS
varardic
v3: nitsSigned-off-by Rob Clark <[email protected]>
I suspect that with Tomas's ack we can pick this through the drm/msm. Is this correct? (I'll then pick it for the msm-lumag).
Quoted 48 lines
--- include/drm/drm_gem.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)include/drm/drm_gem.h +18
-8@@ -314,6 +314,23 @@ struct drm_gem_object {const struct drm_gem_object_funcs *funcs; }; +/** +* DRM_GEM_FOPS - Default drm GEM file operations +* +* This macro provides a shorthand for setting the GEM file ops in the +* &file_operations structure. If all you need are the default ops, use +* DEFINE_DRM_GEM_FOPS instead. +*/ +#define DRM_GEM_FOPS \ + .open = drm_open,\ + .release = drm_release,\ + .unlocked_ioctl = drm_ioctl,\ + .compat_ioctl = drm_compat_ioctl,\ + .poll = drm_poll,\ + .read = drm_read,\ + .llseek = noop_llseek,\ + .mmap = drm_gem_mmap +/** * DEFINE_DRM_GEM_FOPS() - macro to generate file operations for GEM drivers * @name: name for the generated structure @@ -330,14 +347,7 @@ struct drm_gem_object {#define DEFINE_DRM_GEM_FOPS (name) \ static const struct file_operations name = {\ .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap,\ + DRM_GEM_FOPS,\ }void drm_gem_object_release (struct drm_gem_object *obj);
Signature · 2 lines
With best wishes Dmitry
Thomas Zimmermann
maintainerAm 15.06.22 um 14:45 schrieb Dmitry Baryshkov:
Quoted 6 lines · Rob Clark
Quoted 5 lines
From: Rob Clark <[email protected]>
The
DEFINE_DRM_GEM_FOPS()helper is a bit limiting if a driver wants to provide additional file ops, likeshow_fdinfo().
Quoted 8 lines
Quoted 6 lines
v2: Split out
DRM_GEM_FOPSinstead of makingDEFINE_DRM_GEM_FOPSvarardic
v3: nitsSigned-off-by Rob Clark <[email protected]>I suspect that with Tomas's ack we can pick this through the drm/msm. Is this correct? (I'll then pick it for the msm-lumag).
Sure, go ahead.
Quoted 49 lines
Quoted 47 lines
---
include/drm/drm_gem.h| 26 ++++++++++++++++++--------1 file changed, 18 insertions(+), 8 deletions(-)include/drm/drm_gem.h +18
-8@@ -314,6 +314,23 @@ struct drm_gem_object { const struct drm_gem_object_funcs *funcs; }; +/** +* DRM_GEM_FOPS - Default drm GEM file operations +* +* This macro provides a shorthand for setting the GEM file ops in the +* &file_operations structure. If all you need are the default ops, use +* DEFINE_DRM_GEM_FOPS instead. +*/ +#define DRM_GEM_FOPS \ + .open = drm_open,\ + .release = drm_release,\ + .unlocked_ioctl = drm_ioctl,\ + .compat_ioctl = drm_compat_ioctl,\ + .poll = drm_poll,\ + .read = drm_read,\ + .llseek = noop_llseek,\ + .mmap = drm_gem_mmap + /*** DEFINE_DRM_GEM_FOPS() - macro to generate file operations for GEM drivers * @name: name for the generated structure @@ -330,14 +347,7 @@ struct drm_gem_object { #define DEFINE_DRM_GEM_FOPS(name) \ static const struct file_operations name = {\ .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap,\ + DRM_GEM_FOPS,\ } void drm_gem_object_release(struct drm_gem_object *obj);
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
Quoted 11 lines · Rob Clark
From: Rob Clark <[email protected]>
The
DEFINE_DRM_GEM_FOPS()helper is a bit limiting if a driver wants to provide additional file ops, likeshow_fdinfo().v2: Split out
DRM_GEM_FOPSinstead of makingDEFINE_DRM_GEM_FOPS
varardic
v3: nitsSigned-off-by Rob Clark <[email protected]>
We're at three drivers, maybe it'd be better if this is more standardized? I feel like we're opening a bit a can of worms here where everyone just has some good odl fashioned fun. It's at least much better documented than the old property proliferation :-)
-Daniel
Quoted 51 lines
--- include/drm/drm_gem.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)include/drm/drm_gem.h +18
-8@@ -314,6 +314,23 @@ struct drm_gem_object {const struct drm_gem_object_funcs *funcs; }; +/** +* DRM_GEM_FOPS - Default drm GEM file operations +* +* This macro provides a shorthand for setting the GEM file ops in the +* &file_operations structure. If all you need are the default ops, use +* DEFINE_DRM_GEM_FOPS instead. +*/ +#define DRM_GEM_FOPS \ + .open = drm_open,\ + .release = drm_release,\ + .unlocked_ioctl = drm_ioctl,\ + .compat_ioctl = drm_compat_ioctl,\ + .poll = drm_poll,\ + .read = drm_read,\ + .llseek = noop_llseek,\ + .mmap = drm_gem_mmap +/** * DEFINE_DRM_GEM_FOPS() - macro to generate file operations for GEM drivers * @name: name for the generated structure @@ -330,14 +347,7 @@ struct drm_gem_object {#define DEFINE_DRM_GEM_FOPS (name) \ static const struct file_operations name = {\ .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap,\ + DRM_GEM_FOPS,\ }void drm_gem_object_release (struct drm_gem_object *obj);Signature · 1 line
2.36.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 11 lines · Daniel Vetter
Quoted 9 lines · Rob Clark
From: Rob Clark <[email protected]>
The
DEFINE_DRM_GEM_FOPS()helper is a bit limiting if a driver wants to provide additional file ops, likeshow_fdinfo().v2: Split out
DRM_GEM_FOPSinstead of makingDEFINE_DRM_GEM_FOPS
varardic
v3: nits
Quoted 7 lines
Quoted 2 lines
Signed-off-by Rob Clark <[email protected]>We're at three drivers, maybe it'd be better if this is more standardized? I feel like we're opening a bit a can of worms here where everyone just has some good odl fashioned fun. It's at least much better documented than the old property proliferation :-)
yeah, we could have a standardized drm_show_fdinfo() fop plus drm_driver callback.. at this point the drm core fxn would be rather boring, ie. only printing dev->driver->name, so I didn't pursue that approach (yet?).. but perhaps that changes over time. I think we chose the right approach here, focusing on the documentation first so that userspace has a standardized experience. The kernel side of things, we are free to refactor at any time ;-)
BR,
-R
Quoted 58 lines
-Daniel
Quoted 49 lines
--- include/drm/drm_gem.h | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)include/drm/drm_gem.h +18
-9@@ -314,6 +314,23 @@ struct drm_gem_object {const struct drm_gem_object_funcs *funcs; }; +/** +* DRM_GEM_FOPS - Default drm GEM file operations +* +* This macro provides a shorthand for setting the GEM file ops in the +* &file_operations structure. If all you need are the default ops, use +* DEFINE_DRM_GEM_FOPS instead. +*/ +#define DRM_GEM_FOPS \ + .open = drm_open,\ + .release = drm_release,\ + .unlocked_ioctl = drm_ioctl,\ + .compat_ioctl = drm_compat_ioctl,\ + .poll = drm_poll,\ + .read = drm_read,\ + .llseek = noop_llseek,\ + .mmap = drm_gem_mmap +/** * DEFINE_DRM_GEM_FOPS() - macro to generate file operations for GEM drivers * @name: name for the generated structure @@ -330,14 +347,7 @@ struct drm_gem_object {#define DEFINE_DRM_GEM_FOPS (name) \ static const struct file_operations name = {\ .owner = THIS_MODULE,\ - .open = drm_open,\ - .release = drm_release,\ - .unlocked_ioctl = drm_ioctl,\ - .compat_ioctl = drm_compat_ioctl,\ - .poll = drm_poll,\ - .read = drm_read,\ - .llseek = noop_llseek,\ - .mmap = drm_gem_mmap,\ + DRM_GEM_FOPS,\ }void drm_gem_object_release (struct drm_gem_object *obj); --Quoted 2 lines
2.36.1
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch