drm: add some ttm/vram info to debugfs
Subsystems (5)
Gerd Hoffmann
maintainerv2 cover drm: add some ttm/vram info to debugfs
Gerd Hoffmann (6):
drm: add drm_print_bits
drm/ttm: add drm gem ttm helpers, starting with
drm_gem_ttm_print_info()
drm/vram: use drm_gem_ttm_print_info
drm/vram: add vram-mm debugfs file
drm/qxl: use drm_gem_object_funcs callbacks
drm/qxl: use drm_gem_ttm_print_info
drivers/gpu/drm/qxl/qxl_drv.h | 1 + include/drm/drm_gem_ttm_helper.h | 19 ++++++++++ include/drm/drm_gem_vram_helper.h | 1 + include/drm/drm_print.h | 3 ++ include/drm/drm_vram_mm_helper.h | 1 + drivers/gpu/drm/drm_gem_ttm_helper.c | 53 +++++++++++++++++++++++++++ drivers/gpu/drm/drm_gem_vram_helper.c | 4 +- drivers/gpu/drm/drm_print.c | 36 ++++++++++++++++++ drivers/gpu/drm/drm_vram_mm_helper.c | 44 ++++++++++++++++++++++ drivers/gpu/drm/qxl/qxl_drv.c | 8 ---- drivers/gpu/drm/qxl/qxl_object.c | 13 +++++++ Documentation/gpu/drm-mm.rst | 12 ++++++ drivers/gpu/drm/Kconfig | 8 ++++ drivers/gpu/drm/Makefile | 3 ++ 14 files changed, 197 insertions(+), 9 deletions(-) create mode 100644 include/drm/drm_gem_ttm_helper.h create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.c
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v2 1/6 drm: add drm_print_bits
New helper to print named bits of some value (think flags fields).
--- include/drm/drm_print.h | 3 +++ drivers/gpu/drm/drm_print.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)
include/drm/drm_print.h +3 -0
@@ -88,6 +88,9 @@ __printf(2, 3)void drm_printf (struct drm_printer *p,const char *f, ...);void drm_puts (struct drm_printer *p,const char *str);void drm_print_regset32 (struct drm_printer *p,struct debugfs_regset32 *regset); +void drm_print_bits (struct drm_printer *p,unsigned int indent, +const char *label,unsigned int value, +const char *bits[],unsigned int nbits);__printf (2 ,0 )/**
drivers/gpu/drm/drm_print.c +36 -0
@@ -179,6 +179,42 @@ void drm_printf(struct drm_printer *p, const char *f, ...) }EXPORT_SYMBOL (drm_printf); +/** +* drm_print_bits - print bits to a &drm_printer stream +* +* Print bits (in flag fields for example) in human readable form. +* +* @p: the &drm_printer +* @indent: Tab indentation level (max 5) +* @label: field label. +* @value: field value. +* @bits: Array with bit names. +* @nbits: bit name array size. +*/ +void drm_print_bits (struct drm_printer *p,unsigned int indent, +const char *label,unsigned int value, +const char *bits[],unsigned int nbits) +{ +bool first = true; +unsigned int i; + +for (i =0 ; i < nbits; i++) { +if (!(value & (1 << i))) +continue ; +if (!bits[i]) +continue ; +if (first) { + first = false; +drm_printf_indent (p, indent,"%s=%s" , + label, bits[i]); + }else +drm_printf (p,",%s" , bits[i]); + } +if (!first) +drm_printf (p,"\n" ); +} +EXPORT_SYMBOL (drm_print_bits); +void drm_dev_printk (const struct device *dev,const char *level,const char *format, ...) {
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 1/6] drm: add drm_print_bits
Quoted 43 lines · Gerd Hoffmann
New helper to print named bits of some value (think flags fields).
Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_print.h | 3 +++ drivers/gpu/drm/drm_print.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+)include/drm/drm_print.h +3
-0@@ -88,6 +88,9 @@ __printf(2, 3)void drm_printf (struct drm_printer *p,const char *f, ...);void drm_puts (struct drm_printer *p,const char *str);void drm_print_regset32 (struct drm_printer *p,struct debugfs_regset32 *regset); +void drm_print_bits (struct drm_printer *p,unsigned int indent, +const char *label,unsigned int value, +const char *bits[],unsigned int nbits);__printf (2 ,0 )/** drivers/gpu/drm/drm_print.c +13
-0@@ -179,6 +179,42 @@ void drm_printf(struct drm_printer *p, const char *f, ...) }EXPORT_SYMBOL (drm_printf); +/** +* drm_print_bits - print bits to a &drm_printer stream +* +* Print bits (in flag fields for example) in human readable form. +* +* @p: the &drm_printer +* @indent: Tab indentation level (max 5) +* @label: field label. +* @value: field value. +* @bits: Array with bit names. +* @nbits: bit name array size. +*/ +void drm_print_bits(struct drm_printer *p, unsigned int indent,
drivers/gpu/drm/drm_print.c void drm_printf(struct drm_printer *p, const char *f, ...) · line 204
Quoted 10 lines
drivers/gpu/drm/drm_print.c +10
-0+ const char *label, unsigned int value, + const char *bits[], unsigned int nbits) +{ + bool first = true; +unsigned int i; + +for (i =0 ; i < nbits; i++) { +if (!(value & (1 << i))) +continue ; +if (!bits[i])
I think this should be a WARN_ON, indicates a programming error?
drivers/gpu/drm/drm_print.c void drm_printf(struct drm_printer *p, const char *f, ...) · line 209
Quoted 5 lines
drivers/gpu/drm/drm_print.c +5
-0+continue ; +if (first) { + first = false; +drm_printf_indent (p, indent,"%s=%s" , + label, bits[i]);
Hm, to make this a bit more flexible to use I'd drop the label= printing
...
drivers/gpu/drm/drm_print.c void drm_printf(struct drm_printer *p, const char *f, ...) · line 214
Quoted 5 lines
drivers/gpu/drm/drm_print.c +5
-0+ }else +drm_printf (p,",%s" , bits[i]); + } +if (!first) +drm_printf (p,"\n" );
... and also the newline. Then you could also use this for bit-fields which just a few bits. Also, should we print anything if no bit is set?
If you prefer the label= + \n then pls add that to the kerneldoc, that it prints this as a line of its own.
-Daniel
Quoted 9 lines
drivers/gpu/drm/drm_print.c +3
-0+} +EXPORT_SYMBOL (drm_print_bits); +void drm_dev_printk (const struct device *dev,const char *level,const char *format, ...) {Signature · 1 line
2.18.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Gerd Hoffmann
maintainerPATCH v2 2/6 drm/ttm: add drm gem ttm helpers, starting with drm_gem_ttm_print_info()
In reply to Gerd HoffmannNow with ttm_buffer_object being a subclass of drm_gem_object we can easily lookup ttm_buffer_object for a given drm_gem_object, which in turn allows to create common helper functions.
This patch starts off with a drm_gem_ttm_print_info() helper function which prints adds some ttm specific lines to the debug output.
--- include/drm/drm_gem_ttm_helper.h | 19 ++++++++++ drivers/gpu/drm/drm_gem_ttm_helper.c | 53 ++++++++++++++++++++++++++++ Documentation/gpu/drm-mm.rst | 12 +++++++ drivers/gpu/drm/Kconfig | 7 ++++ drivers/gpu/drm/Makefile | 3 ++ 5 files changed, 94 insertions(+) create mode 100644 include/drm/drm_gem_ttm_helper.h create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.c
include/drm/drm_gem_ttm_helper.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_TTM_HELPER_H +#define DRM_GEM_TTM_HELPER_H + +#include <linux/kernel.h> + +#include <drm/drm_gem.h> +#include <drm/drm_device.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_driver.h> + +#define drm_gem_ttm_of_gem (gem_obj) \ + container_of(gem_obj, struct ttm_buffer_object, base) + +void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent, +const struct drm_gem_object *gem); + +#endif
drivers/gpu/drm/drm_gem_ttm_helper.c new file +53 -0
53 lines not on this page · raw message
Documentation/gpu/drm-mm.rst +12 -0
@@ -412,6 +412,18 @@ VRAM MM Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c :export: +GEM TTM Helper Functions Reference +----------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_ttm_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_ttm_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_ttm_helper.c + :export: + VMA Offset Manager ==================
drivers/gpu/drm/Kconfig +7 -0
@@ -172,6 +172,13 @@ config DRM_VRAM_HELPER help Helpers for VRAM memory management +config DRM_TTM_HELPER + tristate + depends on DRM + select DRM_TTM + help + Helpers for ttm-based gem objects + config DRM_GEM_CMA_HELPER bool depends on DRM
drivers/gpu/drm/Makefile +3 -0
@@ -37,6 +37,9 @@ drm_vram_helper-y := drm_gem_vram_helper.o \ drm_vram_mm_helper.o obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o +drm_ttm_helper-y := drm_gem_ttm_helper.o +obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o + drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \ drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \ drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
Signature · 1 line
2.18.1
Re: [PATCH v2 2/6] drm/ttm: add drm gem ttm helpers, starting with drm_gem_ttm_print_info()
Quoted 60 lines · Gerd Hoffmann
Now with
ttm_buffer_objectbeing a subclass ofdrm_gem_objectwe can easily lookupttm_buffer_objectfor a givendrm_gem_object, which in turn allows to create common helper functions.This patch starts off with a
drm_gem_ttm_print_info()helper function which prints adds some ttm specific lines to the debug output.Signed-off-by Gerd Hoffmann <[email protected]>--- include/drm/drm_gem_ttm_helper.h | 19 ++++++++++ drivers/gpu/drm/drm_gem_ttm_helper.c | 53 ++++++++++++++++++++++++++++ Documentation/gpu/drm-mm.rst | 12 +++++++ drivers/gpu/drm/Kconfig | 7 ++++ drivers/gpu/drm/Makefile | 3 ++ 5 files changed, 94 insertions(+) create mode 100644 include/drm/drm_gem_ttm_helper.h create mode 100644 drivers/gpu/drm/drm_gem_ttm_helper.cinclude/drm/drm_gem_ttm_helper.h new file +19
-0@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef DRM_GEM_TTM_HELPER_H +#define DRM_GEM_TTM_HELPER_H + +#include <linux/kernel.h> + +#include <drm/drm_gem.h> +#include <drm/drm_device.h> +#include <drm/ttm/ttm_bo_api.h> +#include <drm/ttm/ttm_bo_driver.h> + +#define drm_gem_ttm_of_gem (gem_obj) \ + container_of(gem_obj, struct ttm_buffer_object, base) + +void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent, +const struct drm_gem_object *gem); + +#endif drivers/gpu/drm/drm_gem_ttm_helper.c new file +10
-0@@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include <linux/module.h> + +#include <drm/drm_gem_ttm_helper.h> + +/** +* DOC: overview +* +* This library provides helper functions for gem objects backed by
drivers/gpu/drm/drm_gem_ttm_helper.c line 20
Quoted 10 lines
drivers/gpu/drm/drm_gem_ttm_helper.c new file +10
-0+* ttm. +*/ + +/** +* drm_gem_ttm_print_info() - Print &ttm_buffer_object info for debugfs +* @p: DRM printer +* @indent: Tab indentation level +* @gem: GEM object +* +* This function can be used as the &drm_driver->gem_print_info callback.
&drm_gem_object_funcs.print_info is the new thing. Also I think you need the . for kerneldoc to parse this correctly and make it a link.
Quoted 79 lines
drivers/gpu/drm/drm_gem_ttm_helper.c new file +33
-0+*/ +void drm_gem_ttm_print_info (struct drm_printer *p,unsigned int indent, +const struct drm_gem_object *gem) +{ +static const char const *plname[] = { + [TTM_PL_SYSTEM ] ="system" , + [TTM_PL_TT ] ="tt" , + [TTM_PL_VRAM ] ="vram" , + [TTM_PL_PRIV ] ="priv" , + + [16 ] ="cached" , + [17 ] ="uncached" , + [18 ] ="wc" , + [19 ] ="contig" , + + [21 ] ="pinned" ,/* NO_EVICT */ + [22 ] ="topdown" , + }; +const struct ttm_buffer_object *bo =drm_gem_ttm_of_gem (gem); + +drm_print_bits (p, indent,"placement" , bo->mem.placement, + plname,ARRAY_SIZE (plname)); +if (bo->mem.bus.is_iomem) { +drm_printf_indent (p, indent,"bus.base=%lx\n" , + (unsigned long )bo->mem.bus.base); +drm_printf_indent (p, indent,"bus.offset=%lx\n" , + (unsigned long )bo->mem.bus.offset); + } +} +EXPORT_SYMBOL (drm_gem_ttm_print_info); + +MODULE_DESCRIPTION ("DRM gem ttm helpers" ); +MODULE_LICENSE ("GPL" );Documentation/gpu/drm-mm.rst +12
-0@@ -412,6 +412,18 @@ VRAM MM Helper Functions Reference .. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c :export: +GEM TTM Helper Functions Reference +----------------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_gem_ttm_helper.c + :doc: overview + +.. kernel-doc:: include/drm/drm_gem_ttm_helper.h + :internal: + +.. kernel-doc:: drivers/gpu/drm/drm_gem_ttm_helper.c + :export: + VMA Offset Manager ==================drivers/gpu/drm/Kconfig +7
-0@@ -172,6 +172,13 @@ config DRM_VRAM_HELPER help Helpers for VRAM memory management +config DRM_TTM_HELPER + tristate + depends on DRM + select DRM_TTM + help + Helpers for ttm-based gem objects + config DRM_GEM_CMA_HELPER bool depends on DRMdrivers/gpu/drm/Makefile +0
-0
drivers/gpu/drm/Makefile drm_vram_helper-y := drm_gem_vram_helper.o \ · line 45
Quoted 9 lines
drivers/gpu/drm/Makefile +3
-0@@ -37,6 +37,9 @@ drm_vram_helper-y := drm_gem_vram_helper.o \ drm_vram_mm_helper.o obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o +drm_ttm_helper-y := drm_gem_ttm_helper.o +obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o + drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_dsc.o drm_probe_helper.o \ drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \ drm_kms_helper_common.o drm_dp_dual_mode_helper.o \
Nice! With the kerneldoc bikeshed fixed:
Quoted 3 lines
Signature · 1 line
2.18.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Gerd Hoffmann
maintainerPATCH v2 3/6 drm/vram: use drm_gem_ttm_print_info
In reply to Gerd Hoffmann--- drivers/gpu/drm/drm_gem_vram_helper.c | 4 +++- drivers/gpu/drm/Kconfig | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_vram_helper.c +3 -1
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-or-later +#include <drm/drm_gem_ttm_helper.h> #include <drm/drm_gem_vram_helper.h> #include <drm/drm_device.h> #include <drm/drm_mode.h>
@@ -633,5 +634,6 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { .pin = drm_gem_vram_object_pin, .unpin = drm_gem_vram_object_unpin, .vmap = drm_gem_vram_object_vmap, - .vunmap = drm_gem_vram_object_vunmap + .vunmap = drm_gem_vram_object_vunmap, + .print_info = drm_gem_ttm_print_info, };
drivers/gpu/drm/Kconfig +1 -0
@@ -169,6 +169,7 @@ config DRM_VRAM_HELPER tristate depends on DRM select DRM_TTM + select DRM_TTM_HELPER help Helpers for VRAM memory management
Signature · 1 line
2.18.1
Re: [PATCH v2 3/6] drm/vram: use drm_gem_ttm_print_info
Quoted 19 lines · Gerd Hoffmann
Signed-off-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 4 +++- drivers/gpu/drm/Kconfig | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_gem_vram_helper.c +1
-0@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-or-later +#include <drm/drm_gem_ttm_helper.h> #include <drm/drm_gem_vram_helper.h> #include <drm/drm_device.h> #include <drm/drm_mode.h>
drivers/gpu/drm/drm_gem_vram_helper.c static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { · line 638
Quoted 6 lines
drivers/gpu/drm/drm_gem_vram_helper.c +2
-1@@ -633,5 +634,6 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { .pin = drm_gem_vram_object_pin, .unpin = drm_gem_vram_object_unpin, .vmap = drm_gem_vram_object_vmap, - .vunmap = drm_gem_vram_object_vunmap + .vunmap = drm_gem_vram_object_vunmap, + .print_info = drm_gem_ttm_print_info,
Yeah definitely link to the new way of doing stuff in the kerneldoc of the previous patch. For this.
drivers/gpu/drm/Kconfig config DRM_VRAM_HELPER · line 172
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0};drivers/gpu/drm/Kconfig +1
-0@@ -169,6 +169,7 @@ config DRM_VRAM_HELPER tristate depends on DRM select DRM_TTM + select DRM_TTM_HELPER
Select isn't recursive, which means anyone who selects vram helpers now also needs to select ttm helpers. This is already broken with DRM_TTM I think ...
-Daniel
Quoted 6 lines
drivers/gpu/drm/Kconfig +0
-0help Helpers for VRAM memory managementSignature · 1 line
2.18.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v2 4/6 drm/vram: add vram-mm debugfs file
In reply to Gerd HoffmannWire up drm_mm_print() for vram helpers, using a new debugfs file, so one can see how vram is used:
# cat /sys/kernel/debug/dri/0/vram-mm 0x0000000000000000-0x0000000000000300: 768: used 0x0000000000000300-0x0000000000000600: 768: used 0x0000000000000600-0x0000000000000900: 768: used 0x0000000000000900-0x0000000000000c00: 768: used 0x0000000000000c00-0x0000000000004000: 13312: free total: 16384, used 3072 free 13312
--- include/drm/drm_gem_vram_helper.h | 1 + include/drm/drm_vram_mm_helper.h | 1 + drivers/gpu/drm/drm_vram_mm_helper.c | 44 ++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+)
include/drm/drm_gem_vram_helper.h +1 -0
@@ -122,6 +122,7 @@ int drm_gem_vram_driver_dumb_mmap_offset(struct drm_file *file,* &struct drm_driver with default functions. */ #define DRM_GEM_VRAM_DRIVER \ + .debugfs_init = drm_vram_mm_debugfs_init, \ .dumb_create = drm_gem_vram_driver_dumb_create, \ .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, \ .gem_prime_mmap = drm_gem_prime_mmap
include/drm/drm_vram_mm_helper.h +1 -0
@@ -60,6 +60,7 @@ static inline struct drm_vram_mm *drm_vram_mm_of_bdev( return container_of(bdev, struct drm_vram_mm, bdev); } +int drm_vram_mm_debugfs_init (struct drm_minor *minor);int drm_vram_mm_init (struct drm_vram_mm *vmm,struct drm_device *dev,uint64_t vram_base,size_t vram_size,const struct drm_vram_mm_funcs *funcs);
drivers/gpu/drm/drm_vram_mm_helper.c +44 -0
57 lines not on this page · raw message
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Gerd Hoffmann
maintainerPATCH v2 5/6 drm/qxl: use drm_gem_object_funcs callbacks
In reply to Gerd HoffmannSwitch qxl to use drm_gem_object_funcs callbacks
instead of drm_driver callbacks.
--- drivers/gpu/drm/qxl/qxl_drv.c | 8 -------- drivers/gpu/drm/qxl/qxl_object.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +0 -8
@@ -258,16 +258,8 @@ static struct drm_driver qxl_driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_pin = qxl_gem_prime_pin, - .gem_prime_unpin = qxl_gem_prime_unpin, - .gem_prime_get_sg_table = qxl_gem_prime_get_sg_table, .gem_prime_import_sg_table = qxl_gem_prime_import_sg_table, - .gem_prime_vmap = qxl_gem_prime_vmap, - .gem_prime_vunmap = qxl_gem_prime_vunmap, .gem_prime_mmap = qxl_gem_prime_mmap, - .gem_free_object_unlocked = qxl_gem_object_free, - .gem_open_object = qxl_gem_object_open, - .gem_close_object = qxl_gem_object_close, .fops = &qxl_fops, .ioctls = qxl_ioctls, .irq_handler = qxl_irq_handler,
drivers/gpu/drm/qxl/qxl_object.c +12 -0
@@ -77,6 +77,17 @@ void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned) } } +static const struct drm_gem_object_funcs qxl_object_funcs = { + .free = qxl_gem_object_free, + .open = qxl_gem_object_open, + .close = qxl_gem_object_close, + .pin = qxl_gem_prime_pin, + .unpin = qxl_gem_prime_unpin, + .get_sg_table = qxl_gem_prime_get_sg_table, + .vmap = qxl_gem_prime_vmap, + .vunmap = qxl_gem_prime_vunmap, +}; + int qxl_bo_create(struct qxl_device *qdev, unsigned long size, bool kernel, bool pinned, u32 domain, struct qxl_surface *surf,
@@ -100,6 +111,7 @@ int qxl_bo_create(struct qxl_device *qdev,kfree (bo);return r; } + bo->tbo.base.funcs = &qxl_object_funcs; bo->type = domain; bo->pin_count = pinned ?1 :0 ; bo->surface_id =0 ;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 5/6 drm/qxl: use drm_gem_object_funcs callbacks
In reply to Gerd HoffmannSwitch qxl to use drm_gem_object_funcs callbacks
instead of drm_driver callbacks.
--- drivers/gpu/drm/qxl/qxl_drv.c | 8 -------- drivers/gpu/drm/qxl/qxl_object.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.c +0 -8
@@ -258,16 +258,8 @@ static struct drm_driver qxl_driver = {#endif .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, - .gem_prime_pin = qxl_gem_prime_pin, - .gem_prime_unpin = qxl_gem_prime_unpin, - .gem_prime_get_sg_table = qxl_gem_prime_get_sg_table, .gem_prime_import_sg_table = qxl_gem_prime_import_sg_table, - .gem_prime_vmap = qxl_gem_prime_vmap, - .gem_prime_vunmap = qxl_gem_prime_vunmap, .gem_prime_mmap = qxl_gem_prime_mmap, - .gem_free_object_unlocked = qxl_gem_object_free, - .gem_open_object = qxl_gem_object_open, - .gem_close_object = qxl_gem_object_close, .fops = &qxl_fops, .ioctls = qxl_ioctls, .irq_handler = qxl_irq_handler,
drivers/gpu/drm/qxl/qxl_object.c +12 -0
@@ -77,6 +77,17 @@ void qxl_ttm_placement_from_domain(struct qxl_bo *qbo, u32 domain, bool pinned) } } +static const struct drm_gem_object_funcs qxl_object_funcs = { + .free = qxl_gem_object_free, + .open = qxl_gem_object_open, + .close = qxl_gem_object_close, + .pin = qxl_gem_prime_pin, + .unpin = qxl_gem_prime_unpin, + .get_sg_table = qxl_gem_prime_get_sg_table, + .vmap = qxl_gem_prime_vmap, + .vunmap = qxl_gem_prime_vunmap, +}; + int qxl_bo_create(struct qxl_device *qdev, unsigned long size, bool kernel, bool pinned, u32 domain, struct qxl_surface *surf,
@@ -100,6 +111,7 @@ int qxl_bo_create(struct qxl_device *qdev,kfree (bo);return r; } + bo->tbo.base.funcs = &qxl_object_funcs; bo->type = domain; bo->pin_count = pinned ?1 :0 ; bo->surface_id =0 ;
Signature · 1 line
2.18.1
Gerd Hoffmann
maintainerPATCH v2 6/6 drm/qxl: use drm_gem_ttm_print_info
In reply to Gerd Hoffmann--- drivers/gpu/drm/qxl/qxl_drv.h | 1 + drivers/gpu/drm/qxl/qxl_object.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/qxl/qxl_drv.h +1 -0
@@ -38,6 +38,7 @@#include <drm/drm_crtc.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_gem_ttm_helper.h> #include <drm/drm_ioctl.h> #include <drm/drm_gem.h> #include <drm/qxl_drm.h>
drivers/gpu/drm/qxl/qxl_object.c +1 -0
@@ -86,6 +86,7 @@ static const struct drm_gem_object_funcs qxl_object_funcs = { .get_sg_table = qxl_gem_prime_get_sg_table, .vmap = qxl_gem_prime_vmap, .vunmap = qxl_gem_prime_vunmap, + .print_info = drm_gem_ttm_print_info, }; int qxl_bo_create(struct qxl_device *qdev,
Signature · 1 line
2.18.1