From 6838cc8a10bdec35051127e6a62b8dbf57e79804 Mon Sep 17 00:00:00 2001 From: 0ctobot Date: Mon, 10 Jun 2019 20:18:58 -0400 Subject: [PATCH] drm/atomic: Remove frame boosting entirely [2/2] Subsequent to 447dc35 ("cpu_input_boost: Remove frame boosting entirely [1/2]"), remove the remaining drm elements of our current frame boost implementation. This reverts the following commits: 387a53a ("drm/atomic: Don't boost DDR bus indiscriminately on frame commit") 88f4923 ("drm/atomic: Disable DRM_FRAME_BOOST_TIMEOUT by default") 8e552bb ("drm/atomic: Add a configurable timeout for frame commit boosts") 7bf6cc8 ("drm/atomic: Boost CPU and DDR bus when committing a new frame") Signed-off-by: Adam W. Willis --- drivers/gpu/drm/Kconfig | 9 --------- drivers/gpu/drm/drm_atomic.c | 16 ---------------- 2 files changed, 25 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 68426c51715b..2f936a76e440 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -302,12 +302,3 @@ config DRM_SAVAGE chipset. If M is selected the module will be called savage. endif # DRM_LEGACY - -config DRM_FRAME_BOOST_TIMEOUT - int "Post-input frame boost timeout" - depends on CPU_INPUT_BOOST - default "0" - help - The timeout in milliseconds during which we boost the CPU and DDR bus - when a new frame is committed to a DRM display, counting from when the - last input event was received. diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 004886f49fe9..df6c5162340e 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -31,13 +31,9 @@ #include #include #include -#include #include "drm_crtc_internal.h" -static int frame_boost_timeout __read_mostly = CONFIG_DRM_FRAME_BOOST_TIMEOUT; -module_param(frame_boost_timeout, int, 0644); - static void crtc_commit_free(struct kref *kref) { struct drm_crtc_commit *commit = @@ -1865,15 +1861,6 @@ static void complete_crtc_signaling(struct drm_device *dev, kfree(fence_state); } -static void drm_kick_frame_boost(int timeout_ms) -{ - if (!timeout_ms) - return; - - if (timeout_ms < 0 || should_kick_frame_boost(timeout_ms)) - cpu_input_boost_kick(); -} - int drm_mode_atomic_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { @@ -1917,9 +1904,6 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, (arg->flags & DRM_MODE_PAGE_FLIP_EVENT)) return -EINVAL; - if (!(arg->flags & DRM_MODE_ATOMIC_TEST_ONLY)) - drm_kick_frame_boost(frame_boost_timeout); - drm_modeset_acquire_init(&ctx, 0); state = drm_atomic_state_alloc(dev);