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 C080DC433F5 for ; Thu, 9 Dec 2021 17:55:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BA5010E1D7; Thu, 9 Dec 2021 17:55:28 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7515210E1D7 for ; Thu, 9 Dec 2021 17:55:27 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10193"; a="238109922" X-IronPort-AV: E=Sophos;i="5.88,193,1635231600"; d="scan'208";a="238109922" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 09:55:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,193,1635231600"; d="scan'208";a="480428433" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga002.jf.intel.com with SMTP; 09 Dec 2021 09:55:24 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 09 Dec 2021 19:55:24 +0200 Date: Thu, 9 Dec 2021 19:55:24 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Message-ID: References: <5f410f0fa5fe469895c1bfbe68aa92511053d5fa.1639068649.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5f410f0fa5fe469895c1bfbe68aa92511053d5fa.1639068649.git.jani.nikula@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915/cdclk: turn around i915_drv.h and intel_cdclk.h dependency 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: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Dec 09, 2021 at 06:51:25PM +0200, Jani Nikula wrote: > intel_cdclk.h only needs i915_drv.h for struct intel_cdclk_config. Move > the definition to intel_cdclk.h and turn the includes around to avoid > including i915_drv.h from other headers. > > Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_atomic.c | 1 + > drivers/gpu/drm/i915/display/intel_cdclk.h | 6 +++++- > drivers/gpu/drm/i915/i915_drv.h | 6 +----- > 3 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c > index b4e7ac51aa31..ff17bec7a67d 100644 > --- a/drivers/gpu/drm/i915/display/intel_atomic.c > +++ b/drivers/gpu/drm/i915/display/intel_atomic.c > @@ -34,6 +34,7 @@ > #include > #include > > +#include "i915_drv.h" > #include "intel_atomic.h" > #include "intel_cdclk.h" > #include "intel_display_types.h" > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.h b/drivers/gpu/drm/i915/display/intel_cdclk.h > index 50b93226517e..e11db06a81c2 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.h > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.h > @@ -8,7 +8,6 @@ > > #include > > -#include "i915_drv.h" > #include "intel_display.h" > #include "intel_global_state.h" > > @@ -16,6 +15,11 @@ struct drm_i915_private; > struct intel_atomic_state; > struct intel_crtc_state; > > +struct intel_cdclk_config { > + unsigned int cdclk, vco, ref, bypass; > + u8 voltage_level; > +}; > + > struct intel_cdclk_state { > struct intel_global_state base; > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index e36aea6453c2..a198f7e075d9 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -65,6 +65,7 @@ > #include "i915_utils.h" > > #include "display/intel_bios.h" > +#include "display/intel_cdclk.h" > #include "display/intel_display.h" > #include "display/intel_display_power.h" > #include "display/intel_dmc.h" > @@ -625,11 +626,6 @@ struct i915_virtual_gpu { > u32 caps; > }; > > -struct intel_cdclk_config { > - unsigned int cdclk, vco, ref, bypass; > - u8 voltage_level; > -}; > - > struct i915_selftest_stash { > atomic_t counter; > struct ida mock_region_instances; > -- > 2.30.2 -- Ville Syrjälä Intel