From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E13E3C4332F for ; Fri, 10 Nov 2023 12:13:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4300610E9A0; Fri, 10 Nov 2023 12:13:59 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id E7E4C10E9A0 for ; Fri, 10 Nov 2023 12:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699618436; x=1731154436; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=itl2vqKSH7poGLSBuFu4ejgpjVAlxjSsH72JbeOPnKk=; b=mqNjA8SZgS8F/ZJ72E9w/tPftyhGycRnESfMZdhk0V1SpNsUnx15TtaN vx3/ozysIbnvZlitkghtQvDeN9JUDobkbYZ2NxVjEjwpmRmqFquV9lqlk 2tc7eNH1TWcp/n12lOPFrPibUElEVD71cllYEDROKhMwaLu2ZZZZbdVxU yoP+C3fStDHGB8Tl1hxxnxEYXETirPHsmBWt1aA6FGx2eYoPlZ4EymB/x CMoFYDP664Bis24L57sWXaULj3L0tkhs2iR8Ab9Q+BhVKW8WHtZbq/l+h v4gbRTvpimugzUTOZOur0srsoKE/cDEj8TnQrUHnYW41lPYt+ed+5uECK w==; X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="454477017" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="454477017" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 04:13:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10889"; a="763744639" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="763744639" Received: from ruehl-mobl.ger.corp.intel.com (HELO localhost) ([10.252.53.12]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 04:13:54 -0800 From: Jani Nikula To: Jouni =?utf-8?Q?H=C3=B6gander?= , intel-gfx@lists.freedesktop.org In-Reply-To: <20231110082455.3061913-1-jouni.hogander@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20231110082455.3061913-1-jouni.hogander@intel.com> Date: Fri, 10 Nov 2023 14:13:52 +0200 Message-ID: <87edgxx0u7.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Remove dead code around intel_atomic_helper->free_list X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, 10 Nov 2023, Jouni H=C3=B6gander wrote: > 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 th= at > dead code. Yay, Reviewed-by: Jani Nikula > > Signed-off-by: Jouni H=C3=B6gander > --- > drivers/gpu/drm/i915/display/intel_display.c | 20 ------------------- > .../gpu/drm/i915/display/intel_display_core.h | 6 ------ > .../drm/i915/display/intel_display_driver.c | 7 ------- > 3 files changed, 33 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 3effafcbb411..387acf21b794 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -7086,24 +7086,6 @@ static void skl_commit_modeset_enables(struct inte= l_atomic_state *state) > drm_WARN_ON(&dev_priv->drm, update_pipes); > } >=20=20 > -static void intel_atomic_helper_free_state(struct drm_i915_private *dev_= priv) > -{ > - struct intel_atomic_state *state, *next; > - struct llist_node *freed; > - > - freed =3D llist_del_all(&dev_priv->display.atomic_helper.free_list); > - llist_for_each_entry_safe(state, next, freed, freed) > - drm_atomic_state_put(&state->base); > -} > - > -void intel_atomic_helper_free_state_worker(struct work_struct *work) > -{ > - struct drm_i915_private *dev_priv =3D > - container_of(work, typeof(*dev_priv), display.atomic_helper.free_work); > - > - intel_atomic_helper_free_state(dev_priv); > -} > - > static void intel_atomic_commit_fence_wait(struct intel_atomic_state *in= tel_state) > { > struct drm_i915_private *i915 =3D to_i915(intel_state->base.dev); > @@ -7139,8 +7121,6 @@ static void intel_atomic_cleanup_work(struct work_s= truct *work) > drm_atomic_helper_cleanup_planes(&i915->drm, &state->base); > drm_atomic_helper_commit_cleanup_done(&state->base); > drm_atomic_state_put(&state->base); > - > - intel_atomic_helper_free_state(i915); > } >=20=20 > static void intel_atomic_prepare_plane_clear_colors(struct intel_atomic_= state *state) > diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/= gpu/drm/i915/display/intel_display_core.h > index aa8be02c9e54..34945f733a97 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_core.h > +++ b/drivers/gpu/drm/i915/display/intel_display_core.h > @@ -298,12 +298,6 @@ struct intel_display { > const struct intel_audio_funcs *audio; > } funcs; >=20=20 > - /* Grouping using anonymous structs. Keep sorted. */ > - struct intel_atomic_helper { > - struct llist_head free_list; > - struct work_struct free_work; > - } atomic_helper; > - > struct { > /* backlight registers and fields in struct intel_panel */ > struct mutex lock; > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/driver= s/gpu/drm/i915/display/intel_display_driver.c > index 62f7b10484be..9df9097a0255 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c > @@ -259,10 +259,6 @@ int intel_display_driver_probe_noirq(struct drm_i915= _private *i915) > if (ret) > goto cleanup_vga_client_pw_domain_dmc; >=20=20 > - init_llist_head(&i915->display.atomic_helper.free_list); > - INIT_WORK(&i915->display.atomic_helper.free_work, > - intel_atomic_helper_free_state_worker); > - > intel_init_quirks(i915); >=20=20 > intel_fbc_init(i915); > @@ -430,9 +426,6 @@ void intel_display_driver_remove(struct drm_i915_priv= ate *i915) > flush_workqueue(i915->display.wq.flip); > flush_workqueue(i915->display.wq.modeset); >=20=20 > - flush_work(&i915->display.atomic_helper.free_work); > - drm_WARN_ON(&i915->drm, !llist_empty(&i915->display.atomic_helper.free_= list)); > - > /* > * MST topology needs to be suspended so we don't have any calls to > * fbdev after it's finalized. MST will be destroyed later as part of --=20 Jani Nikula, Intel