| From: Jani Nikula <jani.nikula@intel.com> |
| Subject: drm/msm: clean up fault injection usage |
| Date: Tue, 13 Aug 2024 15:12:36 +0300 |
| |
| With the proper stubs in place in linux/fault-inject.h, we can remove a |
| bunch of conditional compilation for CONFIG_FAULT_INJECTION=n. |
| |
| Link: https://lkml.kernel.org/r/20240813121237.2382534-2-jani.nikula@intel.com |
| Signed-off-by: Jani Nikula <jani.nikula@intel.com> |
| Reviewed-by: Thomas Hellstrรถm <thomas.hellstrom@linux.intel.com> |
| Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com> |
| Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> |
| Cc: Akinobu Mita <akinobu.mita@gmail.com> |
| Cc: Rob Clark <robdclark@gmail.com> |
| Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> |
| Cc: Lucas De Marchi <lucas.demarchi@intel.com> |
| Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| drivers/gpu/drm/msm/msm_debugfs.c | 2 -- |
| drivers/gpu/drm/msm/msm_drv.c | 2 -- |
| drivers/gpu/drm/msm/msm_drv.h | 4 ---- |
| 3 files changed, 8 deletions(-) |
| |
| --- a/drivers/gpu/drm/msm/msm_debugfs.c~drm-msm-clean-up-fault-injection-usage |
| +++ a/drivers/gpu/drm/msm/msm_debugfs.c |
| @@ -357,12 +357,10 @@ void msm_debugfs_init(struct drm_minor * |
| if (priv->kms && priv->kms->funcs->debugfs_init) |
| priv->kms->funcs->debugfs_init(priv->kms, minor); |
| |
| -#ifdef CONFIG_FAULT_INJECTION |
| fault_create_debugfs_attr("fail_gem_alloc", minor->debugfs_root, |
| &fail_gem_alloc); |
| fault_create_debugfs_attr("fail_gem_iova", minor->debugfs_root, |
| &fail_gem_iova); |
| -#endif |
| } |
| #endif |
| |
| --- a/drivers/gpu/drm/msm/msm_drv.c~drm-msm-clean-up-fault-injection-usage |
| +++ a/drivers/gpu/drm/msm/msm_drv.c |
| @@ -59,10 +59,8 @@ static bool modeset = true; |
| MODULE_PARM_DESC(modeset, "Use kernel modesetting [KMS] (1=on (default), 0=disable)"); |
| module_param(modeset, bool, 0600); |
| |
| -#ifdef CONFIG_FAULT_INJECTION |
| DECLARE_FAULT_ATTR(fail_gem_alloc); |
| DECLARE_FAULT_ATTR(fail_gem_iova); |
| -#endif |
| |
| static int msm_drm_uninit(struct device *dev) |
| { |
| --- a/drivers/gpu/drm/msm/msm_drv.h~drm-msm-clean-up-fault-injection-usage |
| +++ a/drivers/gpu/drm/msm/msm_drv.h |
| @@ -33,12 +33,8 @@ |
| #include <drm/msm_drm.h> |
| #include <drm/drm_gem.h> |
| |
| -#ifdef CONFIG_FAULT_INJECTION |
| extern struct fault_attr fail_gem_alloc; |
| extern struct fault_attr fail_gem_iova; |
| -#else |
| -# define should_fail(attr, size) 0 |
| -#endif |
| |
| struct msm_kms; |
| struct msm_gpu; |
| _ |
