Drop drm_gem_object from drm_gem_vram_object, use the
ttm_buffer_object.base instead.
Signed-off-by: Gerd Hoffmann <[email protected]>
---
include/drm/drm_gem_vram_helper.h | 3 +--
drivers/gpu/drm/ast/ast_main.c | 2 +-
drivers/gpu/drm/drm_gem_vram_helper.c | 16 ++++++++--------
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_main.c | 2 +-
drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
index 9581ea0a4f7e..7b9f50ba3fce 100644
--- a/include/drm/drm_gem_vram_helper.h
+++ b/include/drm/drm_gem_vram_helper.h
@@ -36,7 +36,6 @@ struct vm_area_struct;
* video memory becomes scarce.
*/
struct drm_gem_vram_object {
- struct drm_gem_object gem;
struct ttm_buffer_object bo;
struct ttm_bo_kmap_obj kmap;
@@ -68,7 +67,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_bo(
static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
struct drm_gem_object *gem)
{
- return container_of(gem, struct drm_gem_vram_object, gem);
+ return container_of(gem, struct drm_gem_vram_object, bo.base);
}
struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index 4c7e31cb45ff..74e6e471d283 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -609,6 +609,6 @@ int ast_gem_create(struct drm_device *dev,
DRM_ERROR("failed to allocate GEM object\n");
return ret;
}
- *obj = &gbo->gem;
+ *obj = &gbo->bo.base;
return 0;
}
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index 4de782ca26b2..61d9520cc15f 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -24,7 +24,7 @@ static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo)
* TTM buffer object in 'bo' has already been cleaned
* up; only release the GEM object.
*/
- drm_gem_object_release(&gbo->gem);
+ drm_gem_object_release(&gbo->bo.base);
}
static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo)
@@ -80,7 +80,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
int ret;
size_t acc_size;
- ret = drm_gem_object_init(dev, &gbo->gem, size);
+ ret = drm_gem_object_init(dev, &gbo->bo.base, size);
if (ret)
return ret;
@@ -98,7 +98,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
return 0;
err_drm_gem_object_release:
- drm_gem_object_release(&gbo->gem);
+ drm_gem_object_release(&gbo->bo.base);
return ret;
}
@@ -378,11 +378,11 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
if (IS_ERR(gbo))
return PTR_ERR(gbo);
- ret = drm_gem_handle_create(file, &gbo->gem, &handle);
+ ret = drm_gem_handle_create(file, &gbo->bo.base, &handle);
if (ret)
goto err_drm_gem_object_put_unlocked;
- drm_gem_object_put_unlocked(&gbo->gem);
+ drm_gem_object_put_unlocked(&gbo->bo.base);
args->pitch = pitch;
args->size = size;
@@ -391,7 +391,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
return 0;
err_drm_gem_object_put_unlocked:
- drm_gem_object_put_unlocked(&gbo->gem);
+ drm_gem_object_put_unlocked(&gbo->bo.base);
return ret;
}
EXPORT_SYMBOL(drm_gem_vram_fill_create_dumb);
@@ -441,7 +441,7 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo,
{
struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo);
- return drm_vma_node_verify_access(&gbo->gem.vma_node,
+ return drm_vma_node_verify_access(&gbo->bo.base.vma_node,
filp->private_data);
}
EXPORT_SYMBOL(drm_gem_vram_bo_driver_verify_access);
@@ -635,7 +635,7 @@ int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *gem,
{
struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(gem);
- gbo->gem.vma_node.vm_node.start = gbo->bo.vma_node.vm_node.start;
+ gbo->bo.base.vma_node.vm_node.start = gbo->bo.vma_node.vm_node.start;
return drm_gem_prime_mmap(gem, vma);
}
EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_mmap);
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
index 52fba8cb8ddd..f2a63b5f0425 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
@@ -65,7 +65,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
DRM_ERROR("failed to allocate GEM object: %d\n", ret);
return ret;
}
- *obj = &gbo->gem;
+ *obj = &gbo->bo.base;
return 0;
}
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
index 0d7fc00e5d8a..c17440d3e6bc 100644
--- a/drivers/gpu/drm/mgag200/mgag200_main.c
+++ b/drivers/gpu/drm/mgag200/mgag200_main.c
@@ -288,6 +288,6 @@ int mgag200_gem_create(struct drm_device *dev,
DRM_ERROR("failed to allocate GEM object\n");
return ret;
}
- *obj = &gbo->gem;
+ *obj = &gbo->bo.base;
return 0;
}
diff --git a/drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/gpu/drm/vboxvideo/vbox_main.c
index 18693e2bf72a..02fa8277ff1e 100644
--- a/drivers/gpu/drm/vboxvideo/vbox_main.c
+++ b/drivers/gpu/drm/vboxvideo/vbox_main.c
@@ -292,7 +292,7 @@ int vbox_gem_create(struct vbox_private *vbox,
return ret;
}
- *obj = &gbo->gem;
+ *obj = &gbo->bo.base;
return 0;
}
--
2.18.1
Hi
Am 21.06.19 um 13:57 schrieb Gerd Hoffmann:
> Drop drm_gem_object from drm_gem_vram_object, use the
> ttm_buffer_object.base instead.
>
> Signed-off-by: Gerd Hoffmann <[email protected]>
> ---
> include/drm/drm_gem_vram_helper.h | 3 +--
> drivers/gpu/drm/ast/ast_main.c | 2 +-
> drivers/gpu/drm/drm_gem_vram_helper.c | 16 ++++++++--------
> drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_main.c | 2 +-
> drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +-
> 6 files changed, 13 insertions(+), 14 deletions(-)
>
> diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
> index 9581ea0a4f7e..7b9f50ba3fce 100644
> --- a/include/drm/drm_gem_vram_helper.h
> +++ b/include/drm/drm_gem_vram_helper.h
> @@ -36,7 +36,6 @@ struct vm_area_struct;
> * video memory becomes scarce.
> */
> struct drm_gem_vram_object {
> - struct drm_gem_object gem;
> struct ttm_buffer_object bo;
> struct ttm_bo_kmap_obj kmap;
>
> @@ -68,7 +67,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_bo(
> static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
> struct drm_gem_object *gem)
To avoid ambiguities, I used the form <destination type name>_of_<field
name>() to name these cast functions. The canonical name here would now
be drm_gem_vram_of_bo_base(). But that's just nitpicking. If you don't
want to change the name (and all its callers), maybe leave a FIXME comment.
Acked-by: Thomas Zimmermann <[email protected]>
Best regards
Thomas
> {
> - return container_of(gem, struct drm_gem_vram_object, gem);
> + return container_of(gem, struct drm_gem_vram_object, bo.base);
> }
>
> struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,
> diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
> index 4c7e31cb45ff..74e6e471d283 100644
> --- a/drivers/gpu/drm/ast/ast_main.c
> +++ b/drivers/gpu/drm/ast/ast_main.c
> @@ -609,6 +609,6 @@ int ast_gem_create(struct drm_device *dev,
> DRM_ERROR("failed to allocate GEM object\n");
> return ret;
> }
> - *obj = &gbo->gem;
> + *obj = &gbo->bo.base;
> return 0;
> }
> diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
> index 4de782ca26b2..61d9520cc15f 100644
> --- a/drivers/gpu/drm/drm_gem_vram_helper.c
> +++ b/drivers/gpu/drm/drm_gem_vram_helper.c
> @@ -24,7 +24,7 @@ static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo)
> * TTM buffer object in 'bo' has already been cleaned
> * up; only release the GEM object.
> */
> - drm_gem_object_release(&gbo->gem);
> + drm_gem_object_release(&gbo->bo.base);
> }
>
> static void drm_gem_vram_destroy(struct drm_gem_vram_object *gbo)
> @@ -80,7 +80,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
> int ret;
> size_t acc_size;
>
> - ret = drm_gem_object_init(dev, &gbo->gem, size);
> + ret = drm_gem_object_init(dev, &gbo->bo.base, size);
> if (ret)
> return ret;
>
> @@ -98,7 +98,7 @@ static int drm_gem_vram_init(struct drm_device *dev,
> return 0;
>
> err_drm_gem_object_release:
> - drm_gem_object_release(&gbo->gem);
> + drm_gem_object_release(&gbo->bo.base);
> return ret;
> }
>
> @@ -378,11 +378,11 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
> if (IS_ERR(gbo))
> return PTR_ERR(gbo);
>
> - ret = drm_gem_handle_create(file, &gbo->gem, &handle);
> + ret = drm_gem_handle_create(file, &gbo->bo.base, &handle);
> if (ret)
> goto err_drm_gem_object_put_unlocked;
>
> - drm_gem_object_put_unlocked(&gbo->gem);
> + drm_gem_object_put_unlocked(&gbo->bo.base);
>
> args->pitch = pitch;
> args->size = size;
> @@ -391,7 +391,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,
> return 0;
>
> err_drm_gem_object_put_unlocked:
> - drm_gem_object_put_unlocked(&gbo->gem);
> + drm_gem_object_put_unlocked(&gbo->bo.base);
> return ret;
> }
> EXPORT_SYMBOL(drm_gem_vram_fill_create_dumb);
> @@ -441,7 +441,7 @@ int drm_gem_vram_bo_driver_verify_access(struct ttm_buffer_object *bo,
> {
> struct drm_gem_vram_object *gbo = drm_gem_vram_of_bo(bo);
>
> - return drm_vma_node_verify_access(&gbo->gem.vma_node,
> + return drm_vma_node_verify_access(&gbo->bo.base.vma_node,
> filp->private_data);
> }
> EXPORT_SYMBOL(drm_gem_vram_bo_driver_verify_access);
> @@ -635,7 +635,7 @@ int drm_gem_vram_driver_gem_prime_mmap(struct drm_gem_object *gem,
> {
> struct drm_gem_vram_object *gbo = drm_gem_vram_of_gem(gem);
>
> - gbo->gem.vma_node.vm_node.start = gbo->bo.vma_node.vm_node.start;
> + gbo->bo.base.vma_node.vm_node.start = gbo->bo.vma_node.vm_node.start;
> return drm_gem_prime_mmap(gem, vma);
> }
> EXPORT_SYMBOL(drm_gem_vram_driver_gem_prime_mmap);
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
> index 52fba8cb8ddd..f2a63b5f0425 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c
> @@ -65,7 +65,7 @@ int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel,
> DRM_ERROR("failed to allocate GEM object: %d\n", ret);
> return ret;
> }
> - *obj = &gbo->gem;
> + *obj = &gbo->bo.base;
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c
> index 0d7fc00e5d8a..c17440d3e6bc 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_main.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_main.c
> @@ -288,6 +288,6 @@ int mgag200_gem_create(struct drm_device *dev,
> DRM_ERROR("failed to allocate GEM object\n");
> return ret;
> }
> - *obj = &gbo->gem;
> + *obj = &gbo->bo.base;
> return 0;
> }
> diff --git a/drivers/gpu/drm/vboxvideo/vbox_main.c b/drivers/gpu/drm/vboxvideo/vbox_main.c
> index 18693e2bf72a..02fa8277ff1e 100644
> --- a/drivers/gpu/drm/vboxvideo/vbox_main.c
> +++ b/drivers/gpu/drm/vboxvideo/vbox_main.c
> @@ -292,7 +292,7 @@ int vbox_gem_create(struct vbox_private *vbox,
> return ret;
> }
>
> - *obj = &gbo->gem;
> + *obj = &gbo->bo.base;
>
> return 0;
> }
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)
On Fri, Jun 28, 2019 at 9:30 AM Thomas Zimmermann <[email protected]> wrote:
>
> Hi
>
> Am 21.06.19 um 13:57 schrieb Gerd Hoffmann:
> > Drop drm_gem_object from drm_gem_vram_object, use the
> > ttm_buffer_object.base instead.
> >
> > Signed-off-by: Gerd Hoffmann <[email protected]>
> > ---
> > include/drm/drm_gem_vram_helper.h | 3 +--
> > drivers/gpu/drm/ast/ast_main.c | 2 +-
> > drivers/gpu/drm/drm_gem_vram_helper.c | 16 ++++++++--------
> > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 2 +-
> > drivers/gpu/drm/mgag200/mgag200_main.c | 2 +-
> > drivers/gpu/drm/vboxvideo/vbox_main.c | 2 +-
> > 6 files changed, 13 insertions(+), 14 deletions(-)
> >
> > diff --git a/include/drm/drm_gem_vram_helper.h b/include/drm/drm_gem_vram_helper.h
> > index 9581ea0a4f7e..7b9f50ba3fce 100644
> > --- a/include/drm/drm_gem_vram_helper.h
> > +++ b/include/drm/drm_gem_vram_helper.h
> > @@ -36,7 +36,6 @@ struct vm_area_struct;
> > * video memory becomes scarce.
> > */
> > struct drm_gem_vram_object {
> > - struct drm_gem_object gem;
> > struct ttm_buffer_object bo;
> > struct ttm_bo_kmap_obj kmap;
> >
> > @@ -68,7 +67,7 @@ static inline struct drm_gem_vram_object *drm_gem_vram_of_bo(
> > static inline struct drm_gem_vram_object *drm_gem_vram_of_gem(
> > struct drm_gem_object *gem)
>
> To avoid ambiguities, I used the form <destination type name>_of_<field
> name>() to name these cast functions. The canonical name here would now
> be drm_gem_vram_of_bo_base(). But that's just nitpicking. If you don't
> want to change the name (and all its callers), maybe leave a FIXME comment.
Bikeshed: I think generally we call these
<source_type>_to_<destination_type>, with the source type left out if
you cast from the most generic version. E.g. this one here would just
be
static inline struct drm_gem_vram_object *drm_gem_to_vram_bo(struct
drm_gem_object *gem)
or something like that. I don't remember having seen the *_of_*
pattern anywhere.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch