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 DA7CCC021A0 for ; Thu, 13 Feb 2025 19:13:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76AC110EB7F; Thu, 13 Feb 2025 19:13:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ofu8LdgF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 591A210EB7F for ; Thu, 13 Feb 2025 19:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739473985; x=1771009985; h=from:to:subject:in-reply-to:references:date:message-id: mime-version:content-transfer-encoding; bh=U2nTmqXTt4M4ILQjmuKZ+ZztKKcf720ZlFs/sL8XMSY=; b=Ofu8LdgF2ak5YxilLi+i+AJkiAUZZRartBShnozFUTti17dYUmhqZr/V CT9AFu2sEnwqGmcoQr4SJnlm0Q6+ZN/DsXhjGyfgMaon3PEfH3QO1zABr 8Ro6FN1mV36YBg+PGprlm+jSUNPdYNSIijQ1QcPWkpNWK5fEwBuGy3Ajj fTrR9e0FtLhJkw+3iMmG7/xCcb4p0Gi70v85B2yAfipjPuGCU6aPwgNYw FkeeilcOzU9otiwNrZlsVT39du83QG1S8q9YwEeE/Ri60WWCJrActo8hn el8UgnU1BEvg4l2Nfob5TkTCxdwBz3TVWDOPk6S5Mp7qS27w/brD95MOF w==; X-CSE-ConnectionGUID: E+0u1a2BTsS4U2V7Nnpzuw== X-CSE-MsgGUID: uWhNCfR/SGq4wpopqqPaww== X-IronPort-AV: E=McAfee;i="6700,10204,11344"; a="50845269" X-IronPort-AV: E=Sophos;i="6.13,282,1732608000"; d="scan'208";a="50845269" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2025 11:13:05 -0800 X-CSE-ConnectionGUID: sKOy9nDZQoaLsHx4NoMpWA== X-CSE-MsgGUID: uA7xX9C6Qri7RqXvgnCAhQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="136466829" Received: from slindbla-desk.ger.corp.intel.com (HELO localhost) ([10.245.246.30]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2025 11:13:03 -0800 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org Subject: Re: [PATCH 03/12] drm/i915: Extract intel_connector_cancel_modeset_retry_work() In-Reply-To: <20250213150220.13580-4-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250213150220.13580-1-ville.syrjala@linux.intel.com> <20250213150220.13580-4-ville.syrjala@linux.intel.com> Date: Thu, 13 Feb 2025 21:13:00 +0200 Message-ID: <87bjv5y7yb.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Thu, 13 Feb 2025, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > Hide the implementation details of the modeset retry work > better. > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > --- > drivers/gpu/drm/i915/display/intel_connector.c | 6 ++++++ > drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu= /drm/i915/display/intel_connector.c > index b1240be2ec6d..358965fc7f55 100644 > --- a/drivers/gpu/drm/i915/display/intel_connector.c > +++ b/drivers/gpu/drm/i915/display/intel_connector.c > @@ -70,6 +70,12 @@ void intel_connector_queue_modeset_retry_work(struct i= ntel_connector *connector) > drm_connector_put(&connector->base); > } >=20=20 > +void intel_connector_cancel_modeset_retry_work(struct intel_connector *c= onnector) > +{ > + if (cancel_work_sync(&connector->modeset_retry_work)) > + drm_connector_put(&connector->base); > +} > + > int intel_connector_init(struct intel_connector *connector) > { > struct intel_digital_connector_state *conn_state; > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 858886eea6cc..93392752b470 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -62,6 +62,7 @@ > #include "intel_bw.h" > #include "intel_cdclk.h" > #include "intel_clock_gating.h" > +#include "intel_connector.h" > #include "intel_color.h" Nitpick, not alphabetical order. > #include "intel_crt.h" > #include "intel_crtc.h" > @@ -8787,8 +8788,7 @@ void intel_hpd_poll_fini(struct drm_i915_private *i= 915) > /* Kill all the work that may have been queued by hpd. */ > drm_connector_list_iter_begin(&i915->drm, &conn_iter); > for_each_intel_connector_iter(connector, &conn_iter) { > - if (cancel_work_sync(&connector->modeset_retry_work)) > - drm_connector_put(&connector->base); > + intel_connector_cancel_modeset_retry_work(connector); > if (connector->hdcp.shim) { > cancel_delayed_work_sync(&connector->hdcp.check_work); > cancel_work_sync(&connector->hdcp.prop_work); --=20 Jani Nikula, Intel