From patchwork Thu Dec 9 13:50:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667383 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 7A716C433FE for ; Thu, 9 Dec 2021 16:59:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BADB710E4C6; Thu, 9 Dec 2021 16:54:11 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8E7D110E11E for ; Thu, 9 Dec 2021 13:51:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057874; x=1670593874; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Aav/9m46kbbXXGgtboaAGZ5fwVgPXX1cj2xxmziqrEM=; b=d7Q3SSAK8nbHtYBTV5z5YmVm8CvkqWBjHxkkcyTQP++kICHcetnwK2a3 39zw8/NwUOwMm+cvx3T7om7zR4FBeW5l3Y7z/3FLl3qWU5hyZEUQmAcVQ xfercQL5vgjXlpJT63khxVMIuzJyzX2hkkEMF50h9h4dUDqoqEm4E27zL pzGbRDQrAbuv4Ox5OZNHBYUySSsxL49LVFiSSIQOAa66XxEYlBpKiHyla /Vb6GPy14ffpXMSk9mrpbvAFezK+9njgJpfz9ZKJrV7330uP8XYkNRkUY kfqNa7xD5QxG3DVoFdt504XJNgaVGVTyYTtjSWXPsEhE+IGojiS9++Z8r Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="238323914" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="238323914" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:13 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="463237989" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:12 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:50:56 +0200 Message-Id: <488179aa90110d979e61104973b255161ec36057.1639057801.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 1/7] drm/i915/reset: remove useless intel_display_types.h include 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Not needed. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/gt/intel_reset.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 63199f0550e6..b8ac454f2d96 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c @@ -6,7 +6,6 @@ #include #include -#include "display/intel_display_types.h" #include "display/intel_overlay.h" #include "gem/i915_gem_context.h" From patchwork Thu Dec 9 13:50:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667373 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 CB563C433EF for ; Thu, 9 Dec 2021 16:59:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A031F10EA94; Thu, 9 Dec 2021 16:54:04 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDDB410E11E for ; Thu, 9 Dec 2021 13:51:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057878; x=1670593878; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LcV+/sZUcFYq9100TY757eo1Z2MXnhlMLNxUIFpVPNM=; b=J0qO0LFAN1WV4/qa1dCmrLeZUCLywGEWdJW35FTWiT/eKVhPzhpGO5Q7 2eOWzLPEApflAeEqOVWSBm1kI4a8r4okqGeCR2l3GvfzDSL9/R480qyRw mK3dGudGE1fAn2ddM/z5don8REOz1vqlsfIYJwmOYELrnatCMeFNl8wer 5T4QZaLkr4FheEMo/vxUfIOPbwec0aQta0MPl3HcwMRwCOPaRqVlEhY8e FmzjPWxT7e2keK6qfHnYqbnRwpnibi//xMNOvkxMPj8100FaK47vsVQs9 RMxVPbbL0R8zAcCU4mcbpO4NlRE7ru9QW9DxgF7DtwND59kyPgeZyu+PG w==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="224965656" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="224965656" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:18 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="680331744" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:16 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:50:57 +0200 Message-Id: <8ffe629646482541d5d30bb0ea6de77f7cf9001d.1639057801.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 2/7] drm/i915/active: remove useless i915_utils.h include 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Not needed. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/i915_active_types.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_active_types.h b/drivers/gpu/drm/i915/i915_active_types.h index c149f348a972..b02a78ac87db 100644 --- a/drivers/gpu/drm/i915/i915_active_types.h +++ b/drivers/gpu/drm/i915/i915_active_types.h @@ -15,8 +15,6 @@ #include #include -#include "i915_utils.h" - struct i915_active_fence { struct dma_fence __rcu *fence; struct dma_fence_cb cb; From patchwork Thu Dec 9 13:50:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667363 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 7B9F3C4167E for ; Thu, 9 Dec 2021 16:58:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EE31F10E9F3; Thu, 9 Dec 2021 16:53:53 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D62510E11E for ; Thu, 9 Dec 2021 13:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057884; x=1670593884; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0Xm3Iu60+gsuOXbEPv2XYI/POJ0csSk32dQojjp8Mw0=; b=PdLZyhKS5aWupqlvvkaNxobOdUEOPQFaDi+dZpU9rdCfV/L8JuN1lVb/ Ru6tW0xugVh6NUYkebm549xRtD68LCeRi+9EdA03EfXIjVbjDwI9oi+qU CJzPIJyRqh7AxN8yoV9L05BF9aiP93d+W8zqVmCmuXyhPWqAHa7P63rPc 8XCqjOMBMlDaEeUpGjWxT10IjNrKqKbXvopqan2N0bnS0Pas4T/AO3MV9 BlpCCvfjtEPi35AErwh7C7Zt0GOW5wUrzzVmPZ69UyELbScFMMmbhAq87 Sabodr00R67bI5XoWZbk/p0gps2kcE6Y70dPZtzcg4JAwSYhlQXAywS9U Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="225365232" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="225365232" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:24 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="612503218" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:22 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:50:58 +0200 Message-Id: <392f82ff54722551063599d06eacb38281748026.1639057801.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 3/7] drm/i915/psr: avoid intel_frontbuffer.h include with declaration 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Reduce include dependencies using forward declarations. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_psr.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h index 3d9c0e13c329..f6526d9ccfdc 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -6,18 +6,19 @@ #ifndef __INTEL_PSR_H__ #define __INTEL_PSR_H__ -#include "intel_frontbuffer.h" +#include +enum fb_op_origin; struct drm_connector; struct drm_connector_state; struct drm_i915_private; +struct intel_atomic_state; +struct intel_crtc; struct intel_crtc_state; struct intel_dp; -struct intel_crtc; -struct intel_atomic_state; -struct intel_plane_state; -struct intel_plane; struct intel_encoder; +struct intel_plane; +struct intel_plane_state; void intel_psr_init_dpcd(struct intel_dp *intel_dp); void intel_psr_pre_plane_update(struct intel_atomic_state *state, From patchwork Thu Dec 9 13:50:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667353 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 950F8C433FE for ; Thu, 9 Dec 2021 16:57:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D8E410E895; Thu, 9 Dec 2021 16:53:36 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2535310E11E for ; Thu, 9 Dec 2021 13:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057889; x=1670593889; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S9UP+I/W8WM8QlKjzdfkw4Cctb9rG1MCSVIYkM8NHUA=; b=mscCLlOKn0Z4oYjjfSj1zpAU+5E12YVgojRvJkPFc+ZBAAE9oW0thOC/ mA89nVUkZD3bJWe2TcxpjfNX0v4tgxCQgbiEuq9oItLMxtTMOx0k4TM9K CrkqOopQPST5R2Uqq50B/YnDSoZ3/mG3FCKV5yjkea5XNr96j+yfmLPHP P2+L/xKCuuygB0zvTQ3bZtvSGFUbi4ljiAGHwS/8JpfTY1Jb1LDkMPbTM U0qIAVTVdjBXN9rccZDa5Dfx6Xue1Bzgay8y+ksoevAolH232gn5UNzgE v7wYP5EiOYP5GQ7UuMxHtA3E4rma5/rBsX5MfvHUt34804cefwIHCp0FS w==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="238323941" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="238323941" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="462134784" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:27 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:50:59 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 4/7] drm/i915/fbc: avoid intel_frontbuffer.h include with declaration 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Reduce include dependencies using forward declarations. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_fbc.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fbc.h b/drivers/gpu/drm/i915/display/intel_fbc.h index b8d9cda85cfc..07ad0411fcc3 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.h +++ b/drivers/gpu/drm/i915/display/intel_fbc.h @@ -8,8 +8,7 @@ #include -#include "intel_frontbuffer.h" - +enum fb_op_origin; struct drm_i915_private; struct intel_atomic_state; struct intel_crtc; From patchwork Thu Dec 9 13:51:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667637 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 BD90FC433EF for ; Thu, 9 Dec 2021 17:02:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0766A10EDDD; Thu, 9 Dec 2021 16:54:56 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id C63E610E11E for ; Thu, 9 Dec 2021 13:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057893; x=1670593893; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4G6w4sA7qGaN+EztHvR1KnkiiDqexosGse0CzeWsc3E=; b=fKm6KJwGBQV+frzRL4+sI/hObiBbh1w+8i0HZu5u6O3mm/LXBnGt0vSB WrEJRzZMrzVynFvNQFTjwKck/uFjpz3eZjRlow8Q1taZr682/Mbl8aS5X HQYa6lze8oEipwJwl7gJdXCkj6Pa3QbeDAJVFwj9KeQ6WLmuafiIP/bYF OPdJmXUu+WCgkEaf49SlZOe4uvycz6Imn27o5L6dapofZnRL/5T+aSgWe KGMsP1WAPgyL3wJ3TRBtIHpXSCVBw/ri0eo02/RDFgoC6V2IsFx/WKyh6 Qw644N4n7GXxIUqmOkNRPL+aDO61jsCtruvidN/Op/dbf9TGCduSBO/2d A==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="324359751" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="324359751" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:33 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="480341392" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:31 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:51:00 +0200 Message-Id: <04f0ac36d56e3c1221c3c171c36d7617bb00c7c2.1639057801.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 5/7] drm/i915/fb: reduce include dependencies 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" We actually need i915_active_types.h, not i915_active.h. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_frontbuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h index a88441edc8f9..ff0c37b079aa 100644 --- a/drivers/gpu/drm/i915/display/intel_frontbuffer.h +++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.h @@ -28,7 +28,7 @@ #include #include "gem/i915_gem_object_types.h" -#include "i915_active.h" +#include "i915_active_types.h" struct drm_i915_private; From patchwork Thu Dec 9 13:51:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667391 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 A15FDC433F5 for ; Thu, 9 Dec 2021 17:00:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D52C710E594; Thu, 9 Dec 2021 16:54:20 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B5A710E11E for ; Thu, 9 Dec 2021 13:51:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057898; x=1670593898; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uIb31tU10Z7ejnMCVZdEQvc+FspX+OKZwgg2SDjiBEg=; b=k/RIjrMtrh2YFI5D2x7sy29vuBb5PQmHbd2Ae2uM8pYizIyD798h+i7Z NfZ/h3HJgLHsALgjQ3Uqakrk8c4kLqqrw32PgQ6srX2BGxVE0Lyx3a5z1 dm0JMzjv73y4Nrw6fxBhFGHxJUd/I32RMP2g59Dqr2aomRjYz4K59SpPO fbonAj8m7VTNu0LUYt0MnNSiwlrMWsImw1sLV9rgN8VmULTHPZh2RTBKR XDqXjiYZE7xnRJw9S8Jvfn5B9NTQSHmP/qvU4VXyRWzqWo+L+srva/ogb gTcf9rcSWM6FFN41edkn0gAm2apLhsXy6U3/C9xczpdZcxsmk/atqtNTP Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="224965694" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="224965694" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:37 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="543599125" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:36 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:51:01 +0200 Message-Id: <9d063d12963b995a5db90e05317f40907234956f.1639057801.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 6/7] drm/i915/pxp: un-inline intel_pxp_is_enabled() 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" In the interest of reducing include dependencies, un-inline intel_pxp_is_enabled(). Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/pxp/intel_pxp.c | 5 +++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c index e2314ad9546d..15311eaed848 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c @@ -44,6 +44,11 @@ struct intel_gt *pxp_to_gt(const struct intel_pxp *pxp) return container_of(pxp, struct intel_gt, pxp); } +bool intel_pxp_is_enabled(const struct intel_pxp *pxp) +{ + return pxp->ce; +} + bool intel_pxp_is_active(const struct intel_pxp *pxp) { return pxp->arb_is_valid; diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.h b/drivers/gpu/drm/i915/pxp/intel_pxp.h index aa262258d4d4..f9999ca8a6f1 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp.h +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.h @@ -6,17 +6,14 @@ #ifndef __INTEL_PXP_H__ #define __INTEL_PXP_H__ -#include "intel_pxp_types.h" +#include +struct intel_pxp; struct drm_i915_gem_object; -static inline bool intel_pxp_is_enabled(const struct intel_pxp *pxp) -{ - return pxp->ce; -} - #ifdef CONFIG_DRM_I915_PXP struct intel_gt *pxp_to_gt(const struct intel_pxp *pxp); +bool intel_pxp_is_enabled(const struct intel_pxp *pxp); bool intel_pxp_is_active(const struct intel_pxp *pxp); void intel_pxp_init(struct intel_pxp *pxp); @@ -48,6 +45,11 @@ static inline int intel_pxp_start(struct intel_pxp *pxp) return -ENODEV; } +static inline bool intel_pxp_is_enabled(const struct intel_pxp *pxp) +{ + return false; +} + static inline bool intel_pxp_is_active(const struct intel_pxp *pxp) { return false; From patchwork Thu Dec 9 13:51:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12667355 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 6007AC433FE for ; Thu, 9 Dec 2021 16:57:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 552B210E8C1; Thu, 9 Dec 2021 16:53:38 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5FB5210E11E for ; Thu, 9 Dec 2021 13:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639057902; x=1670593902; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cRsq+ZsoY/0V9GnI1n/f9hfANqwUcDccv0p9+0INBSA=; b=jZtcnkZOf++/vThdUMkLaAxffbYV0bncbSPtPmRMfCXzmQ8oRLQDQCh5 b9Rcc9jHfGziBt2szPUmio3yjx60L9I4gs4Q8DLfEDkNyf7PKj4cZ7+oQ iZvmcEU0ukr3YM2gIZeGM0ZNq9Kp33TXk3xI+3UeGHtqlPD/hj2qbXDzK /EcQXf7h7lVvdU5Hx2MvK3ccNY6yk2SYmw8bb+7+SA/frj+1PX2Yzzocy Uucmxowky13MZpKFEzF7O+Ak6pIHBnJMjlkk3xAg3q76DpCam9qNuWIN0 LQIhQsyeMonjwuMcT8+smKcOaQKwnf3kqXr0zkuMnKJ+U6R5Wk4dho58m w==; X-IronPort-AV: E=McAfee;i="6200,9189,10192"; a="225365272" X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="225365272" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:41 -0800 X-IronPort-AV: E=Sophos;i="5.88,192,1635231600"; d="scan'208";a="601556459" Received: from cwilso3-mobl.fi.intel.com (HELO localhost) ([10.252.19.112]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Dec 2021 05:51:40 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Dec 2021 15:51:02 +0200 Message-Id: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 7/7] drm/i915/pxp: remove useless includes 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: jani.nikula@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Not needed. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_types.h b/drivers/gpu/drm/i915/pxp/intel_pxp_types.h index 73ef7d1754e1..7ce5f37ee12e 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_types.h +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_types.h @@ -7,9 +7,7 @@ #define __INTEL_PXP_TYPES_H__ #include -#include #include -#include #include #include