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 266B4C27C4F for ; Tue, 18 Jun 2024 13:48:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D885310E0AC; Tue, 18 Jun 2024 13:48:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XoEFP4dR"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 716EE10E64A; Tue, 18 Jun 2024 13:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718718520; x=1750254520; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=PcmEsCra+fRrwvS2ytu4h4Yi2HOj+4DEv1ridBbbIaM=; b=XoEFP4dRH0qLphFT8fGCfK7vW06KNEmmtEEyaGbK5EmajbM1sHFOx4NF 8DzwbO1+WvPnFgJWqCYa52SjdPUfdWcOektm0/D7magANBPfP4dkgfJyR kIQkBdQ//eOiMYfQ8i3KiWOULYvfux7Ig7lRiM4lSdfNSAeMR5ppwRqTV yoyM60CYsGUF97rnUNY3OkIGtFigCVJAReqaEdh89veyelsq7AqLNicZc u2I1pncEHmo3OnJtjCdJg5o9moVrNv79nfKWkStTsfyRYYQ30lud7dtmf dUrMCW+NfujiTk9tvvhuOQ3X7fjasSQvkrplYboLyMHyvpD613tbThL/Z A==; X-CSE-ConnectionGUID: f38o/m8IRbWcThl8Cia1fA== X-CSE-MsgGUID: M8BTlXtKQO+OpC7Le/CIvA== X-IronPort-AV: E=McAfee;i="6700,10204,11107"; a="41005538" X-IronPort-AV: E=Sophos;i="6.08,247,1712646000"; d="scan'208";a="41005538" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2024 06:48:39 -0700 X-CSE-ConnectionGUID: r6wO0ssQTYKc+sdknIhatg== X-CSE-MsgGUID: 3Ng4Z9q6SyKBdd18jGJKrQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,247,1712646000"; d="scan'208";a="42034826" Received: from bergbenj-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.176]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2024 06:48:37 -0700 From: Jani Nikula To: Imre Deak , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Rodrigo Vivi Subject: Re: [PATCH v2 2/3] drm/i915: Pass intel_display to the encoder suspend/shutdown helpers In-Reply-To: <20240618125255.4080303-2-imre.deak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20240618125255.4080303-1-imre.deak@intel.com> <20240618125255.4080303-2-imre.deak@intel.com> Date: Tue, 18 Jun 2024 16:48:33 +0300 Message-ID: <87wmmmfjke.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Tue, 18 Jun 2024, Imre Deak wrote: > Pass intel_display to the encoder suspend/shutdown helpers instead of > drm_i915_private for better isolation. > > v2: Pass intel_display to HAS_DISPLAY() as well, update commit log > accordingly. (Jani) > > Cc: Jani Nikula > Reviewed-by: Rodrigo Vivi # v1 > Signed-off-by: Imre Deak Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_encoder.c | 24 ++++++++++---------- > drivers/gpu/drm/i915/display/intel_encoder.h | 6 ++--- > drivers/gpu/drm/i915/i915_driver.c | 6 ++--- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.c b/drivers/gpu/drm/i915/display/intel_encoder.c > index 8a1dccb893a37..21d6385354972 100644 > --- a/drivers/gpu/drm/i915/display/intel_encoder.c > +++ b/drivers/gpu/drm/i915/display/intel_encoder.c > @@ -38,46 +38,46 @@ void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int dela > &encoder->link_check_work, msecs_to_jiffies(delay_ms)); > } > > -void intel_encoder_suspend_all(struct drm_i915_private *i915) > +void intel_encoder_suspend_all(struct intel_display *display) > { > struct intel_encoder *encoder; > > - if (!HAS_DISPLAY(i915)) > + if (!HAS_DISPLAY(display)) > return; > > /* > * TODO: check and remove holding the modeset locks if none of > * the encoders depends on this. > */ > - drm_modeset_lock_all(&i915->drm); > - for_each_intel_encoder(&i915->drm, encoder) > + drm_modeset_lock_all(display->drm); > + for_each_intel_encoder(display->drm, encoder) > if (encoder->suspend) > encoder->suspend(encoder); > - drm_modeset_unlock_all(&i915->drm); > + drm_modeset_unlock_all(display->drm); > > - for_each_intel_encoder(&i915->drm, encoder) > + for_each_intel_encoder(display->drm, encoder) > if (encoder->suspend_complete) > encoder->suspend_complete(encoder); > } > > -void intel_encoder_shutdown_all(struct drm_i915_private *i915) > +void intel_encoder_shutdown_all(struct intel_display *display) > { > struct intel_encoder *encoder; > > - if (!HAS_DISPLAY(i915)) > + if (!HAS_DISPLAY(display)) > return; > > /* > * TODO: check and remove holding the modeset locks if none of > * the encoders depends on this. > */ > - drm_modeset_lock_all(&i915->drm); > - for_each_intel_encoder(&i915->drm, encoder) > + drm_modeset_lock_all(display->drm); > + for_each_intel_encoder(display->drm, encoder) > if (encoder->shutdown) > encoder->shutdown(encoder); > - drm_modeset_unlock_all(&i915->drm); > + drm_modeset_unlock_all(display->drm); > > - for_each_intel_encoder(&i915->drm, encoder) > + for_each_intel_encoder(display->drm, encoder) > if (encoder->shutdown_complete) > encoder->shutdown_complete(encoder); > } > diff --git a/drivers/gpu/drm/i915/display/intel_encoder.h b/drivers/gpu/drm/i915/display/intel_encoder.h > index 04cfc0a721993..3fa5589f0b1ce 100644 > --- a/drivers/gpu/drm/i915/display/intel_encoder.h > +++ b/drivers/gpu/drm/i915/display/intel_encoder.h > @@ -6,7 +6,7 @@ > #ifndef __INTEL_ENCODER_H__ > #define __INTEL_ENCODER_H__ > > -struct drm_i915_private; > +struct intel_display; > struct intel_encoder; > > void intel_encoder_link_check_init(struct intel_encoder *encoder, > @@ -14,7 +14,7 @@ void intel_encoder_link_check_init(struct intel_encoder *encoder, > void intel_encoder_link_check_queue_work(struct intel_encoder *encoder, int delay_ms); > void intel_encoder_link_check_flush_work(struct intel_encoder *encoder); > > -void intel_encoder_suspend_all(struct drm_i915_private *i915); > -void intel_encoder_shutdown_all(struct drm_i915_private *i915); > +void intel_encoder_suspend_all(struct intel_display *display); > +void intel_encoder_shutdown_all(struct intel_display *display); > > #endif /* __INTEL_ENCODER_H__ */ > diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c > index e9e38ed246f66..fb8e9c2fcea53 100644 > --- a/drivers/gpu/drm/i915/i915_driver.c > +++ b/drivers/gpu/drm/i915/i915_driver.c > @@ -956,8 +956,8 @@ void i915_driver_shutdown(struct drm_i915_private *i915) > if (HAS_DISPLAY(i915)) > intel_display_driver_suspend_access(i915); > > - intel_encoder_suspend_all(i915); > - intel_encoder_shutdown_all(i915); > + intel_encoder_suspend_all(&i915->display); > + intel_encoder_shutdown_all(&i915->display); > > intel_dmc_suspend(i915); > > @@ -1040,7 +1040,7 @@ static int i915_drm_suspend(struct drm_device *dev) > if (HAS_DISPLAY(dev_priv)) > intel_display_driver_suspend_access(dev_priv); > > - intel_encoder_suspend_all(dev_priv); > + intel_encoder_suspend_all(&dev_priv->display); > > /* Must be called before GGTT is suspended. */ > intel_dpt_suspend(dev_priv); -- Jani Nikula, Intel