Skip to contentSkip to conversation

drm-msm-clean-up-fault-injection-usage.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Sep 2, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: drm/msm: clean up fault injection usage
has been removed from the -mm tree. Its filename was
drm-msm-clean-up-fault-injection-usage.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Jani Nikula <[email protected]>
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.

---

 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(-)
drivers/gpu/drm/msm/msm_debugfs.c renamed from drivers/gpu/drm/msm/msm_debugfs.c~drm-msm-clean-up-fault-injection-usage +0 -2
@@ -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
 
drivers/gpu/drm/msm/msm_drv.c renamed from drivers/gpu/drm/msm/msm_drv.c~drm-msm-clean-up-fault-injection-usage +0 -2
@@ -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)
 {
drivers/gpu/drm/msm/msm_drv.h renamed from drivers/gpu/drm/msm/msm_drv.h~drm-msm-clean-up-fault-injection-usage +0 -4
@@ -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;

_

Patches currently in -mm which might be from [email protected] are