mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
drm: Remove DRIVER_GEM_GPUVA feature flag
The DRIVER_GEM_GPUVA feature flag is currently only used to control two behaviors within the DRM core: - calling drm_gem_gpuva_init() during GEM object initialization - creating the "gpuvas" debugfs entry drm_gem_gpuva_init() is a plain INIT_LIST_HEAD() and therefore is cheap to run for every GEM object. The DRM_DEBUGFS_GPUVA_INFO macro is only referenced by GPU-VA capable drivers, so clearing the feature bit does not cause any unrelated drivers to get the "gpuvas" debugfs node. The flag doesn't have any relevant purpose (e.g. gating ioctl handlers or MM logic) and doesn't provide any practical benefit. Remove the flag definition and drop it from all drivers that use it, call drm_gem_gpuva_init() unconditionally and clear the driver features bit in DRM_DEBUGFS_GPUVA_INFO. Signed-off-by: Laura Nao <laura.nao@collabora.com> Acked-by: Rob Clark <rob.clark@oss.qualcomm.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Link: https://patch.msgid.link/20260421084701.24227-1-laura.nao@collabora.com Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
This commit is contained in:
committed by
Boris Brezillon
parent
351af554ed
commit
21fcb222f0
@@ -232,8 +232,7 @@ void drm_gem_private_object_init(struct drm_device *dev,
|
||||
if (!obj->resv)
|
||||
obj->resv = &obj->_resv;
|
||||
|
||||
if (drm_core_check_feature(dev, DRIVER_GEM_GPUVA))
|
||||
drm_gem_gpuva_init(obj);
|
||||
drm_gem_gpuva_init(obj);
|
||||
|
||||
drm_vma_node_reset(&obj->vma_node);
|
||||
INIT_LIST_HEAD(&obj->lru_node);
|
||||
|
||||
@@ -1378,7 +1378,7 @@ pvr_drm_driver_postclose(__always_unused struct drm_device *drm_dev,
|
||||
DEFINE_DRM_GEM_FOPS(pvr_drm_driver_fops);
|
||||
|
||||
static struct drm_driver pvr_drm_driver = {
|
||||
.driver_features = DRIVER_GEM | DRIVER_GEM_GPUVA | DRIVER_RENDER |
|
||||
.driver_features = DRIVER_GEM | DRIVER_RENDER |
|
||||
DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE,
|
||||
.open = pvr_drm_driver_open,
|
||||
.postclose = pvr_drm_driver_postclose,
|
||||
|
||||
@@ -824,7 +824,6 @@ static const struct file_operations fops = {
|
||||
|
||||
#define DRIVER_FEATURES_GPU ( \
|
||||
DRIVER_GEM | \
|
||||
DRIVER_GEM_GPUVA | \
|
||||
DRIVER_RENDER | \
|
||||
DRIVER_SYNCOBJ | \
|
||||
DRIVER_SYNCOBJ_TIMELINE | \
|
||||
@@ -832,7 +831,6 @@ static const struct file_operations fops = {
|
||||
|
||||
#define DRIVER_FEATURES_KMS ( \
|
||||
DRIVER_GEM | \
|
||||
DRIVER_GEM_GPUVA | \
|
||||
DRIVER_ATOMIC | \
|
||||
DRIVER_MODESET | \
|
||||
0 )
|
||||
|
||||
@@ -1364,7 +1364,6 @@ static struct drm_driver
|
||||
driver_stub = {
|
||||
.driver_features = DRIVER_GEM |
|
||||
DRIVER_SYNCOBJ | DRIVER_SYNCOBJ_TIMELINE |
|
||||
DRIVER_GEM_GPUVA |
|
||||
DRIVER_MODESET |
|
||||
DRIVER_RENDER,
|
||||
.open = nouveau_drm_open,
|
||||
|
||||
@@ -1782,7 +1782,7 @@ static void panthor_debugfs_init(struct drm_minor *minor)
|
||||
*/
|
||||
static const struct drm_driver panthor_drm_driver = {
|
||||
.driver_features = DRIVER_RENDER | DRIVER_GEM | DRIVER_SYNCOBJ |
|
||||
DRIVER_SYNCOBJ_TIMELINE | DRIVER_GEM_GPUVA,
|
||||
DRIVER_SYNCOBJ_TIMELINE,
|
||||
.open = panthor_open,
|
||||
.postclose = panthor_postclose,
|
||||
.show_fdinfo = panthor_show_fdinfo,
|
||||
|
||||
@@ -396,7 +396,7 @@ static const struct drm_driver regular_driver = {
|
||||
XE_DISPLAY_DRIVER_FEATURES |
|
||||
DRIVER_GEM |
|
||||
DRIVER_RENDER | DRIVER_SYNCOBJ |
|
||||
DRIVER_SYNCOBJ_TIMELINE | DRIVER_GEM_GPUVA,
|
||||
DRIVER_SYNCOBJ_TIMELINE,
|
||||
.open = xe_file_open,
|
||||
.postclose = xe_file_close,
|
||||
|
||||
@@ -427,7 +427,7 @@ static const struct drm_ioctl_desc xe_ioctls_admin_only[] = {
|
||||
static const struct drm_driver admin_only_driver = {
|
||||
.driver_features =
|
||||
XE_DISPLAY_DRIVER_FEATURES |
|
||||
DRIVER_GEM | DRIVER_RENDER | DRIVER_GEM_GPUVA,
|
||||
DRIVER_GEM | DRIVER_RENDER,
|
||||
.open = xe_file_open,
|
||||
.postclose = xe_file_close,
|
||||
.ioctls = xe_ioctls_admin_only,
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
* For each DRM GPU VA space drivers should call drm_debugfs_gpuva_info() from
|
||||
* their @show callback.
|
||||
*/
|
||||
#define DRM_DEBUGFS_GPUVA_INFO(show, data) {"gpuvas", show, DRIVER_GEM_GPUVA, data}
|
||||
#define DRM_DEBUGFS_GPUVA_INFO(show, data) {"gpuvas", show, 0, data}
|
||||
|
||||
/**
|
||||
* struct drm_info_list - debugfs info list entry
|
||||
|
||||
@@ -107,12 +107,6 @@ enum drm_driver_feature {
|
||||
* acceleration should be handled by two drivers that are connected using auxiliary bus.
|
||||
*/
|
||||
DRIVER_COMPUTE_ACCEL = BIT(7),
|
||||
/**
|
||||
* @DRIVER_GEM_GPUVA:
|
||||
*
|
||||
* Driver supports user defined GPU VA bindings for GEM objects.
|
||||
*/
|
||||
DRIVER_GEM_GPUVA = BIT(8),
|
||||
/**
|
||||
* @DRIVER_CURSOR_HOTSPOT:
|
||||
*
|
||||
|
||||
@@ -661,9 +661,6 @@ static inline bool drm_gem_is_imported(const struct drm_gem_object *obj)
|
||||
*
|
||||
* This initializes the &drm_gem_object's &drm_gpuvm_bo list.
|
||||
*
|
||||
* Calling this function is only necessary for drivers intending to support the
|
||||
* &drm_driver_feature DRIVER_GEM_GPUVA.
|
||||
*
|
||||
* See also drm_gem_gpuva_set_lock().
|
||||
*/
|
||||
static inline void drm_gem_gpuva_init(struct drm_gem_object *obj)
|
||||
|
||||
Reference in New Issue
Block a user