diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index fb97b51b38f153904b1eecbbd1f38c8f96578225..dd5caa8030aa3ed6c226e8bc356cad77da788f92 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -3017,7 +3017,7 @@ int drm_atomic_helper_swap_state(struct drm_atomic_state *state,
 				  bool stall)
 {
 	int i, ret;
-	unsigned long flags;
+	unsigned long __maybe_unused flags;
 	struct drm_connector *connector;
 	struct drm_connector_state *old_conn_state, *new_conn_state;
 	struct drm_crtc *crtc;
diff --git a/include/drm/drm_panic.h b/include/drm/drm_panic.h
index 822dbb1aa9d6f12f1ddc03334cb6e5afc6ce3288..9cd4239f092867018ce0133ed28f498f04de0cbe 100644
--- a/include/drm/drm_panic.h
+++ b/include/drm/drm_panic.h
@@ -52,6 +52,8 @@ struct drm_scanout_buffer {
 	unsigned int pitch[DRM_FORMAT_MAX_PLANES];
 };
 
+#ifdef CONFIG_DRM_PANIC
+
 /**
  * drm_panic_trylock - try to enter the panic printing critical section
  * @dev: struct drm_device
@@ -137,13 +139,15 @@ struct drm_scanout_buffer {
 #define drm_panic_unlock(dev, flags) \
 	raw_spin_unlock_irqrestore(&(dev)->mode_config.panic_lock, flags)
 
-#ifdef CONFIG_DRM_PANIC
-
 void drm_panic_register(struct drm_device *dev);
 void drm_panic_unregister(struct drm_device *dev);
 
 #else
 
+#define drm_panic_trylock(dev, flags) (true)
+#define drm_panic_lock(dev, flags)
+#define drm_panic_unlock(dev, flags)
+
 static inline void drm_panic_register(struct drm_device *dev) {}
 static inline void drm_panic_unregister(struct drm_device *dev) {}