* [PATCH v2 1/3] drm/vram-helper: Remove interruptible flag from public interface
2019-12-12 7:41 [PATCH v2 0/3] drm/vram-helper: Various cleanups Thomas Zimmermann
@ 2019-12-12 7:41 ` Thomas Zimmermann
2019-12-12 7:41 ` [PATCH v2 2/3] drm/vram-helper: Remove BO device " Thomas Zimmermann
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2019-12-12 7:41 UTC (permalink / raw)
To: airlied, daniel, maarten.lankhorst, mripard, zourongrong,
kong.kongxinwei, puck.chen, kraxel, sam
Cc: Thomas Zimmermann, dri-devel
The flag 'interruptible', which is passed to various functions,
is always set to be false. Remove it and hard-code the value.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Suggested-by: Daniel Vetter <daniel@ffwll.ch>
---
drivers/gpu/drm/ast/ast_mode.c | 2 +-
drivers/gpu/drm/drm_gem_vram_helper.c | 17 ++++++-----------
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +-
include/drm/drm_gem_vram_helper.h | 4 +---
6 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index b879bd666e35..26336642dd59 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1145,7 +1145,7 @@ static int ast_cursor_init(struct drm_device *dev)
for (i = 0; i < ARRAY_SIZE(ast->cursor.gbo); ++i) {
gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev,
- size, 0, false);
+ size, 0);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
goto err_drm_gem_vram_put;
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 666cb4c22bb9..4908f1281002 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -94,8 +94,7 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo,
static int drm_gem_vram_init(struct drm_device *dev,
struct ttm_bo_device *bdev,
struct drm_gem_vram_object *gbo,
- size_t size, unsigned long pg_align,
- bool interruptible)
+ size_t size, unsigned long pg_align)
{
int ret;
size_t acc_size;
@@ -112,7 +111,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
drm_gem_vram_placement(gbo, TTM_PL_FLAG_VRAM | TTM_PL_FLAG_SYSTEM);
ret = ttm_bo_init(bdev, &gbo->bo, size, ttm_bo_type_device,
- &gbo->placement, pg_align, interruptible, acc_size,
+ &gbo->placement, pg_align, false, acc_size,
NULL, NULL, ttm_buffer_object_destroy);
if (ret)
goto err_drm_gem_object_release;
@@ -130,7 +129,6 @@ static int drm_gem_vram_init(struct drm_device *dev,
* @bdev: the TTM BO device backing the object
* @size: the buffer size in bytes
* @pg_align: the buffer's alignment in multiples of the page size
- * @interruptible: sleep interruptible if waiting for memory
*
* Returns:
* A new instance of &struct drm_gem_vram_object on success, or
@@ -139,8 +137,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
struct ttm_bo_device *bdev,
size_t size,
- unsigned long pg_align,
- bool interruptible)
+ unsigned long pg_align)
{
struct drm_gem_vram_object *gbo;
int ret;
@@ -149,7 +146,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
if (!gbo)
return ERR_PTR(-ENOMEM);
- ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align, interruptible);
+ ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align);
if (ret < 0)
goto err_kfree;
@@ -485,7 +482,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);
* @dev: the DRM device
* @bdev: the TTM BO device managing the buffer object
* @pg_align: the buffer's alignment in multiples of the page size
- * @interruptible: sleep interruptible if waiting for memory
* @args: the arguments as provided to \
&struct drm_driver.dumb_create
*
@@ -502,7 +498,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
struct drm_device *dev,
struct ttm_bo_device *bdev,
unsigned long pg_align,
- bool interruptible,
struct drm_mode_create_dumb *args)
{
size_t pitch, size;
@@ -517,7 +512,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
if (!size)
return -EINVAL;
- gbo = drm_gem_vram_create(dev, bdev, size, pg_align, interruptible);
+ gbo = drm_gem_vram_create(dev, bdev, size, pg_align);
if (IS_ERR(gbo))
return PTR_ERR(gbo);
@@ -613,7 +608,7 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,
return -EINVAL;
return drm_gem_vram_fill_create_dumb(file, dev, &dev->vram_mm->bdev, 0,
- false, args);
+ args);
}
EXPORT_SYMBOL(drm_gem_vram_driver_dumb_create);
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 21b684eab5c9..16f5cd2c1b3b 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -58,7 +58,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
if (size == 0)
return -EINVAL;
- gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev, size, 0, false);
+ gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev, size, 0);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
if (ret != -ERESTARTSYS)
diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
index 5444cf1573a3..dd54fd507e13 100644
--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
+++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
@@ -209,7 +209,7 @@ int mgag200_cursor_init(struct mga_device *mdev)
for (i = 0; i < ncursors; ++i) {
gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev,
- size, 0, false);
+ size, 0);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
goto err_drm_gem_vram_put;
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index 9f4f5f071add..dc125838f5d1 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -121,7 +121,7 @@ int mgag200_driver_dumb_create(struct drm_file *file,
pg_align = PFN_UP(mdev->mc.vram_size);
return drm_gem_vram_fill_create_dumb(file, dev, &dev->vram_mm->bdev,
- pg_align, false, args);
+ pg_align, args);
}
static struct drm_driver driver = {
diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
index 08adaf3695ea..90736427285e 100644
--- a/include/drm/drm_gem_vram_helper.h
+++ b/include/drm/drm_gem_vram_helper.h
@@ -95,8 +95,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
struct ttm_bo_device *bdev,
size_t size,
- unsigned long pg_align,
- bool interruptible);
+ unsigned long pg_align);
void drm_gem_vram_put(struct drm_gem_vram_object *gbo);
u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo);
s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo);
@@ -112,7 +111,6 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
struct drm_device *dev,
struct ttm_bo_device *bdev,
unsigned long pg_align,
- bool interruptible,
struct drm_mode_create_dumb *args);
/*
--
2.24.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/3] drm/vram-helper: Remove BO device from public interface
2019-12-12 7:41 [PATCH v2 0/3] drm/vram-helper: Various cleanups Thomas Zimmermann
2019-12-12 7:41 ` [PATCH v2 1/3] drm/vram-helper: Remove interruptible flag from public interface Thomas Zimmermann
@ 2019-12-12 7:41 ` Thomas Zimmermann
2019-12-12 7:41 ` [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object Thomas Zimmermann
2019-12-12 9:49 ` [PATCH v2 0/3] drm/vram-helper: Various cleanups Sam Ravnborg
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2019-12-12 7:41 UTC (permalink / raw)
To: airlied, daniel, maarten.lankhorst, mripard, zourongrong,
kong.kongxinwei, puck.chen, kraxel, sam
Cc: Thomas Zimmermann, dri-devel
TTM is an implementation detail of the VRAM helpers and therefore
shouldn't be exposed to the callers. There's only one correct value
for the BO device anyway, which is the one stored in the DRM device.
So remove struct ttm_bo_device from the VRAM-helper interface and
use the device's VRAM manager unconditionally. The GEM initializer
function fails if the VRAM manager has not been initialized.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/ast/ast_mode.c | 3 +--
drivers/gpu/drm/drm_gem_vram_helper.c | 21 +++++++++------------
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_cursor.c | 3 +--
drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +--
include/drm/drm_gem_vram_helper.h | 2 --
6 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 26336642dd59..f4fbdab29bb7 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -1144,8 +1144,7 @@ static int ast_cursor_init(struct drm_device *dev)
size = roundup(AST_HWC_SIZE + AST_HWC_SIGNATURE_SIZE, PAGE_SIZE);
for (i = 0; i < ARRAY_SIZE(ast->cursor.gbo); ++i) {
- gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev,
- size, 0);
+ gbo = drm_gem_vram_create(dev, size, 0);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
goto err_drm_gem_vram_put;
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 4908f1281002..b760fd27f3c0 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -92,13 +92,18 @@ static void drm_gem_vram_placement(struct drm_gem_vram_object *gbo,
}
static int drm_gem_vram_init(struct drm_device *dev,
- struct ttm_bo_device *bdev,
struct drm_gem_vram_object *gbo,
size_t size, unsigned long pg_align)
{
+ struct drm_vram_mm *vmm = dev->vram_mm;
+ struct ttm_bo_device *bdev;
int ret;
size_t acc_size;
+ if (WARN_ONCE(!vmm, "VRAM MM not initialized"))
+ return -EINVAL;
+ bdev = &vmm->bdev;
+
gbo->bo.base.funcs = &drm_gem_vram_object_funcs;
ret = drm_gem_object_init(dev, &gbo->bo.base, size);
@@ -126,7 +131,6 @@ static int drm_gem_vram_init(struct drm_device *dev,
/**
* drm_gem_vram_create() - Creates a VRAM-backed GEM object
* @dev: the DRM device
- * @bdev: the TTM BO device backing the object
* @size: the buffer size in bytes
* @pg_align: the buffer's alignment in multiples of the page size
*
@@ -135,7 +139,6 @@ static int drm_gem_vram_init(struct drm_device *dev,
* an ERR_PTR()-encoded error code otherwise.
*/
struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
- struct ttm_bo_device *bdev,
size_t size,
unsigned long pg_align)
{
@@ -146,7 +149,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
if (!gbo)
return ERR_PTR(-ENOMEM);
- ret = drm_gem_vram_init(dev, bdev, gbo, size, pg_align);
+ ret = drm_gem_vram_init(dev, gbo, size, pg_align);
if (ret < 0)
goto err_kfree;
@@ -480,7 +483,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);
Helper for implementing &struct drm_driver.dumb_create
* @file: the DRM file
* @dev: the DRM device
- * @bdev: the TTM BO device managing the buffer object
* @pg_align: the buffer's alignment in multiples of the page size
* @args: the arguments as provided to \
&struct drm_driver.dumb_create
@@ -496,7 +498,6 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);
*/
int drm_gem_vram_fill_create_dumb(struct drm_file *file,
struct drm_device *dev,
- struct ttm_bo_device *bdev,
unsigned long pg_align,
struct drm_mode_create_dumb *args)
{
@@ -512,7 +513,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
if (!size)
return -EINVAL;
- gbo = drm_gem_vram_create(dev, bdev, size, pg_align);
+ gbo = drm_gem_vram_create(dev, size, pg_align);
if (IS_ERR(gbo))
return PTR_ERR(gbo);
@@ -604,11 +605,7 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,
struct drm_device *dev,
struct drm_mode_create_dumb *args)
{
- if (WARN_ONCE(!dev->vram_mm, "VRAM MM not initialized"))
- return -EINVAL;
-
- return drm_gem_vram_fill_create_dumb(file, dev, &dev->vram_mm->bdev, 0,
- args);
+ return drm_gem_vram_fill_create_dumb(file, dev, 0, args);
}
EXPORT_SYMBOL(drm_gem_vram_driver_dumb_create);
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 16f5cd2c1b3b..4a5bde80045a 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -58,7 +58,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
if (size == 0)
return -EINVAL;
- gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev, size, 0);
+ gbo = drm_gem_vram_create(dev, size, 0);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
if (ret != -ERESTARTSYS)
diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
index dd54fd507e13..d491edd317ff 100644
--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
+++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
@@ -208,8 +208,7 @@ int mgag200_cursor_init(struct mga_device *mdev)
return -ENOMEM;
for (i = 0; i < ncursors; ++i) {
- gbo = drm_gem_vram_create(dev, &dev->vram_mm->bdev,
- size, 0);
+ gbo = drm_gem_vram_create(dev, size, 0);
if (IS_ERR(gbo)) {
ret = PTR_ERR(gbo);
goto err_drm_gem_vram_put;
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c
index dc125838f5d1..1b5b60da2e62 100644
--- a/drivers/gpu/drm/mgag200/mgag200_drv.c
+++ b/drivers/gpu/drm/mgag200/mgag200_drv.c
@@ -120,8 +120,7 @@ int mgag200_driver_dumb_create(struct drm_file *file,
if (mgag200_pin_bo_at_0(mdev))
pg_align = PFN_UP(mdev->mc.vram_size);
- return drm_gem_vram_fill_create_dumb(file, dev, &dev->vram_mm->bdev,
- pg_align, args);
+ return drm_gem_vram_fill_create_dumb(file, dev, pg_align, args);
}
static struct drm_driver driver = {
diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
index 90736427285e..9341f54383b3 100644
--- a/include/drm/drm_gem_vram_helper.h
+++ b/include/drm/drm_gem_vram_helper.h
@@ -93,7 +93,6 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
}
struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
- struct ttm_bo_device *bdev,
size_t size,
unsigned long pg_align);
void drm_gem_vram_put(struct drm_gem_vram_object *gbo);
@@ -109,7 +108,6 @@ void drm_gem_vram_vunmap(struct drm_gem_vram_object *gbo, void *vaddr);
int drm_gem_vram_fill_create_dumb(struct drm_file *file,
struct drm_device *dev,
- struct ttm_bo_device *bdev,
unsigned long pg_align,
struct drm_mode_create_dumb *args);
--
2.24.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object
2019-12-12 7:41 [PATCH v2 0/3] drm/vram-helper: Various cleanups Thomas Zimmermann
2019-12-12 7:41 ` [PATCH v2 1/3] drm/vram-helper: Remove interruptible flag from public interface Thomas Zimmermann
2019-12-12 7:41 ` [PATCH v2 2/3] drm/vram-helper: Remove BO device " Thomas Zimmermann
@ 2019-12-12 7:41 ` Thomas Zimmermann
2019-12-13 10:27 ` Daniel Vetter
2019-12-12 9:49 ` [PATCH v2 0/3] drm/vram-helper: Various cleanups Sam Ravnborg
3 siblings, 1 reply; 8+ messages in thread
From: Thomas Zimmermann @ 2019-12-12 7:41 UTC (permalink / raw)
To: airlied, daniel, maarten.lankhorst, mripard, zourongrong,
kong.kongxinwei, puck.chen, kraxel, sam
Cc: Thomas Zimmermann, dri-devel
Drivers that what to allocate VRAM GEM objects with additional fields
can now do this by implementing struct drm_driver.gem_create_object.
v2:
* only cast to gbo within if branch; set gbo directly
in else branch
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index b760fd27f3c0..baa49d1e9538 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -2,6 +2,7 @@
#include <drm/drm_debugfs.h>
#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
#include <drm/drm_file.h>
#include <drm/drm_framebuffer.h>
#include <drm/drm_gem_ttm_helper.h>
@@ -145,7 +146,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
struct drm_gem_vram_object *gbo;
int ret;
- gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
+ if (dev->driver->gem_create_object) {
+ struct drm_gem_object *gem =
+ dev->driver->gem_create_object(dev, size);
+ gbo = drm_gem_vram_of_gem(gem);
+ } else {
+ gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
+ }
if (!gbo)
return ERR_PTR(-ENOMEM);
--
2.24.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object
2019-12-12 7:41 ` [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object Thomas Zimmermann
@ 2019-12-13 10:27 ` Daniel Vetter
2020-01-06 10:20 ` Thomas Zimmermann
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Vetter @ 2019-12-13 10:27 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: puck.chen, dri-devel, kong.kongxinwei, kraxel, zourongrong,
airlied, sam
On Thu, Dec 12, 2019 at 08:41:17AM +0100, Thomas Zimmermann wrote:
> Drivers that what to allocate VRAM GEM objects with additional fields
> can now do this by implementing struct drm_driver.gem_create_object.
>
> v2:
> * only cast to gbo within if branch; set gbo directly
> in else branch
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
> index b760fd27f3c0..baa49d1e9538 100644
> --- a/drivers/gpu/drm/drm_gem_vram_helper.c
> +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
> @@ -2,6 +2,7 @@
>
> #include <drm/drm_debugfs.h>
> #include <drm/drm_device.h>
> +#include <drm/drm_drv.h>
> #include <drm/drm_file.h>
> #include <drm/drm_framebuffer.h>
> #include <drm/drm_gem_ttm_helper.h>
> @@ -145,7 +146,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
> struct drm_gem_vram_object *gbo;
> int ret;
>
> - gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
> + if (dev->driver->gem_create_object) {
> + struct drm_gem_object *gem =
> + dev->driver->gem_create_object(dev, size);
> + gbo = drm_gem_vram_of_gem(gem);
> + } else {
> + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
> + }
> if (!gbo)
See my other mail, I'd move the check too into if/else blocks. ERR_PTR
after an upcast is always a bit scary.
-Daniel
> return ERR_PTR(-ENOMEM);
>
> --
> 2.24.0
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object
2019-12-13 10:27 ` Daniel Vetter
@ 2020-01-06 10:20 ` Thomas Zimmermann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2020-01-06 10:20 UTC (permalink / raw)
To: Daniel Vetter
Cc: puck.chen, dri-devel, kong.kongxinwei, kraxel, zourongrong,
airlied, sam
[-- Attachment #1.1.1: Type: text/plain, Size: 1996 bytes --]
Hi
Am 13.12.19 um 11:27 schrieb Daniel Vetter:
> On Thu, Dec 12, 2019 at 08:41:17AM +0100, Thomas Zimmermann wrote:
>> Drivers that what to allocate VRAM GEM objects with additional fields
>> can now do this by implementing struct drm_driver.gem_create_object.
>>
>> v2:
>> * only cast to gbo within if branch; set gbo directly
>> in else branch
>>
>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
>> ---
>> drivers/gpu/drm/drm_gem_vram_helper.c | 9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
>> index b760fd27f3c0..baa49d1e9538 100644
>> --- a/drivers/gpu/drm/drm_gem_vram_helper.c
>> +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
>> @@ -2,6 +2,7 @@
>>
>> #include <drm/drm_debugfs.h>
>> #include <drm/drm_device.h>
>> +#include <drm/drm_drv.h>
>> #include <drm/drm_file.h>
>> #include <drm/drm_framebuffer.h>
>> #include <drm/drm_gem_ttm_helper.h>
>> @@ -145,7 +146,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
>> struct drm_gem_vram_object *gbo;
>> int ret;
>>
>> - gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
>> + if (dev->driver->gem_create_object) {
>> + struct drm_gem_object *gem =
>> + dev->driver->gem_create_object(dev, size);
>> + gbo = drm_gem_vram_of_gem(gem);
>> + } else {
>> + gbo = kzalloc(sizeof(*gbo), GFP_KERNEL);
>> + }
>> if (!gbo)
>
> See my other mail, I'd move the check too into if/else blocks. ERR_PTR
> after an upcast is always a bit scary.
What a stupid mistake. I should have seen that myself. Will be fixed in
the next iteration.
Best regards
Thomas
> -Daniel
>
>> return ERR_PTR(-ENOMEM);
>>
>> --
>> 2.24.0
>>
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/3] drm/vram-helper: Various cleanups
2019-12-12 7:41 [PATCH v2 0/3] drm/vram-helper: Various cleanups Thomas Zimmermann
` (2 preceding siblings ...)
2019-12-12 7:41 ` [PATCH v2 3/3] drm/vram-helper: Support struct drm_driver.gem_create_object Thomas Zimmermann
@ 2019-12-12 9:49 ` Sam Ravnborg
2019-12-12 10:26 ` Thomas Zimmermann
3 siblings, 1 reply; 8+ messages in thread
From: Sam Ravnborg @ 2019-12-12 9:49 UTC (permalink / raw)
To: Thomas Zimmermann
Cc: puck.chen, dri-devel, kong.kongxinwei, kraxel, zourongrong,
airlied
Hi Thomas.
On Thu, Dec 12, 2019 at 08:41:14AM +0100, Thomas Zimmermann wrote:
> A number of cleanups that I wanted to apply for some time. The first
> two patches simplify the public interface. The third patch adds support
> for struct drm_driver.gem_create_object. All tested by running fbdev,
> X11 and Weston on ast HW.
>
> v2:
> * make drm_gem_vram_create() still work if GEM object is not
> first in struct
>
> Thomas Zimmermann (3):
> drm/vram-helper: Remove interruptible flag from public interface
> drm/vram-helper: Remove BO device from public interface
> drm/vram-helper: Support struct drm_driver.gem_create_object
I have browsed the code changes - everything now looks fine.
As I miss the high-level picture (which is just my lack of DRM
knowledge) this is not a review. But you can add my:
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Sam
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH v2 0/3] drm/vram-helper: Various cleanups
2019-12-12 9:49 ` [PATCH v2 0/3] drm/vram-helper: Various cleanups Sam Ravnborg
@ 2019-12-12 10:26 ` Thomas Zimmermann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Zimmermann @ 2019-12-12 10:26 UTC (permalink / raw)
To: Sam Ravnborg
Cc: puck.chen, dri-devel, kong.kongxinwei, kraxel, zourongrong,
airlied
[-- Attachment #1.1.1: Type: text/plain, Size: 1190 bytes --]
Am 12.12.19 um 10:49 schrieb Sam Ravnborg:
> Hi Thomas.
>
> On Thu, Dec 12, 2019 at 08:41:14AM +0100, Thomas Zimmermann wrote:
>> A number of cleanups that I wanted to apply for some time. The first
>> two patches simplify the public interface. The third patch adds support
>> for struct drm_driver.gem_create_object. All tested by running fbdev,
>> X11 and Weston on ast HW.
>>
>> v2:
>> * make drm_gem_vram_create() still work if GEM object is not
>> first in struct
>>
>> Thomas Zimmermann (3):
>> drm/vram-helper: Remove interruptible flag from public interface
>> drm/vram-helper: Remove BO device from public interface
>> drm/vram-helper: Support struct drm_driver.gem_create_object
>
> I have browsed the code changes - everything now looks fine.
> As I miss the high-level picture (which is just my lack of DRM
> knowledge) this is not a review. But you can add my:
> Acked-by: Sam Ravnborg <sam@ravnborg.org>
Thanks, Sam.
>
> Sam
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread