Skip to content

Commit 716c3cf

Browse files
committed
drm/i915/display: Remove dead code around intel_atomic_helper->free_list
After switching to directly using dma_fence instead of i915_sw_fence we have left some dead code around intel_atomic_helper->free_list. Remove that dead code. v2: Remove intel_atomic_state->freed as well Signed-off-by: Jouni Högander <jouni.hogander@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231114134141.2527694-1-jouni.hogander@intel.com
1 parent 5f23cea commit 716c3cf

File tree

4 files changed

+0
-35
lines changed

4 files changed

+0
-35
lines changed

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6974,24 +6974,6 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)
69746974
drm_WARN_ON(&dev_priv->drm, update_pipes);
69756975
}
69766976

6977-
static void intel_atomic_helper_free_state(struct drm_i915_private *dev_priv)
6978-
{
6979-
struct intel_atomic_state *state, *next;
6980-
struct llist_node *freed;
6981-
6982-
freed = llist_del_all(&dev_priv->display.atomic_helper.free_list);
6983-
llist_for_each_entry_safe(state, next, freed, freed)
6984-
drm_atomic_state_put(&state->base);
6985-
}
6986-
6987-
void intel_atomic_helper_free_state_worker(struct work_struct *work)
6988-
{
6989-
struct drm_i915_private *dev_priv =
6990-
container_of(work, typeof(*dev_priv), display.atomic_helper.free_work);
6991-
6992-
intel_atomic_helper_free_state(dev_priv);
6993-
}
6994-
69956977
static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_state)
69966978
{
69976979
struct drm_i915_private *i915 = to_i915(intel_state->base.dev);
@@ -7027,8 +7009,6 @@ static void intel_atomic_cleanup_work(struct work_struct *work)
70277009
drm_atomic_helper_cleanup_planes(&i915->drm, &state->base);
70287010
drm_atomic_helper_commit_cleanup_done(&state->base);
70297011
drm_atomic_state_put(&state->base);
7030-
7031-
intel_atomic_helper_free_state(i915);
70327012
}
70337013

70347014
static void intel_atomic_prepare_plane_clear_colors(struct intel_atomic_state *state)

drivers/gpu/drm/i915/display/intel_display_core.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,6 @@ struct intel_display {
295295
const struct intel_audio_funcs *audio;
296296
} funcs;
297297

298-
/* Grouping using anonymous structs. Keep sorted. */
299-
struct intel_atomic_helper {
300-
struct llist_head free_list;
301-
struct work_struct free_work;
302-
} atomic_helper;
303-
304298
struct {
305299
/* backlight registers and fields in struct intel_panel */
306300
struct mutex lock;

drivers/gpu/drm/i915/display/intel_display_driver.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,6 @@ int intel_display_driver_probe_noirq(struct drm_i915_private *i915)
259259
if (ret)
260260
goto cleanup_vga_client_pw_domain_dmc;
261261

262-
init_llist_head(&i915->display.atomic_helper.free_list);
263-
INIT_WORK(&i915->display.atomic_helper.free_work,
264-
intel_atomic_helper_free_state_worker);
265-
266262
intel_init_quirks(i915);
267263

268264
intel_fbc_init(i915);
@@ -430,9 +426,6 @@ void intel_display_driver_remove(struct drm_i915_private *i915)
430426
flush_workqueue(i915->display.wq.flip);
431427
flush_workqueue(i915->display.wq.modeset);
432428

433-
flush_work(&i915->display.atomic_helper.free_work);
434-
drm_WARN_ON(&i915->drm, !llist_empty(&i915->display.atomic_helper.free_list));
435-
436429
/*
437430
* MST topology needs to be suspended so we don't have any calls to
438431
* fbdev after it's finalized. MST will be destroyed later as part of

drivers/gpu/drm/i915/display/intel_display_types.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,6 @@ struct intel_atomic_state {
684684
bool skip_intermediate_wm;
685685

686686
bool rps_interactive;
687-
688-
struct llist_node freed;
689687
};
690688

691689
struct intel_plane_state {

0 commit comments

Comments
 (0)