summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Clark <robin.clark@oss.qualcomm.com>2025-07-05 07:52:40 -0700
committerRob Clark <robin.clark@oss.qualcomm.com>2025-07-05 09:59:12 -0700
commitee82e5a2c5155d06ef0b7ab4bac8cb4bb8a2893a (patch)
tree4a1928e0d17cdb3b6db64e2c634ef259869187f8
parent217ed15bd399980981f90f4332bc7ad4b05baa7e (diff)
drm/msm: Clean up split driver features
Avoid the possibility of missing features between the split and unified drm driver cases by defining DRIVER_FEATURES_GPU / KMS and using those in the drm_driver initializations. Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Patchwork: https://patchwork.freedesktop.org/patch/662595/
-rw-r--r--drivers/gpu/drm/msm/msm_drv.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index b6efc5b9933b..4872559288c1 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -816,14 +816,22 @@ static const struct file_operations fops = {
.show_fdinfo = drm_show_fdinfo,
};
+#define DRIVER_FEATURES_GPU ( \
+ DRIVER_GEM | \
+ DRIVER_GEM_GPUVA | \
+ DRIVER_RENDER | \
+ DRIVER_SYNCOBJ | \
+ DRIVER_SYNCOBJ_TIMELINE | \
+ 0 )
+
+#define DRIVER_FEATURES_KMS ( \
+ DRIVER_GEM | \
+ DRIVER_ATOMIC | \
+ DRIVER_MODESET | \
+ 0 )
+
static const struct drm_driver msm_driver = {
- .driver_features = DRIVER_GEM |
- DRIVER_GEM_GPUVA |
- DRIVER_RENDER |
- DRIVER_ATOMIC |
- DRIVER_MODESET |
- DRIVER_SYNCOBJ_TIMELINE |
- DRIVER_SYNCOBJ,
+ .driver_features = DRIVER_FEATURES_GPU | DRIVER_FEATURES_KMS,
.open = msm_open,
.postclose = msm_postclose,
.dumb_create = msm_gem_dumb_create,
@@ -846,9 +854,7 @@ static const struct drm_driver msm_driver = {
};
static const struct drm_driver msm_kms_driver = {
- .driver_features = DRIVER_GEM |
- DRIVER_ATOMIC |
- DRIVER_MODESET,
+ .driver_features = DRIVER_FEATURES_KMS,
.open = msm_open,
.postclose = msm_postclose,
.dumb_create = msm_gem_dumb_create,
@@ -870,11 +876,7 @@ static const struct drm_driver msm_kms_driver = {
};
static const struct drm_driver msm_gpu_driver = {
- .driver_features = DRIVER_GEM |
- DRIVER_GEM_GPUVA |
- DRIVER_RENDER |
- DRIVER_SYNCOBJ_TIMELINE |
- DRIVER_SYNCOBJ,
+ .driver_features = DRIVER_FEATURES_GPU,
.open = msm_open,
.postclose = msm_postclose,
.gem_prime_import_sg_table = msm_gem_prime_import_sg_table,