Message ID | 20180322105133.11211-2-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Den 22.03.2018 11.51, skrev Daniel Vetter: > tinydrm doesn't use dev->struct_mutex and therefore has no need to use > gem_free_object. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: "Noralf Trønnes" <noralf@tronnes.org> > --- Acked-by: Noralf Trønnes <noralf@tronnes.org> > drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- > include/drm/tinydrm/tinydrm.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c > index 4c6616278c48..24a33bf862fa 100644 > --- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c > +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c > @@ -91,7 +91,7 @@ EXPORT_SYMBOL(tinydrm_gem_cma_prime_import_sg_table); > * GEM object state and frees the memory used to store the object itself using > * drm_gem_cma_free_object(). It also handles PRIME buffers which has the kernel > * virtual address set by tinydrm_gem_cma_prime_import_sg_table(). Drivers > - * can use this as their &drm_driver->gem_free_object callback. > + * can use this as their &drm_driver->gem_free_object_unlocked callback. > */ > void tinydrm_gem_cma_free_object(struct drm_gem_object *gem_obj) > { > diff --git a/include/drm/tinydrm/tinydrm.h b/include/drm/tinydrm/tinydrm.h > index 07a9a11fe19d..77a93ec577fd 100644 > --- a/include/drm/tinydrm/tinydrm.h > +++ b/include/drm/tinydrm/tinydrm.h > @@ -41,7 +41,7 @@ pipe_to_tinydrm(struct drm_simple_display_pipe *pipe) > * the &drm_driver structure. > */ > #define TINYDRM_GEM_DRIVER_OPS \ > - .gem_free_object = tinydrm_gem_cma_free_object, \ > + .gem_free_object_unlocked = tinydrm_gem_cma_free_object, \ > .gem_print_info = drm_gem_cma_print_info, \ > .gem_vm_ops = &drm_gem_cma_vm_ops, \ > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \
On Thu, Mar 22, 2018 at 02:46:45PM +0100, Noralf Trønnes wrote: > > Den 22.03.2018 11.51, skrev Daniel Vetter: > > tinydrm doesn't use dev->struct_mutex and therefore has no need to use > > gem_free_object. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: "Noralf Trønnes" <noralf@tronnes.org> > > --- > > Acked-by: Noralf Trønnes <noralf@tronnes.org> Thanks for your ack, applied. Somehow something is wrong with my mailer and ate the other 5 patches. Even in the resend. I'll try again. -Daniel > > > drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- > > include/drm/tinydrm/tinydrm.h | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c > > index 4c6616278c48..24a33bf862fa 100644 > > --- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c > > +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c > > @@ -91,7 +91,7 @@ EXPORT_SYMBOL(tinydrm_gem_cma_prime_import_sg_table); > > * GEM object state and frees the memory used to store the object itself using > > * drm_gem_cma_free_object(). It also handles PRIME buffers which has the kernel > > * virtual address set by tinydrm_gem_cma_prime_import_sg_table(). Drivers > > - * can use this as their &drm_driver->gem_free_object callback. > > + * can use this as their &drm_driver->gem_free_object_unlocked callback. > > */ > > void tinydrm_gem_cma_free_object(struct drm_gem_object *gem_obj) > > { > > diff --git a/include/drm/tinydrm/tinydrm.h b/include/drm/tinydrm/tinydrm.h > > index 07a9a11fe19d..77a93ec577fd 100644 > > --- a/include/drm/tinydrm/tinydrm.h > > +++ b/include/drm/tinydrm/tinydrm.h > > @@ -41,7 +41,7 @@ pipe_to_tinydrm(struct drm_simple_display_pipe *pipe) > > * the &drm_driver structure. > > */ > > #define TINYDRM_GEM_DRIVER_OPS \ > > - .gem_free_object = tinydrm_gem_cma_free_object, \ > > + .gem_free_object_unlocked = tinydrm_gem_cma_free_object, \ > > .gem_print_info = drm_gem_cma_print_info, \ > > .gem_vm_ops = &drm_gem_cma_vm_ops, \ > > .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \ >
diff --git a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c index 4c6616278c48..24a33bf862fa 100644 --- a/drivers/gpu/drm/tinydrm/core/tinydrm-core.c +++ b/drivers/gpu/drm/tinydrm/core/tinydrm-core.c @@ -91,7 +91,7 @@ EXPORT_SYMBOL(tinydrm_gem_cma_prime_import_sg_table); * GEM object state and frees the memory used to store the object itself using * drm_gem_cma_free_object(). It also handles PRIME buffers which has the kernel * virtual address set by tinydrm_gem_cma_prime_import_sg_table(). Drivers - * can use this as their &drm_driver->gem_free_object callback. + * can use this as their &drm_driver->gem_free_object_unlocked callback. */ void tinydrm_gem_cma_free_object(struct drm_gem_object *gem_obj) { diff --git a/include/drm/tinydrm/tinydrm.h b/include/drm/tinydrm/tinydrm.h index 07a9a11fe19d..77a93ec577fd 100644 --- a/include/drm/tinydrm/tinydrm.h +++ b/include/drm/tinydrm/tinydrm.h @@ -41,7 +41,7 @@ pipe_to_tinydrm(struct drm_simple_display_pipe *pipe) * the &drm_driver structure. */ #define TINYDRM_GEM_DRIVER_OPS \ - .gem_free_object = tinydrm_gem_cma_free_object, \ + .gem_free_object_unlocked = tinydrm_gem_cma_free_object, \ .gem_print_info = drm_gem_cma_print_info, \ .gem_vm_ops = &drm_gem_cma_vm_ops, \ .prime_handle_to_fd = drm_gem_prime_handle_to_fd, \
tinydrm doesn't use dev->struct_mutex and therefore has no need to use gem_free_object. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: "Noralf Trønnes" <noralf@tronnes.org> --- drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- include/drm/tinydrm/tinydrm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)