diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-06-02 13:38:48 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-06-02 13:39:00 +1000 |
| commit | 2e1492835e439fceba57a5b0f9b17da8e78ffa3d (patch) | |
| tree | d3376b545f0a123fb76941141d667e4914593ffa /drivers/gpu/drm/msm/msm_drv.c | |
| parent | 85d712f033d23bb56a373e29465470c036532d46 (diff) | |
| parent | 43049f17b5262826ef64a19762a096782398ef8f (diff) | |
Merge tag 'drm-misc-next-2023-06-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.5:
UAPI Changes:
Cross-subsystem Changes:
* fbdev:
* Add Kconfig options and initializer macros for file I/O, convert
DRM fbdev emulation
Core Changes:
* Unify handling of struct file_operations.show_fdinfo
* Use .probe in all i2c code (interface cleanup)
* TTM:
* Remove unused code
Driver Changes:
* amdgpu:
* Use shared show_fdinfo code
* Fix building without procfs
* bridge:
* display-conenctor: Add support for external power supply
* samsung-dsim: Fix enabling; Support variable clocking
* tc358767: Fixes
* ti-sn65dsi83: Fix enabling
* msm:
* Use shared show_fdinfo code
* msxfb:
* Add support for i.MX93 LCDIF
* panel:
* Add support for Ampire AM-800480L1TMQW-T00H plus DT bindings
* panel-edp: Convert .remove to return void
* stm:
* dsi: Use devm_ helper
* ltdc: Fix potential invalid pointer deref
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230601112246.GA10882@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 060c7689a739..58264ff2c4b1 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1057,23 +1057,23 @@ static const struct drm_ioctl_desc msm_ioctls[] = { DRM_IOCTL_DEF_DRV(MSM_SUBMITQUEUE_QUERY, msm_ioctl_submitqueue_query, DRM_RENDER_ALLOW), }; -static void msm_fop_show_fdinfo(struct seq_file *m, struct file *f) +static void msm_show_fdinfo(struct drm_printer *p, struct drm_file *file) { - 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); + msm_gpu_show_fdinfo(priv->gpu, file->driver_priv, p); + + drm_show_memory_stats(p, file); } static const struct file_operations fops = { .owner = THIS_MODULE, DRM_GEM_FOPS, - .show_fdinfo = msm_fop_show_fdinfo, + .show_fdinfo = drm_show_fdinfo, }; static const struct drm_driver msm_driver = { @@ -1083,7 +1083,7 @@ static const struct drm_driver msm_driver = { DRIVER_MODESET | DRIVER_SYNCOBJ, .open = msm_open, - .postclose = msm_postclose, + .postclose = msm_postclose, .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_gem_dumb_map_offset, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, @@ -1093,6 +1093,7 @@ static const struct drm_driver msm_driver = { #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init, #endif + .show_fdinfo = msm_show_fdinfo, .ioctls = msm_ioctls, .num_ioctls = ARRAY_SIZE(msm_ioctls), .fops = &fops, |