From patchwork Thu May 30 13:19:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680387 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 4B4D3C27C50 for ; Thu, 30 May 2024 13:19:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B7F510F59F; Thu, 30 May 2024 13:19:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MmMZ8kwK"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3390B10F16D; Thu, 30 May 2024 13:19:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075163; x=1748611163; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=p06VUY4KWhUjAgNP0/HLknNnN295aRhmM4BDAeAbnBI=; b=MmMZ8kwKOk9/RopQ+Ql9nu/HxNS+yUddb+SIpnUOWUbOCsxrovWyiYU+ MKlic08zcPRGkKjethBfvDJBD9tM7ZTzvadwdLMljnSsSoGaednFPqp7Q QBxtYTVyk18SDDa5ZUQFoTFGBSc04qsV5IJQXmzApgEfF2Rm4vbIGUq2G gUIqk0GpIJVN/o5LHC/ZMLmiwZOxkdK8wQVbMJNGduHeURo+QvQPM/zJD axlrMUvgTpsdlSg8tXiHQNKYvcbnUUO3idSnK9gIFTkV1FzZ802j5gkl6 4tuCXBvInzG8HZEow50d58ZiIUGaZTS8wS+8Mx0+h6me0S9wtA8UHkG1G A==; X-CSE-ConnectionGUID: vG1U2dQwR+mq3XEaZUCPtw== X-CSE-MsgGUID: tR8Hr0WLSh+NgZYFJVt6Og== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24168120" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24168120" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:23 -0700 X-CSE-ConnectionGUID: 66ks9SaXQwKdeC7zKdN9uw== X-CSE-MsgGUID: jXoVqjVIQ5+sgZmBo8EZWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="66671532" Received: from unknown (HELO localhost) ([10.237.66.160]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:19 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Andi Shyti , Rodrigo Vivi Subject: [PATCH v2 01/10] drm: move intel-gtt.h under include/drm/intel Date: Thu, 30 May 2024 16:19:02 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Reviewed-by: Andi Shyti Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- drivers/char/agp/intel-agp.c | 2 +- drivers/char/agp/intel-gtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- include/drm/{ => intel}/intel-gtt.h | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename include/drm/{ => intel}/intel-gtt.h (100%) diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index c518b3a9db04..eec80db6402d 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -12,7 +12,7 @@ #include #include "agp.h" #include "intel-agp.h" -#include +#include static int intel_fetch_size(void) { diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index bf6716ff863b..11f5cf853c46 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -25,7 +25,7 @@ #include #include "agp.h" #include "intel-agp.h" -#include +#include #include /* diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 0d0a0dc9f610..2717699c6591 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "display/intel_display.h" #include "gem/i915_gem_lmem.h" diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c b/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c index 866c416afb73..59eed0a0ce90 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c @@ -5,7 +5,7 @@ #include "intel_ggtt_gmch.h" -#include +#include #include diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index 626b166e67ef..a6c69a706fd7 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include "gem/i915_gem_internal.h" #include "gem/i915_gem_lmem.h" diff --git a/include/drm/intel-gtt.h b/include/drm/intel/intel-gtt.h similarity index 100% rename from include/drm/intel-gtt.h rename to include/drm/intel/intel-gtt.h From patchwork Thu May 30 13:19:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680388 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 B31DFC25B74 for ; Thu, 30 May 2024 13:19:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C82210EFFF; Thu, 30 May 2024 13:19:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="FQBuMBI/"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6AC110F16D; Thu, 30 May 2024 13:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075170; x=1748611170; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IPpeaZDywOPbcdMo33H0ltYKp2nT4PZVGvtM2N/x7vA=; b=FQBuMBI/vxKastojXEMZlY8qEl142bSUjgqCGiTx+6F3aYo9WU3q2GyF 4DZhINHxAOHnpM1vEqKM2IbI+g0hReuqt1QYmHCIZ/y7O0pTp2bxeXkRw Y8afKfqRYs02J4h/p0PDd07oDPw45EKXcqzxPPOit7nOlW10Acu3eQRSK 6ksb2r1KWHoBIBEGUA+cadpzFvm0HC0iuZ4rAG1sv+JYM/1PXkBK9pbGl grnW7msITxp/Jq+lMoz3dlDGpOJlSQwD2K9kxFnXazt+ljhm3w/LUPdqC MJ6GoZIgfvttNNmvczuKEdtj2KRu6VCMRB37t4riCgf2GjSIkvDotlPie Q==; X-CSE-ConnectionGUID: u02GX18tRk+K2JqmB4I7hg== X-CSE-MsgGUID: Afc8IzPSQuaN1oafqlvplg== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24168133" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24168133" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:29 -0700 X-CSE-ConnectionGUID: dcxgJCpMReCMSJhbim2+6w== X-CSE-MsgGUID: xxuuAtxpSLOeqw6oUCY4Iw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="66671539" Received: from unknown (HELO localhost) ([10.237.66.160]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:25 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler , Andi Shyti , Rodrigo Vivi Subject: [PATCH v2 02/10] drm: move i915_gsc_proxy_mei_interface.h under include/drm/intel Date: Thu, 30 May 2024 16:19:03 +0300 Message-Id: <461662d528c3f327c81b764b7c883cd4519d8729.1717075103.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Tomas Winkler Reviewed-by: Andi Shyti Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 2 +- drivers/gpu/drm/xe/xe_gsc_proxy.c | 2 +- drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 2 +- include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h (100%) diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c index a7d5465655f9..e7619d81353c 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "gt/intel_gt.h" #include "gt/intel_gt_print.h" diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c index 6d6d1068cf23..cc3426fcfa89 100644 --- a/drivers/gpu/drm/xe/xe_gsc_proxy.c +++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "abi/gsc_proxy_commands_abi.h" #include "regs/xe_gsc_regs.h" diff --git a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c index 89364bdbb129..d5fbaf5d0c8e 100644 --- a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c +++ b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include /** * mei_gsc_proxy_send - Sends a proxy message to ME FW. diff --git a/include/drm/i915_gsc_proxy_mei_interface.h b/include/drm/intel/i915_gsc_proxy_mei_interface.h similarity index 100% rename from include/drm/i915_gsc_proxy_mei_interface.h rename to include/drm/intel/i915_gsc_proxy_mei_interface.h From patchwork Thu May 30 13:19:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680389 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 8670CC25B74 for ; Thu, 30 May 2024 13:19:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1D9C810F16D; Thu, 30 May 2024 13:19:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="OiMzmXjd"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEEA210F97B; Thu, 30 May 2024 13:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075177; x=1748611177; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SMS12pEMq8w6cHhtJwjIx3yS3c4F2O2WtSXW3BPA+RU=; b=OiMzmXjdCv58U1ZtTkkR9Z1td3666pBTjnARjDq5ILWCrGueKQiNnmN2 BS2YERFsuujISgx/JcJ38UIekK6jUQoa+p2pWC1KoF9IICD2iM/148jux +SF5bLqzrEEXtkNgbH0/iPHabxuDFk2odxwzm9DilqvBiw5El8CJmXM2A HCDNKLM6Wuq6Up/kOlMgnsEAHoMfRWWQltD33vuJRYogtntlDUF2rWCL5 xKkYQig0KSnZRAZEz8UCG0wrY8VtG8GaX3wWUZRe8k43d9iggkxazVTQS 5YfTkaHLURiWtuHYzFaQSbnJWke30pZuJ08Sl1+8LT6irsk3pbe5qwg29 Q==; X-CSE-ConnectionGUID: 1zAXMjKjSMmGdvRtro8JQg== X-CSE-MsgGUID: 7GuolV0/TP2B/uajcvUoNQ== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24168148" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24168148" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:37 -0700 X-CSE-ConnectionGUID: /RNLJn70QRimZqUvPnJp3Q== X-CSE-MsgGUID: vPh3OADwTeWl14Fl/g32aA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="66671552" Received: from unknown (HELO localhost) ([10.237.66.160]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:32 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler , Jaroslav Kysela , Takashi Iwai , Rodrigo Vivi Subject: [PATCH v2 03/10] drm: move i915_component.h under include/drm/intel Date: Thu, 30 May 2024 16:19:04 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. v2: Also change Documentation/gpu/i915.rst (Andi) Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Tomas Winkler Cc: Jaroslav Kysela Cc: Takashi Iwai Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- Documentation/gpu/i915.rst | 2 +- drivers/gpu/drm/i915/display/intel_audio.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp.c | 2 +- drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 2 +- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 2 +- drivers/gpu/drm/xe/xe_gsc_proxy.c | 2 +- drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 2 +- drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- drivers/misc/mei/pxp/mei_pxp.c | 2 +- include/drm/{ => intel}/i915_component.h | 0 include/sound/hdaudio.h | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename include/drm/{ => intel}/i915_component.h (100%) diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst index 3113e36f14cf..ad59ae579237 100644 --- a/Documentation/gpu/i915.rst +++ b/Documentation/gpu/i915.rst @@ -150,7 +150,7 @@ High Definition Audio .. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c :internal: -.. kernel-doc:: include/drm/i915_component.h +.. kernel-doc:: include/drm/intel/i915_component.h :internal: Intel HDMI LPE Audio Support diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index 4c031e97f9a5..b9bafec06fb8 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "i915_drv.h" #include "intel_atomic.h" diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 5767070248bb..ba3eca919900 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "i915_drv.h" #include "i915_reg.h" diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c index e7619d81353c..d8edd7c054c8 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c @@ -5,7 +5,7 @@ #include -#include +#include #include #include "gt/intel_gt.h" diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c index b00d6c280159..051b6cdcf721 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c @@ -6,7 +6,7 @@ #include #include -#include +#include #include "gem/i915_gem_lmem.h" #include "gt/intel_gt_print.h" diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c index cc3426fcfa89..aa812a2bc3ed 100644 --- a/drivers/gpu/drm/xe/xe_gsc_proxy.c +++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include "abi/gsc_proxy_commands_abi.h" diff --git a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c index d5fbaf5d0c8e..f52fe23a6c0b 100644 --- a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c +++ b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include /** diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index f8759a6c9ed3..e43ea536c947 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "mei_hdcp.h" diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index 49abc95677cd..ed88d6df4397 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "mei_pxp.h" diff --git a/include/drm/i915_component.h b/include/drm/intel/i915_component.h similarity index 100% rename from include/drm/i915_component.h rename to include/drm/intel/i915_component.h diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 1d10939e40af..7e39d486374a 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include /* codec node id */ typedef u16 hda_nid_t; From patchwork Thu May 30 13:19:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680390 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 800E8C27C4F for ; Thu, 30 May 2024 13:19:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 25D0710FD0F; Thu, 30 May 2024 13:19:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="DQBhp+jm"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CD2E10EAF5; Thu, 30 May 2024 13:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075183; x=1748611183; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=T9TSxLLhZB5UB3WSAwCmgQDHJZnyJBFuMjQDgyHbW3c=; b=DQBhp+jmIBEik1lYDQZhI0MQBEqEOqTJVR4sg8uRlIb9GEetchxu4Odl 7HjOhPkqLv83Z/z0qk4HZUfktOi5zZaGUTvx95QNYrPBG8sUX1Rgo821w fSmSRiwlnBRjZhtSg0jLf7fGkuhslQKtX3DcPFHT1al83nSowJFSXf+bY YbD4wV4jyuoY5WAhwXkKZC11U5APzyQnYF2b0KwQXfgx3IvuIK24xMaJp wb2B75XosI7XSKHgc88fBS8QlaD8ZjdnJSM0qknduQj9VxQCKdH8gyUp1 Jufj0F9Cn2Ax3usS4yhqH72hpZOkJEWgdpLOHcvGeb8LQPiAs6gNNl1LL A==; X-CSE-ConnectionGUID: 4ci08S6vT1WesdSeBllzZw== X-CSE-MsgGUID: wAyGOEJdQfWQ4lGIKBA5Eg== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="11805714" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="11805714" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:43 -0700 X-CSE-ConnectionGUID: soJDYfUUQji1zQ7GU8y2Rw== X-CSE-MsgGUID: up8xVDHUTcOeQLGcJND95A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="73291229" Received: from unknown (HELO localhost) ([10.237.66.160]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:39 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Jaroslav Kysela , Takashi Iwai , Andi Shyti , Rodrigo Vivi Subject: [PATCH v2 04/10] drm: move intel_lpe_audio.h under include/drm/intel Date: Thu, 30 May 2024 16:19:05 +0300 Message-Id: <2d645970a65cfd13e01fd8195b35bf9483ae9c2f.1717075103.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Jaroslav Kysela Cc: Takashi Iwai Reviewed-by: Andi Shyti Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- include/drm/{ => intel}/intel_lpe_audio.h | 0 sound/x86/intel_hdmi_audio.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename include/drm/{ => intel}/intel_lpe_audio.h (100%) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 3767be0bdba8..06ec9ce7fe1c 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "g4x_hdmi.h" #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c index 93e6cac9a4ed..f11626176fe2 100644 --- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c +++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c @@ -68,7 +68,7 @@ #include #include -#include +#include #include "i915_drv.h" #include "i915_irq.h" diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel/intel_lpe_audio.h similarity index 100% rename from include/drm/intel_lpe_audio.h rename to include/drm/intel/intel_lpe_audio.h diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 02f5a7f9b728..d41ea09ffbe5 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "intel_hdmi_audio.h" #define INTEL_HDMI_AUDIO_SUSPEND_DELAY_MS 5000 From patchwork Thu May 30 13:19:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680391 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 99B79C27C44 for ; Thu, 30 May 2024 13:20:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C2CD10E9E4; Thu, 30 May 2024 13:20:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BTOxqVzR"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1CF1211217E; Thu, 30 May 2024 13:19:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075191; x=1748611191; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w3KM5FKWA9dnbtXpRClGithBeRdgejSUGv7qHhJ6vMs=; b=BTOxqVzRurPI9fesrX+zB/cy5Tb6M3yZyttuqlC1iZ3wgT99f4/4mhn/ +URV0W8BvkNNIc95vppetXQVrw9vr0bn+XtPlB31nhD1k3F3rUMBNBGul 3QcocKMP6jnCbNv778LdmjMRPdnvo15YakK/YgrSe+ASVJNAxi6leUMwe uu40S0JkNBXvqx4qC0jbEydUryEH/7q1ga4y87Su/ekoE/rFwktwW6cdN C4qdFD3b05qSdoExISzdrhkw/Fdv/WBr5IxWDwgfPZlq9+xAcki4LtwXV ynsK5Y+pVFIgR5+Zep2nerDPm2TqOBS9JES3g5pNxEbcAut1NcYvnBAIe Q==; X-CSE-ConnectionGUID: z7wsgt8lRe2xV6XZItsn7g== X-CSE-MsgGUID: 6HvMHcTISRiz6JBf//flFA== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24168178" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24168178" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:51 -0700 X-CSE-ConnectionGUID: eArslN8YS8adez1lfaAtqQ== X-CSE-MsgGUID: Jhgz+K7QSYqoJVkYTUFxLQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="66671572" Received: from unknown (HELO localhost) ([10.237.66.160]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:46 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Bjorn Helgaas , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Rodrigo Vivi Subject: [PATCH v2 05/10] drm: move i915_drm.h under include/drm/intel Date: Thu, 30 May 2024 16:19:06 +0300 Message-Id: <0e344a72e9be596ac2b8b55a26fd674a96f03cdc.1717075103.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. v2: Also fix comment in intel_pci_config.h (Ilpo) Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Bjorn Helgaas Cc: Hans de Goede Cc: Ilpo Järvinen Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- arch/x86/kernel/early-quirks.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- drivers/gpu/drm/i915/intel_pci_config.h | 2 +- drivers/gpu/drm/i915/soc/intel_gmch.c | 2 +- drivers/gpu/drm/xe/xe_ggtt.c | 2 +- drivers/platform/x86/intel_ips.c | 2 +- include/drm/{ => intel}/i915_drm.h | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename include/drm/{ => intel}/i915_drm.h (100%) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 1c137771c5d2..ec1a7943c228 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c index ad6dd7f3259b..30595b2b63e1 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h" diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 2717699c6591..206a5e0fedf1 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include "display/intel_display.h" diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c index c9cb2a391942..70176be269d3 100644 --- a/drivers/gpu/drm/i915/gt/intel_rps.c +++ b/drivers/gpu/drm/i915/gt/intel_rps.c @@ -5,7 +5,7 @@ #include -#include +#include #include "display/intel_display.h" #include "display/intel_display_irq.h" diff --git a/drivers/gpu/drm/i915/intel_pci_config.h b/drivers/gpu/drm/i915/intel_pci_config.h index 23b8e519f333..ebe040828e20 100644 --- a/drivers/gpu/drm/i915/intel_pci_config.h +++ b/drivers/gpu/drm/i915/intel_pci_config.h @@ -31,7 +31,7 @@ static inline int intel_mmio_bar(int graphics_ver) } } -/* BSM in include/drm/i915_drm.h */ +/* BSM in include/drm/intel/i915_drm.h */ #define MCHBAR_I915 0x44 #define MCHBAR_I965 0x48 diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/soc/intel_gmch.c index 40874ebfb64c..734e9f2801ea 100644 --- a/drivers/gpu/drm/i915/soc/intel_gmch.c +++ b/drivers/gpu/drm/i915/soc/intel_gmch.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include "i915_drv.h" #include "intel_gmch.h" diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c index b01a670fecb8..8ff91fd1b7c8 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -10,7 +10,7 @@ #include #include -#include +#include #include "regs/xe_gt_regs.h" #include "regs/xe_gtt_defs.h" diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 73ec4460a151..523fb18a7ace 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include "intel_ips.h" diff --git a/include/drm/i915_drm.h b/include/drm/intel/i915_drm.h similarity index 100% rename from include/drm/i915_drm.h rename to include/drm/intel/i915_drm.h From patchwork Thu May 30 13:19:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680392 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 50A8AC25B74 for ; Thu, 30 May 2024 13:20:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A50A910F97B; Thu, 30 May 2024 13:20:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Rvg93kaR"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id B5D2311217E; Thu, 30 May 2024 13:19:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075197; x=1748611197; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BwowBzSpm/4PJjjUCFjLkOz3Z6BzAvw5N/aPiE9IlwU=; b=Rvg93kaR08QhmXWog1VANiKDiJTPmIZtZtazI40vhscM/Dqq3rY5+uKf Kaozc3pumiDeSRWIHoAoVGVyIx8uVGXYFqcuUdscOWJU2/7IR5Fp8HYUQ B292KWvtT6G+nxVlKkIH9PveSLq8L1QGQywtNV9yUj4fkIMA3HwOMho29 Jeo3m/bTSJenPy4gZXsDUzbXZOu/OM6C+YUngX7sDnMkIoAQ8ObOUltKL G3KFT5rrlQxlupbRvEgjqZVoIFFgpY9uKHZ15l2m1EcaubM5pvpBUNBPb fFMRNwQJ7O+bzrrDKntD3Tv3xqPrvkI4+eIMJzj4/8l6US+uc7YSLmcCV A==; X-CSE-ConnectionGUID: Kov+/NffSby5kTMeKt9Ljg== X-CSE-MsgGUID: H/jKCjz0RzOHyrlqoEtpTg== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24678045" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24678045" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:56 -0700 X-CSE-ConnectionGUID: PRP2qVfuTpWo7Wl1DF3XPg== X-CSE-MsgGUID: bneYBkgJRLKCkvpLvilV0A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="35884802" Received: from unknown (HELO localhost) ([10.237.66.160]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:52 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler , Rodrigo Vivi Subject: [PATCH v2 06/10] drm: move i915_pxp_tee_interface.h under include/drm/intel Date: Thu, 30 May 2024 16:19:07 +0300 Message-Id: <5c1626978d2552ef5732dcf9427c903046afb9c1.1717075103.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Tomas Winkler Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 2 +- drivers/misc/mei/pxp/mei_pxp.c | 2 +- include/drm/{ => intel}/i915_pxp_tee_interface.h | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename include/drm/{ => intel}/i915_pxp_tee_interface.h (100%) diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c index 051b6cdcf721..1784153f0cf8 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c @@ -5,7 +5,7 @@ #include -#include +#include #include #include "gem/i915_gem_lmem.h" diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c index ed88d6df4397..2820d389c88e 100644 --- a/drivers/misc/mei/pxp/mei_pxp.c +++ b/drivers/misc/mei/pxp/mei_pxp.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "mei_pxp.h" diff --git a/include/drm/i915_pxp_tee_interface.h b/include/drm/intel/i915_pxp_tee_interface.h similarity index 100% rename from include/drm/i915_pxp_tee_interface.h rename to include/drm/intel/i915_pxp_tee_interface.h From patchwork Thu May 30 13:19:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680394 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 2F3E3C27C43 for ; Thu, 30 May 2024 13:20:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63430112021; Thu, 30 May 2024 13:20:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LfR4B19w"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id ACE3410FEC6; Thu, 30 May 2024 13:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075201; x=1748611201; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J5HV41mo4w7qYv+3Al3FL2cyApBrk8R9E9ns9qtqMLE=; b=LfR4B19w3Tn9V4lq1D0YxhR549et7SwvsHTM1hR9rDPXHZ0fKxxUT0yx yHQQNRqQyhjZJ8pJVbHrKYuZU2iW2FWbR+Xij7sv9+DJZ7ce7Myip48PE xQGU3aoOWgycgdgyPpcyQfgZhJP97avxRerqm5KgsUP+qlcvEd/bDglDG wdfQVQ00s2nt3PHVt95b9GgKJonXvEEsB+DeGu6oyNCHjHzD1QJOVOF4V QE31a4JM0VhsJGqG04mxu2gQcSLGN4+11fbzlHNpY3T1dfRB1hMzXA6xG UD0DBLh35j37R5Br+Rr1GLAG9UTLdc8PkOsTS15tXZr86Qq8rsh5W1/Kx Q==; X-CSE-ConnectionGUID: oD99hsGdR8el5jF7Z5KBPA== X-CSE-MsgGUID: 56RlkNlfQ4e6JzfGmVe0sg== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24678051" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24678051" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:00 -0700 X-CSE-ConnectionGUID: DKnTGSJrTKGsY6Xjgy52cg== X-CSE-MsgGUID: hbWFiFIhSEiGUj5GdsNfMg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="35884805" Received: from unknown (HELO localhost) ([10.237.66.160]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:19:57 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Bjorn Helgaas , Rodrigo Vivi Subject: [PATCH v2 07/10] drm: move i915_pciids.h under include/drm/intel Date: Thu, 30 May 2024 16:19:08 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Bjorn Helgaas Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- arch/x86/kernel/early-quirks.c | 2 +- drivers/gpu/drm/i915/display/intel_display_device.c | 2 +- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- include/drm/{ => intel}/i915_pciids.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename include/drm/{ => intel}/i915_pciids.h (100%) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index ec1a7943c228..29d1f9104e94 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index cf093bc0cb28..11e6edc03358 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -3,7 +3,7 @@ * Copyright © 2023 Intel Corporation */ -#include +#include #include #include diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 84cd2f0343a2..ce4dfd65fafa 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "display/intel_display.h" #include "display/intel_display_driver.h" diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c index 862f4b705227..d26de37719a7 100644 --- a/drivers/gpu/drm/i915/intel_device_info.c +++ b/drivers/gpu/drm/i915/intel_device_info.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "gt/intel_gt_regs.h" #include "i915_drv.h" diff --git a/include/drm/i915_pciids.h b/include/drm/intel/i915_pciids.h similarity index 100% rename from include/drm/i915_pciids.h rename to include/drm/intel/i915_pciids.h From patchwork Thu May 30 13:19:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680393 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 38BC0C27C44 for ; Thu, 30 May 2024 13:20:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9D8BD10E4FF; Thu, 30 May 2024 13:20:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="iHlU8LIm"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAC90112502; Thu, 30 May 2024 13:20: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=1717075206; x=1748611206; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JSu3bQMJ/NXCJea98r2Rhs/jTpKMVQcfGkUm8eww2Tc=; b=iHlU8LImuMbdNYjJRs5j6yulNqnULpRalxK8dOKsf7umZ6y9/rnAsyEU ijBCRhKw+y7TczM1Sszuji4fBEhjqIRgLAi4Kd8R64XLIViMM2V3ZLPtJ Hi+mDg9B5koXqD4wDbFnd3IrD4wzdr4M8pkg9I6hkxpOxvf9rWVQ7BMjJ 1fCbgFiBEFK9cvu70ZEY1mpRbKIFKd7t5pzmQHUd8Gb2Dxs+L/E9uuVMN kT0bo4HKtIF8/453EpxJOD7qQYVaHcu1d4RJMWobBOY7oqy0pQGeCFGhb fDXciHF0JddBvQv0U+K81zVfWZbAIUYXadXlT2aoMwUmHajNGW0jNkY4m A==; X-CSE-ConnectionGUID: 1y2ophH6T7q1Tdpjisb7zg== X-CSE-MsgGUID: YlIy7AckSwChKYfLK58ebw== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="13431586" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="13431586" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:05 -0700 X-CSE-ConnectionGUID: oJXGtfwTSemKgfTDOAGzDQ== X-CSE-MsgGUID: FCoapcfITbWkDh6Sln7j1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="35845659" Received: from unknown (HELO localhost) ([10.237.66.160]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:03 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Rodrigo Vivi Subject: [PATCH v2 08/10] drm: move xe_pciids.h under include/drm/intel Date: Thu, 30 May 2024 16:19:09 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- drivers/gpu/drm/xe/xe_pci.c | 2 +- include/drm/{ => intel}/xe_pciids.h | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename include/drm/{ => intel}/xe_pciids.h (100%) diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 1385d68c12c9..5655222aa4e1 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include "display/xe_display.h" #include "regs/xe_gt_regs.h" diff --git a/include/drm/xe_pciids.h b/include/drm/intel/xe_pciids.h similarity index 100% rename from include/drm/xe_pciids.h rename to include/drm/intel/xe_pciids.h From patchwork Thu May 30 13:19:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680395 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 6E339C25B74 for ; Thu, 30 May 2024 13:20:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F02AF11217E; Thu, 30 May 2024 13:20:31 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YdNUykMk"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 39F5210FEC6; Thu, 30 May 2024 13:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075211; x=1748611211; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j4ldLALUM0qlpISa4pT7xa+FUOMn6i3UFzrLAk+9Sds=; b=YdNUykMkwkn2mV5rqqVqKUVFVgnFzxuI5/M5amTef/JW7ttVy6CWz5mn 33+5i3m4c0AtafScQc0ZwwrsVVT0xFH7NcWx8h9TD2orFMQkJo5zxUG1N U+aziVneIFv8HkJS2QrXWCxulkDemur3h+xEE/VRjpkIbe32Gb9v+3vYx /TxQyxKAdrpa71P4KBSJ9xIg0AJbaf+omCFhn9tW6R6Bx/U9MYHzOwXV8 0x5xWC7sHIDZqkX11ctJMWRLNWxmqvpExtgSMFjv5TshjVZznkAsxLkPB JcsLC7RgqoCbkmMm2inzf7qLThlpxG/fNeAoLN3ls/tUyFH6THcDkrSAh w==; X-CSE-ConnectionGUID: MbBSldYjR36//eQqG1yzUw== X-CSE-MsgGUID: wQCXGHpDSHiimmC/aVoPhQ== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="13431655" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="13431655" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:11 -0700 X-CSE-ConnectionGUID: lPZ20K3YRtutki7f8o5NPw== X-CSE-MsgGUID: XEcc0jG+RUiCHmNP3h7MQA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="35845738" Received: from unknown (HELO localhost) ([10.237.66.160]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:08 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler , Rodrigo Vivi Subject: [PATCH v2 09/10] drm: move i915_hdcp_interface.h under include/drm/intel Date: Thu, 30 May 2024 16:19:10 +0300 Message-Id: <5f53384118e33123d3c87b94cc8835360237698b.1717075103.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Clean up the top level include/drm directory by grouping all the Intel specific files under a common subdirectory. Cc: Daniel Vetter Cc: Dave Airlie Cc: Lucas De Marchi Cc: Tomas Winkler Acked-by: Lucas De Marchi Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +- drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c | 2 +- drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 2 +- drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- include/drm/{ => intel}/i915_hdcp_interface.h | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename include/drm/{ => intel}/i915_hdcp_interface.h (100%) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 6fbfe8a18f45..9210643c9fdf 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include "i915_vma.h" diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c index 35823e1f65d6..16afeb8a3a8d 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c @@ -3,7 +3,7 @@ * Copyright 2023, Intel Corporation. */ -#include +#include #include "gem/i915_gem_region.h" #include "gt/intel_gt.h" diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c index 240b00849f3d..6548e71b4c49 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include "i915_drv.h" #include "intel_hdcp_gsc_message.h" diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c index eb67ecf08db2..14b8b4278317 100644 --- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c +++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include "abi/gsc_command_header_abi.h" diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c index e43ea536c947..323f10620d90 100644 --- a/drivers/misc/mei/hdcp/mei_hdcp.c +++ b/drivers/misc/mei/hdcp/mei_hdcp.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "mei_hdcp.h" diff --git a/include/drm/i915_hdcp_interface.h b/include/drm/intel/i915_hdcp_interface.h similarity index 100% rename from include/drm/i915_hdcp_interface.h rename to include/drm/intel/i915_hdcp_interface.h From patchwork Thu May 30 13:19:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13680396 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 E9D15C27C43 for ; Thu, 30 May 2024 13:20:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D6A551128A3; Thu, 30 May 2024 13:20:34 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="UaSjhDE6"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D0B01128A3; Thu, 30 May 2024 13:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717075217; x=1748611217; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bX+zg8h2YhgNfm4JA0we6O9nC93BNZED1HQoYPGDXG8=; b=UaSjhDE6xJIAohdQRLnh/BId8N6K67utj61hZ8XwX8XBNU24aqfZcaTQ ycaAO+oB/wiOL7KK8qQPy41vl+hJ8QW6i44iDoBKVsVtARORKOX2BxujE vHsu+ZY+hj28oYimoE7kpZSo9i2cZjZEBaG+R0RaC2gl3IoICti/H9wKE pfPWKbjjEMOo9AAv8jr/Fj0DifVfEBkSnJmw5KwfBisQeZ4TciK41FJYj veglbTwZ9Ui8Zhtuf5HM4eo4Gg+/Pxw9+sKLyUudhlNe0CridL8qh2K/D 8r1Sgk4xQ3JYH+FYyaRCC885AQqelJ/bd21NSZpJJorYUqLIOhwvTom7S g==; X-CSE-ConnectionGUID: Sj0+/YuQSzGIiWp6I0uW+w== X-CSE-MsgGUID: uK94+Ii9RreMmIqNYWgyDw== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24678061" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24678061" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:17 -0700 X-CSE-ConnectionGUID: t5C0Wip9TaqSGjQj5j0rlQ== X-CSE-MsgGUID: S00zNBazTXO/+3bWXOKykQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="35884814" Received: from unknown (HELO localhost) ([10.237.66.160]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 06:20:13 -0700 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: jani.nikula@intel.com, Joonas Lahtinen , Lucas De Marchi , Oded Gabbay , Rodrigo Vivi , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , Tvrtko Ursulin , Andi Shyti Subject: [PATCH v2 10/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Date: Thu, 30 May 2024 16:19:11 +0300 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" With all the Intel specific drm files under include/drm/intel, update the i915, xe, and the shared display entries. Do not discriminate based on file name pattern, just add the entire directory for all three entries. Cc: Joonas Lahtinen Cc: Lucas De Marchi Cc: Oded Gabbay Cc: Rodrigo Vivi Cc: Thomas Hellström Cc: Tvrtko Ursulin Reviewed-by: Andi Shyti Acked-by: Rodrigo Vivi Signed-off-by: Jani Nikula --- MAINTAINERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 21aad782f1ea..572be0546e21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11013,6 +11013,7 @@ S: Supported F: drivers/gpu/drm/i915/display/ F: drivers/gpu/drm/xe/display/ F: drivers/gpu/drm/xe/compat-i915-headers +F: include/drm/intel/ INTEL DRM I915 DRIVER (Meteor Lake, DG2 and older excluding Poulsbo, Moorestown and derivative) M: Jani Nikula @@ -11030,7 +11031,7 @@ F: Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon F: Documentation/gpu/i915.rst F: drivers/gpu/drm/ci/xfails/i915* F: drivers/gpu/drm/i915/ -F: include/drm/i915* +F: include/drm/intel/ F: include/uapi/drm/i915_drm.h INTEL DRM XE DRIVER (Lunar Lake and newer) @@ -11046,7 +11047,7 @@ T: git https://gitlab.freedesktop.org/drm/xe/kernel.git F: Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon F: Documentation/gpu/xe/ F: drivers/gpu/drm/xe/ -F: include/drm/xe* +F: include/drm/intel/ F: include/uapi/drm/xe_drm.h INTEL ETHERNET DRIVERS