| Message ID | 20221017195440.311862-6-zack@kde.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vmwgfx: fb, cursors and hashtable refactor | expand |
On 10/17/22 21:54, Zack Rusin wrote: > From: Maaz Mombasawala <mombasawalam@vmware.com> > > Vmwgfx's hashtab implementation needs to be replaced with linux/hashtable > to reduce maintenence burden. > As part of this effort, refactor the res_ht hashtable used for resource > validation during execbuf execution to use linux/hashtable implementation. > This also refactors vmw_validation_context to use vmw_sw_context as the > container for the hashtable, whereas before it used a vmwgfx_open_hash > directly. This makes vmw_validation_context less generic, but there is > no functional change since res_ht is the only instance where validation > context used a hashtable in vmwgfx driver. Why is a pointer to the vmw_sw_context added to the validation context, rather than a pointer to the new hash table type itself? Seems like an unnecessary indirection which adds a dependency on the sw context to the validation context? > Signed-off-by: Maaz Mombasawala <mombasawalam@vmware.com> > Signed-off-by: Zack Rusin <zackr@vmware.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 24 ++++++++-- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 5 +- > drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 14 ++---- > drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 55 +++++++++++----------- > drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 26 +++------- > 5 files changed, 58 insertions(+), 66 deletions(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index 13b90273eb77..8d77e79bd904 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -830,6 +830,22 @@ static void vmw_write_driver_id(struct vmw_private *dev) > } > } > > +static void vmw_sw_context_init(struct vmw_private *dev_priv) > +{ > + struct vmw_sw_context *sw_context = &dev_priv->ctx; > + > + hash_init(sw_context->res_ht); > +} > + > +static void vmw_sw_context_fini(struct vmw_private *dev_priv) > +{ > + struct vmw_sw_context *sw_context = &dev_priv->ctx; > + > + vfree(sw_context->cmd_bounce); > + if (sw_context->staged_bindings) > + vmw_binding_state_free(sw_context->staged_bindings); > +} > + > static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) > { > int ret; > @@ -839,6 +855,8 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) > > dev_priv->drm.dev_private = dev_priv; > > + vmw_sw_context_init(dev_priv); > + > mutex_init(&dev_priv->cmdbuf_mutex); > mutex_init(&dev_priv->binding_mutex); > spin_lock_init(&dev_priv->resource_lock); > @@ -1168,9 +1186,7 @@ static void vmw_driver_unload(struct drm_device *dev) > > unregister_pm_notifier(&dev_priv->pm_nb); > > - if (dev_priv->ctx.res_ht_initialized) > - vmwgfx_ht_remove(&dev_priv->ctx.res_ht); > - vfree(dev_priv->ctx.cmd_bounce); > + vmw_sw_context_fini(dev_priv); > if (dev_priv->enable_fb) { > vmw_fb_off(dev_priv); > vmw_fb_close(dev_priv); > @@ -1198,8 +1214,6 @@ static void vmw_driver_unload(struct drm_device *dev) > vmw_irq_uninstall(&dev_priv->drm); > > ttm_object_device_release(&dev_priv->tdev); > - if (dev_priv->ctx.staged_bindings) > - vmw_binding_state_free(dev_priv->ctx.staged_bindings); > > for (i = vmw_res_context; i < vmw_res_max; ++i) > idr_destroy(&dev_priv->res_idr[i]); > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > index 09e2d738aa87..d87aeedb78d0 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > @@ -30,6 +30,7 @@ > > #include <linux/suspend.h> > #include <linux/sync_file.h> > +#include <linux/hashtable.h> > > #include <drm/drm_auth.h> > #include <drm/drm_device.h> > @@ -93,6 +94,7 @@ > #define VMW_RES_STREAM ttm_driver_type2 > #define VMW_RES_FENCE ttm_driver_type3 > #define VMW_RES_SHADER ttm_driver_type4 > +#define VMW_RES_HT_ORDER 12 > > #define MKSSTAT_CAPACITY_LOG2 5U > #define MKSSTAT_CAPACITY (1U << MKSSTAT_CAPACITY_LOG2) > @@ -425,8 +427,7 @@ struct vmw_ctx_validation_info; > * @ctx: The validation context > */ > struct vmw_sw_context{ > - struct vmwgfx_open_hash res_ht; > - bool res_ht_initialized; > + DECLARE_HASHTABLE(res_ht, VMW_RES_HT_ORDER); > bool kernel; > struct vmw_fpriv *fp; > struct drm_file *filp; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c > index f085dbd4736d..c943ab801ca7 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 OR MIT > /************************************************************************** > * > - * Copyright 2009 - 2015 VMware, Inc., Palo Alto, CA., USA > + * Copyright 2009 - 2022 VMware, Inc., Palo Alto, CA., USA > * > * Permission is hereby granted, free of charge, to any person obtaining a > * copy of this software and associated documentation files (the > @@ -25,6 +25,7 @@ > * > **************************************************************************/ > #include <linux/sync_file.h> > +#include <linux/hashtable.h> > > #include "vmwgfx_drv.h" > #include "vmwgfx_reg.h" > @@ -34,7 +35,6 @@ > #include "vmwgfx_binding.h" > #include "vmwgfx_mksstat.h" > > -#define VMW_RES_HT_ORDER 12 > > /* > * Helper macro to get dx_ctx_node if available otherwise print an error > @@ -4101,7 +4101,7 @@ int vmw_execbuf_process(struct drm_file *file_priv, > int ret; > int32_t out_fence_fd = -1; > struct sync_file *sync_file = NULL; > - DECLARE_VAL_CONTEXT(val_ctx, &sw_context->res_ht, 1); > + DECLARE_VAL_CONTEXT(val_ctx, sw_context, 1); > > if (flags & DRM_VMW_EXECBUF_FLAG_EXPORT_FENCE_FD) { > out_fence_fd = get_unused_fd_flags(O_CLOEXEC); > @@ -4164,14 +4164,6 @@ int vmw_execbuf_process(struct drm_file *file_priv, > if (sw_context->staged_bindings) > vmw_binding_state_reset(sw_context->staged_bindings); > > - if (!sw_context->res_ht_initialized) { > - ret = vmwgfx_ht_create(&sw_context->res_ht, VMW_RES_HT_ORDER); > - if (unlikely(ret != 0)) > - goto out_unlock; > - > - sw_context->res_ht_initialized = true; > - } > - > INIT_LIST_HEAD(&sw_context->staged_cmd_res); > sw_context->ctx = &val_ctx; > ret = vmw_execbuf_tie_context(dev_priv, sw_context, dx_context_handle); > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c > index f46891012be3..f5c4a40fb16d 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 OR MIT > /************************************************************************** > * > - * Copyright © 2018 VMware, Inc., Palo Alto, CA., USA > + * Copyright © 2018 - 2022 VMware, Inc., Palo Alto, CA., USA > * All Rights Reserved. > * > * Permission is hereby granted, free of charge, to any person obtaining a > @@ -180,11 +180,16 @@ vmw_validation_find_bo_dup(struct vmw_validation_context *ctx, > if (!ctx->merge_dups) > return NULL; > > - if (ctx->ht) { > + if (ctx->sw_context) { > struct vmwgfx_hash_item *hash; > + unsigned long key = (unsigned long) vbo; > > - if (!vmwgfx_ht_find_item(ctx->ht, (unsigned long) vbo, &hash)) > - bo_node = container_of(hash, typeof(*bo_node), hash); > + hash_for_each_possible_rcu(ctx->sw_context->res_ht, hash, head, key) { This open-coded loop seems to be used throughout the conversion, and also in other patches. Perhaps a small helper in place? Otherwise LGTM. Thanks, Thomas
On Wed, 2022-10-19 at 12:21 +0200, Thomas Hellström (Intel) wrote: > ⚠ External Email > > On 10/17/22 21:54, Zack Rusin wrote: > > From: Maaz Mombasawala <mombasawalam@vmware.com> > > > > Vmwgfx's hashtab implementation needs to be replaced with linux/hashtable > > to reduce maintenence burden. > > As part of this effort, refactor the res_ht hashtable used for resource > > validation during execbuf execution to use linux/hashtable implementation. > > This also refactors vmw_validation_context to use vmw_sw_context as the > > container for the hashtable, whereas before it used a vmwgfx_open_hash > > directly. This makes vmw_validation_context less generic, but there is > > no functional change since res_ht is the only instance where validation > > context used a hashtable in vmwgfx driver. > > Why is a pointer to the vmw_sw_context added to the validation context, > rather than a pointer to the new hash table type itself? Seems like an > unnecessary indirection which adds a dependency on the sw context to the > validation context? Hi, Thomas. Thanks for taking a look at this! That's because the entire public interface of hashtable depends on it being a struct on which sizeof works rather than a pointer, i.e. almost the entire interface of hasthbale.h is defined and they all require that HASH_SIZE(hashtable) which is defined as #define HASH_SIZE(hashtable) (ARRAY_SIZE(hashtable)) works on the hashtable. So the interface of hashtable.h can't operate on pointers, but rather needs the full struct. So the only two options are either rewriting the functions from linux/hashtable.h to take explicit HASH_SIZE(hashtable) or make sure that in the functions where you will use hashtable.h you pass the parent struct so that sizeof on the hashtable works correctly. I've seen both approaches in the kernel, but in this case we thought the latter made more sense. > > + if (ctx->sw_context) { > > struct vmwgfx_hash_item *hash; > > + unsigned long key = (unsigned long) vbo; > > > > - if (!vmwgfx_ht_find_item(ctx->ht, (unsigned long) vbo, &hash)) > > - bo_node = container_of(hash, typeof(*bo_node), hash); > > + hash_for_each_possible_rcu(ctx->sw_context->res_ht, hash, head, key) { > > This open-coded loop seems to be used throughout the conversion, and > also in other patches. Perhaps a small helper in place? Yes, that's a good idea. We'll see if we can abstract that. The tricky bit of abstracting code that's using hash_* functions is that, as mentioned above, these are all macros that depend on hashtable not being a pointer, so if you can't fit your helper in another define then you have the same choice as above (i.e. rewrite whatever hash_* function you were using to allow for explicit hash size, or make your helper take the parent of the hash as argument). > Otherwise LGTM. Thanks! z
Hi, Zack, On 10/19/22 18:32, Zack Rusin wrote: > On Wed, 2022-10-19 at 12:21 +0200, Thomas Hellström (Intel) wrote: >> ⚠ External Email >> >> On 10/17/22 21:54, Zack Rusin wrote: >>> From: Maaz Mombasawala <mombasawalam@vmware.com> >>> >>> Vmwgfx's hashtab implementation needs to be replaced with linux/hashtable >>> to reduce maintenence burden. >>> As part of this effort, refactor the res_ht hashtable used for resource >>> validation during execbuf execution to use linux/hashtable implementation. >>> This also refactors vmw_validation_context to use vmw_sw_context as the >>> container for the hashtable, whereas before it used a vmwgfx_open_hash >>> directly. This makes vmw_validation_context less generic, but there is >>> no functional change since res_ht is the only instance where validation >>> context used a hashtable in vmwgfx driver. >> Why is a pointer to the vmw_sw_context added to the validation context, >> rather than a pointer to the new hash table type itself? Seems like an >> unnecessary indirection which adds a dependency on the sw context to the >> validation context? > Hi, Thomas. Thanks for taking a look at this! That's because the entire public > interface of hashtable depends on it being a struct on which sizeof works rather > than a pointer, i.e. almost the entire interface of hasthbale.h is defined and they > all require that HASH_SIZE(hashtable) which is defined as > #define HASH_SIZE(hashtable) (ARRAY_SIZE(hashtable)) > works on the hashtable. So the interface of hashtable.h can't operate on pointers, > but rather needs the full struct. > > So the only two options are either rewriting the functions from linux/hashtable.h to > take explicit HASH_SIZE(hashtable) or make sure that in the functions where you will > use hashtable.h you pass the parent struct so that sizeof on the hashtable works > correctly. I've seen both approaches in the kernel, but in this case we thought the > latter made more sense. > Ah, Ok, yes, tricky one. Lots of options, none of them perfect. Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 13b90273eb77..8d77e79bd904 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -830,6 +830,22 @@ static void vmw_write_driver_id(struct vmw_private *dev) } } +static void vmw_sw_context_init(struct vmw_private *dev_priv) +{ + struct vmw_sw_context *sw_context = &dev_priv->ctx; + + hash_init(sw_context->res_ht); +} + +static void vmw_sw_context_fini(struct vmw_private *dev_priv) +{ + struct vmw_sw_context *sw_context = &dev_priv->ctx; + + vfree(sw_context->cmd_bounce); + if (sw_context->staged_bindings) + vmw_binding_state_free(sw_context->staged_bindings); +} + static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) { int ret; @@ -839,6 +855,8 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) dev_priv->drm.dev_private = dev_priv; + vmw_sw_context_init(dev_priv); + mutex_init(&dev_priv->cmdbuf_mutex); mutex_init(&dev_priv->binding_mutex); spin_lock_init(&dev_priv->resource_lock); @@ -1168,9 +1186,7 @@ static void vmw_driver_unload(struct drm_device *dev) unregister_pm_notifier(&dev_priv->pm_nb); - if (dev_priv->ctx.res_ht_initialized) - vmwgfx_ht_remove(&dev_priv->ctx.res_ht); - vfree(dev_priv->ctx.cmd_bounce); + vmw_sw_context_fini(dev_priv); if (dev_priv->enable_fb) { vmw_fb_off(dev_priv); vmw_fb_close(dev_priv); @@ -1198,8 +1214,6 @@ static void vmw_driver_unload(struct drm_device *dev) vmw_irq_uninstall(&dev_priv->drm); ttm_object_device_release(&dev_priv->tdev); - if (dev_priv->ctx.staged_bindings) - vmw_binding_state_free(dev_priv->ctx.staged_bindings); for (i = vmw_res_context; i < vmw_res_max; ++i) idr_destroy(&dev_priv->res_idr[i]); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 09e2d738aa87..d87aeedb78d0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -30,6 +30,7 @@ #include <linux/suspend.h> #include <linux/sync_file.h> +#include <linux/hashtable.h> #include <drm/drm_auth.h> #include <drm/drm_device.h> @@ -93,6 +94,7 @@ #define VMW_RES_STREAM ttm_driver_type2 #define VMW_RES_FENCE ttm_driver_type3 #define VMW_RES_SHADER ttm_driver_type4 +#define VMW_RES_HT_ORDER 12 #define MKSSTAT_CAPACITY_LOG2 5U #define MKSSTAT_CAPACITY (1U << MKSSTAT_CAPACITY_LOG2) @@ -425,8 +427,7 @@ struct vmw_ctx_validation_info; * @ctx: The validation context */ struct vmw_sw_context{ - struct vmwgfx_open_hash res_ht; - bool res_ht_initialized; + DECLARE_HASHTABLE(res_ht, VMW_RES_HT_ORDER); bool kernel; struct vmw_fpriv *fp; struct drm_file *filp; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index f085dbd4736d..c943ab801ca7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR MIT /************************************************************************** * - * Copyright 2009 - 2015 VMware, Inc., Palo Alto, CA., USA + * Copyright 2009 - 2022 VMware, Inc., Palo Alto, CA., USA * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the @@ -25,6 +25,7 @@ * **************************************************************************/ #include <linux/sync_file.h> +#include <linux/hashtable.h> #include "vmwgfx_drv.h" #include "vmwgfx_reg.h" @@ -34,7 +35,6 @@ #include "vmwgfx_binding.h" #include "vmwgfx_mksstat.h" -#define VMW_RES_HT_ORDER 12 /* * Helper macro to get dx_ctx_node if available otherwise print an error @@ -4101,7 +4101,7 @@ int vmw_execbuf_process(struct drm_file *file_priv, int ret; int32_t out_fence_fd = -1; struct sync_file *sync_file = NULL; - DECLARE_VAL_CONTEXT(val_ctx, &sw_context->res_ht, 1); + DECLARE_VAL_CONTEXT(val_ctx, sw_context, 1); if (flags & DRM_VMW_EXECBUF_FLAG_EXPORT_FENCE_FD) { out_fence_fd = get_unused_fd_flags(O_CLOEXEC); @@ -4164,14 +4164,6 @@ int vmw_execbuf_process(struct drm_file *file_priv, if (sw_context->staged_bindings) vmw_binding_state_reset(sw_context->staged_bindings); - if (!sw_context->res_ht_initialized) { - ret = vmwgfx_ht_create(&sw_context->res_ht, VMW_RES_HT_ORDER); - if (unlikely(ret != 0)) - goto out_unlock; - - sw_context->res_ht_initialized = true; - } - INIT_LIST_HEAD(&sw_context->staged_cmd_res); sw_context->ctx = &val_ctx; ret = vmw_execbuf_tie_context(dev_priv, sw_context, dx_context_handle); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c index f46891012be3..f5c4a40fb16d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR MIT /************************************************************************** * - * Copyright © 2018 VMware, Inc., Palo Alto, CA., USA + * Copyright © 2018 - 2022 VMware, Inc., Palo Alto, CA., USA * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -180,11 +180,16 @@ vmw_validation_find_bo_dup(struct vmw_validation_context *ctx, if (!ctx->merge_dups) return NULL; - if (ctx->ht) { + if (ctx->sw_context) { struct vmwgfx_hash_item *hash; + unsigned long key = (unsigned long) vbo; - if (!vmwgfx_ht_find_item(ctx->ht, (unsigned long) vbo, &hash)) - bo_node = container_of(hash, typeof(*bo_node), hash); + hash_for_each_possible_rcu(ctx->sw_context->res_ht, hash, head, key) { + if (hash->key == key) { + bo_node = container_of(hash, typeof(*bo_node), hash); + break; + } + } } else { struct vmw_validation_bo_node *entry; @@ -217,11 +222,16 @@ vmw_validation_find_res_dup(struct vmw_validation_context *ctx, if (!ctx->merge_dups) return NULL; - if (ctx->ht) { + if (ctx->sw_context) { struct vmwgfx_hash_item *hash; + unsigned long key = (unsigned long) res; - if (!vmwgfx_ht_find_item(ctx->ht, (unsigned long) res, &hash)) - res_node = container_of(hash, typeof(*res_node), hash); + hash_for_each_possible_rcu(ctx->sw_context->res_ht, hash, head, key) { + if (hash->key == key) { + res_node = container_of(hash, typeof(*res_node), hash); + break; + } + } } else { struct vmw_validation_res_node *entry; @@ -269,20 +279,15 @@ int vmw_validation_add_bo(struct vmw_validation_context *ctx, } } else { struct ttm_validate_buffer *val_buf; - int ret; bo_node = vmw_validation_mem_alloc(ctx, sizeof(*bo_node)); if (!bo_node) return -ENOMEM; - if (ctx->ht) { + if (ctx->sw_context) { bo_node->hash.key = (unsigned long) vbo; - ret = vmwgfx_ht_insert_item(ctx->ht, &bo_node->hash); - if (ret) { - DRM_ERROR("Failed to initialize a buffer " - "validation entry.\n"); - return ret; - } + hash_add_rcu(ctx->sw_context->res_ht, &bo_node->hash.head, + bo_node->hash.key); } val_buf = &bo_node->base; val_buf->bo = ttm_bo_get_unless_zero(&vbo->base); @@ -316,7 +321,6 @@ int vmw_validation_add_resource(struct vmw_validation_context *ctx, bool *first_usage) { struct vmw_validation_res_node *node; - int ret; node = vmw_validation_find_res_dup(ctx, res); if (node) { @@ -330,14 +334,9 @@ int vmw_validation_add_resource(struct vmw_validation_context *ctx, return -ENOMEM; } - if (ctx->ht) { + if (ctx->sw_context) { node->hash.key = (unsigned long) res; - ret = vmwgfx_ht_insert_item(ctx->ht, &node->hash); - if (ret) { - DRM_ERROR("Failed to initialize a resource validation " - "entry.\n"); - return ret; - } + hash_add_rcu(ctx->sw_context->res_ht, &node->hash.head, node->hash.key); } node->res = vmw_resource_reference_unless_doomed(res); if (!node->res) @@ -681,19 +680,19 @@ void vmw_validation_drop_ht(struct vmw_validation_context *ctx) struct vmw_validation_bo_node *entry; struct vmw_validation_res_node *val; - if (!ctx->ht) + if (!ctx->sw_context) return; list_for_each_entry(entry, &ctx->bo_list, base.head) - (void) vmwgfx_ht_remove_item(ctx->ht, &entry->hash); + hash_del_rcu(&entry->hash.head); list_for_each_entry(val, &ctx->resource_list, head) - (void) vmwgfx_ht_remove_item(ctx->ht, &val->hash); + hash_del_rcu(&val->hash.head); list_for_each_entry(val, &ctx->resource_ctx_list, head) - (void) vmwgfx_ht_remove_item(ctx->ht, &val->hash); + hash_del_rcu(&entry->hash.head); - ctx->ht = NULL; + ctx->sw_context = NULL; } /** diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h index f21df053882b..ab9ec226f433 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_validation.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 OR MIT */ /************************************************************************** * - * Copyright © 2018 VMware, Inc., Palo Alto, CA., USA + * Copyright © 2018 - 2022 VMware, Inc., Palo Alto, CA., USA * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -29,12 +29,11 @@ #define _VMWGFX_VALIDATION_H_ #include <linux/list.h> +#include <linux/hashtable.h> #include <linux/ww_mutex.h> #include <drm/ttm/ttm_execbuf_util.h> -#include "vmwgfx_hashtab.h" - #define VMW_RES_DIRTY_NONE 0 #define VMW_RES_DIRTY_SET BIT(0) #define VMW_RES_DIRTY_CLEAR BIT(1) @@ -59,7 +58,7 @@ * @total_mem: Amount of reserved memory. */ struct vmw_validation_context { - struct vmwgfx_open_hash *ht; + struct vmw_sw_context *sw_context; struct list_head resource_list; struct list_head resource_ctx_list; struct list_head bo_list; @@ -82,16 +81,16 @@ struct vmw_fence_obj; /** * DECLARE_VAL_CONTEXT - Declare a validation context with initialization * @_name: The name of the variable - * @_ht: The hash table used to find dups or NULL if none + * @_sw_context: Contains the hash table used to find dups or NULL if none * @_merge_dups: Whether to merge duplicate buffer object- or resource * entries. If set to true, ideally a hash table pointer should be supplied * as well unless the number of resources and buffer objects per validation * is known to be very small */ #endif -#define DECLARE_VAL_CONTEXT(_name, _ht, _merge_dups) \ +#define DECLARE_VAL_CONTEXT(_name, _sw_context, _merge_dups) \ struct vmw_validation_context _name = \ - { .ht = _ht, \ + { .sw_context = _sw_context, \ .resource_list = LIST_HEAD_INIT((_name).resource_list), \ .resource_ctx_list = LIST_HEAD_INIT((_name).resource_ctx_list), \ .bo_list = LIST_HEAD_INIT((_name).bo_list), \ @@ -114,19 +113,6 @@ vmw_validation_has_bos(struct vmw_validation_context *ctx) return !list_empty(&ctx->bo_list); } -/** - * vmw_validation_set_ht - Register a hash table for duplicate finding - * @ctx: The validation context - * @ht: Pointer to a hash table to use for duplicate finding - * This function is intended to be used if the hash table wasn't - * available at validation context declaration time - */ -static inline void vmw_validation_set_ht(struct vmw_validation_context *ctx, - struct vmwgfx_open_hash *ht) -{ - ctx->ht = ht; -} - /** * vmw_validation_bo_reserve - Reserve buffer objects registered with a * validation context