From patchwork Wed Apr 10 10:05:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624019 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 96792CD1297 for ; Wed, 10 Apr 2024 10:05:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 19FA610EA1A; Wed, 10 Apr 2024 10:05:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="K0+KjkSQ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id A77E810EA24; Wed, 10 Apr 2024 10:05:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743532; x=1744279532; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MGWyIqCcgXlY4QKWwuJbDNEOG+0YXe+0UdshLwzwkLM=; b=K0+KjkSQI6ib+vZuxXbrn45w1ys8EC6mV8IZC5G8ATPp3olA08uFv2Tz n6HNcRAIfoTiBjORPp6fNh+XuAGwe4flG4KSwmdpDYVgpgRyesICJn8xr u4E8C87lwW3Socp1r26fjK4NBgGGdUV9Edt+SAyBuUW0VN2LuMxF2yRIK oF7lGRTaoTrVDaAWqvqG2/O3NaSeEG78NlQp/7U2ZnhHu3W5X86WRh9t+ MbhmjgM2IP+ZoPbaE2fJ22FcydCSqMRX5FoED+8mErC+HIMwfvqK8/yXn RMDCRXUaQXeMOIFFOKn/2nIHxK6DdzyVZVlNjThJ8Ay/W2yhpQ/3S8c5C A==; X-CSE-ConnectionGUID: 4Uy6JFm5T7CsYg572vxUMg== X-CSE-MsgGUID: pkIEfZCjTtOqDsg3HpXS5g== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="18661808" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="18661808" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:32 -0700 X-CSE-ConnectionGUID: Zkdn/pOjRnaBcZ7c4Xgt2w== X-CSE-MsgGUID: AdV0XkUbTNiT7D+qTgcaww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="25133445" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:29 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com Subject: [PATCH 01/10] drm/i915: use system include for drm headers Date: Wed, 10 Apr 2024 13:05: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" Use <> instead of "" for including headers from include/, even if the file is in the same directory. Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- include/drm/i915_component.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h index 56a84ee1c64c..4ea3b17aa143 100644 --- a/include/drm/i915_component.h +++ b/include/drm/i915_component.h @@ -24,7 +24,7 @@ #ifndef _I915_COMPONENT_H_ #define _I915_COMPONENT_H_ -#include "drm_audio_component.h" +#include enum i915_component_type { I915_COMPONENT_AUDIO = 1, From patchwork Wed Apr 10 10:05: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: 13624020 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 DB4FBCD129A for ; Wed, 10 Apr 2024 10:05:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B8DC10EA29; Wed, 10 Apr 2024 10:05:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="M3VWeaM7"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9CD7D10EA29; Wed, 10 Apr 2024 10:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743540; x=1744279540; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rBF2oLNkI2E3iMi2kjJUABNNODuPtAWHFYKT/YeH6pU=; b=M3VWeaM7avLOTz4BJofAkXU3zBj0TZi30xi7JNhITn3o2v2awbIXwSx7 9FfTMFcL7khTRLoD29T3pbAD/oZ4dZVfpL8FtNoFMvF9uvUt+hRDFhzlC vqMiv7RQmCbRljwQTxqH4DGyp6mD34lrbCU2km6uGfje2k3s+3OZT/tO6 JOt4p1ipFrlRz+qGday+/INN5XsP5vRABOm8mCkh1ePxbX9NJ5ZCFJiG+ EjrI+jtBkkCkJPIaiXGJZpnmVc8I4x2Qje8/p8/nR6IO/2yRGLo8Nnvi5 4MjhQ0gph+74bF/2dlNEPE2YdtPYXebKU9v8FbKgnANPU4g79fcdWlGyL Q==; X-CSE-ConnectionGUID: WyYYL0z9SUW8yIwAT/ATrQ== X-CSE-MsgGUID: 1mc7qmx5RPqmNa06tSIBvg== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8320039" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8320039" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:38 -0700 X-CSE-ConnectionGUID: yDwubA+HQsCsdCT2Alu62A== X-CSE-MsgGUID: hvZlR9L/TSO4qualNIs1dQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="20460976" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:35 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi Subject: [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:09 +0300 Message-Id: <25b1e49297bcc2eda2a626e7fd0ee398df9e3f70.1712743191.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 Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- 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 580b5141ce1e..bab805ca4f0d 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 Wed Apr 10 10:05: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: 13624021 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 823FBCD1296 for ; Wed, 10 Apr 2024 10:06:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4B98F10EA35; Wed, 10 Apr 2024 10:05:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HyYHpVyp"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 699F610EA28; Wed, 10 Apr 2024 10:05: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=1712743545; x=1744279545; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tAUOeTYL7yJ0jEQBnNTdD9svt6spqItWTX8lYTcStHs=; b=HyYHpVypCSeruKgUR2yjftxxMd0E0hBx8M6d+mVQf21VGVQv7mtpVPJY XJrsQgTDXyq5KWpSpWsTbbwENYjQdBS8Ktewel341j7shQhPeifiSvkMP WmmsSDxpaVGyxdLxgG9DgpZvrFBMoYimlQqdvGCXm0ysLcKlUpZfwOJO4 OfRSjrgxL2dHF4LHkx9e3PntmZwA0wj/Q5p1hnKVrhZCwoRroNZfUUK08 msMmRU5/6cUKuhG54XsT8sruLJobp3YsP5T5IacCG5RT9ohzYYfKZLPny WnYlDp0vktoAN/sjv9XM/FAgsORqKsOXQIzYEfb2XA1RjEomYIJK/IFuQ w==; X-CSE-ConnectionGUID: vgWYacQfT2G3qI9UnX8FDQ== X-CSE-MsgGUID: uysam/DJQw6vvIA09xSvwA== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8320043" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8320043" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:44 -0700 X-CSE-ConnectionGUID: ok0b+yWiQ4meJvkykDyH5Q== X-CSE-MsgGUID: juyCsUTWTrur+Qte1MbgAg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="20460982" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:40 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler Subject: [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:10 +0300 Message-Id: <63ebb7decdd99568bf8c3162be2e9fa88e3fc9de.1712743191.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 Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- 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 35e397b68dfc..ea7b5ffb8954 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 Wed Apr 10 10:05:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624022 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 3BF06CD1296 for ; Wed, 10 Apr 2024 10:06:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 49F8F10EEBF; Wed, 10 Apr 2024 10:06:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="L0vMlphv"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2479D10EA28; Wed, 10 Apr 2024 10:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743551; x=1744279551; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bJvBDcWN+hYP8lUcQTW3oD+Ab8zXqHFWhrkQMmIUJnQ=; b=L0vMlphviwG5/osJHfgl1Gk64ipLzcQuQovo7+F3M/7u8oJjU81cqVHN qQykzTJBkYUJOAS8MYlodJK0oampS3/U5PCQWU0fpezKRssMbwO2eYvCk mhgSBNCAe+4fuUIwdzbG2y4WGfBWCxGkAMHYCkJJAU6ZsJuphBoYs6rMr uYi7+iwwzUM7waGKOwCghrfL/GU5XT8q7xyKKGiCt+gxhcGH2JGXLA/jf hAG3mkomrVHbBtDoVFizkihtP8qNaBvy1qonvolxFzTpx8hAcAd0Ct3LD fW1HXIwoWzsvGNXT18xR7ZlyWokWKF1/+J7byitdd8yKMfPh3m3MB0qdb A==; X-CSE-ConnectionGUID: aMzNy/EZSsqTFFPCWtAS8A== X-CSE-MsgGUID: mQBS2OEKQq6B08XMjANrRw== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8320052" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8320052" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:51 -0700 X-CSE-ConnectionGUID: 57p0r80aR6WTFZ1dLUrXig== X-CSE-MsgGUID: 2aWKd9GUSVSuoIB9BEQGoA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="20460986" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:46 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 04/10] drm: move i915_component.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:11 +0300 Message-Id: <3ec9dfb58154d95e98afe03048a8f31cbbe1659e.1712743191.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 Cc: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Jani Nikula --- 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 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename include/drm/{ => intel}/i915_component.h (100%) diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c index 07e0c73204f3..53951c50b504 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 d5ed4c7dfbc0..183ea437d623 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 ea7b5ffb8954..a278d08b343c 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 b1e4c23b31a3..5a7a4d8b0e23 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 a73d7f34f4e5..00d1ab6936dd 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 Wed Apr 10 10:05:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624025 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 69424CD1297 for ; Wed, 10 Apr 2024 10:06:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 98AE011328A; Wed, 10 Apr 2024 10:06:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="EHq8dzZp"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 323E610EA24; Wed, 10 Apr 2024 10:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743557; x=1744279557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=mumY1GcVkw8mOGIhsUnZxpQfZ2vPMs+xTyKtdEBX6sA=; b=EHq8dzZpHBOXYZRkf1wNC1xb1JGJhAUgn+u5EoU2hWmpXTeL9xlJQpSk ZySLH5J1kCk/P+sl51YYtwOJ1EmGiRo+8gKcWF2qJ0H5zeGg4z5ePCiLP BtauN7ocTKcdH+BR8aSxDMOmRZHuz/mG46xCY9NR5TnvvRu2bz9SCkjPq aDofTZ1p1gdQJpidQzfaWUskRB6keFZy6qGCAmPe12/0mVypuFwKPro+k BTgWWs4xtbwHtm0PslcyGcO5/lgVu1QwGd/pJrH8mzovsyVZmsFoMClvH WPdzXxZQ4vupm8smdrqepFJRYnxk1h3tKgpl/w5cC6cjLIlv2RItc1a8z w==; X-CSE-ConnectionGUID: l1UFSHqnTjS26jQwchrPdw== X-CSE-MsgGUID: ccfq0duARJq2slbZqHEsjQ== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8320059" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8320059" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:57 -0700 X-CSE-ConnectionGUID: TIwbQ4EKRyKCz3sNkTAnyA== X-CSE-MsgGUID: vb+dWgstRWOEVPpFwbvF2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="20460996" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:53 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Jaroslav Kysela , Takashi Iwai Subject: [PATCH 05/10] drm: move intel_lpe_audio.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:12 +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: Jaroslav Kysela Cc: Takashi Iwai Signed-off-by: Jani Nikula Reviewed-by: Andi Shyti --- 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 5f6deceaf8ba..959aa1143a7d 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 5863763de530..4e3f78d1d4f9 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 Wed Apr 10 10:05:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624023 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 43294CD129D for ; Wed, 10 Apr 2024 10:06:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AC74910F7BB; Wed, 10 Apr 2024 10:06:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="e1jsvs9M"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 75C8410EA32; Wed, 10 Apr 2024 10:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743564; x=1744279564; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oE6m4k6fw2ovbCGonnwUHHaFNIXRtdmEHq0iiCK39IU=; b=e1jsvs9Mf9UvW8AtLlKtpNvL8Zrurv4VgFFGKG49JaeUAeu1NBFx0ejg plE75IuRasMbZFzJgUItR92nKdNEhSOUai8UdhE7w8bD9FfKAOPbhLoew Jbrff99eKRNWt2M/vQNveOIhdPRLDXeyKU3/+lZGQzAK7wwkJTYncJYIF JTXMSrO5fjJEEWUxauQ4rYChzajPsx80dMUEdoslUD8p9pkztn+6zgNm6 s0ZCoDlDAuymt7LlTKnBH8ivp0J/hxDk16Oc1Hcn11WQjFJgItMmOh+mJ r8Pr9tp71Kaughay4r7FKZbkRU9BmSKcpU5Ug46gdzdYGt1MgNH4sQjTE g==; X-CSE-ConnectionGUID: co/K+BAqQfafxZ57ehYjgw== X-CSE-MsgGUID: ZKFbk5EiT/2PorE3vRl0Ww== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="18808949" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="18808949" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:02 -0700 X-CSE-ConnectionGUID: NpK971YpQ36V9YICNPUFKw== X-CSE-MsgGUID: 4FHN7mZUSLKjXS0WIS0u0Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="51735615" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:05:58 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@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?= Subject: [PATCH 06/10] drm: move i915_drm.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:13 +0300 Message-Id: <63e199dec91cc2e717d81ab00e28f68b9bec8461.1712743191.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: Bjorn Helgaas Cc: Hans de Goede Cc: Ilpo Järvinen 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/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 8 files changed, 7 insertions(+), 7 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 59f4aefc6bc1..5b867c02d2b5 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/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 ff2239c0eda5..7af1a48f3b59 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -9,7 +9,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 ba38649cc142..2a88012958eb 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 Wed Apr 10 10:05:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624026 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 7F08ACD1296 for ; Wed, 10 Apr 2024 10:06:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C0D810EA24; Wed, 10 Apr 2024 10:06:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="N0EgCkzg"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id E31EA10EA32; Wed, 10 Apr 2024 10:06:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743570; x=1744279570; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zceLu27KX5mycpwBq7C7JSyU6Z7R7YwGkoFyQkqqkkw=; b=N0EgCkzgFuK9JCv+7VSgI6P6QJ/Qgb/IXymyRjqbvTUWeYRhU3c/CfSK sP3/fTy0C88+utrIlxY0HiwTPh9R9zgp8cw8XxWgoHFj/H2qKk0qv0Oa6 z/ndeazN+liBJe2pMmbsUMbMcgBQFUL7tnlrJsTWDTiLCJmmBevmEVGCx qjkIAFB6abAF1JrvLVERRefNqBuTGtXLEhrlRcvnq/8Bz2kZR9c93+Dti i7vLdNjzHedWKQmjT6yzV1bQPjMuPYrAv1JaFG5op5MlvfeL7XlmV2BUi aUhTQiwaKVjkB+GOjVrWfpOatxlwLAoLRX5fKDn2FMoGkAU7rFE9Uioq/ A==; X-CSE-ConnectionGUID: NSpDovzwT6ufQA69yXsDFQ== X-CSE-MsgGUID: qp80G83NRFqso89PzIcRrQ== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8320092" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="8320092" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:10 -0700 X-CSE-ConnectionGUID: nD496gKnTkOo3oqplLfFEQ== X-CSE-MsgGUID: bci8PQ4BQpCgI2iEXXTt1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="20461024" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:05 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler Subject: [PATCH 07/10] drm: move i915_pxp_tee_interface.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:14 +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: Tomas Winkler 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 5a7a4d8b0e23..4268a868255f 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 Wed Apr 10 10:05:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624024 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 C29A1CD129A for ; Wed, 10 Apr 2024 10:06:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8E3C112B48; Wed, 10 Apr 2024 10:06:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="hTqq+ACY"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 94990113288; Wed, 10 Apr 2024 10:06:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743575; x=1744279575; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=POvhEB8t0WFy4nylAwlrruFpDkkoF+yFUljeDXXjvvs=; b=hTqq+ACYd3hZrEgcFQSHNB970LB0M+0R4AmVkVHr54pjvWkzFY+88nUQ bLgnwnQifDLmEmGYt6DzOWWPA88kFmT+FQo9Xcar//cjbdIQtMT5tI4UZ dhb1de6wwRiZr7gtHAXIJv2Pi7y9QBL3rHFH26V5JidvuDyBztFJl5wKt Et/M5/1sYJwF8o4+WwBgmjlCh52FJkx06N7pnhcgRsXuoQ1v/bZJCdkaf gw0tB3GTOU2fO8JJ0p2AR9T6GbRJhBFObYGb+HuGEATgLW+2ohOSeuqRT qkVqXs2ckb1ObYT7352e7wxVbWe4yoTDLhCHw0xedqpiSzpaBbXl6uzeF Q==; X-CSE-ConnectionGUID: BXK6g0h6Sl6EtJQs/NWsDA== X-CSE-MsgGUID: 51PdHwINTv6QtY6ughQnbg== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="11888332" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="11888332" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:15 -0700 X-CSE-ConnectionGUID: 828wEhnrQJKOq+bQ1BnWZg== X-CSE-MsgGUID: VgheGFgMRouN0Yu/LadwLA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="25195110" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:12 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Bjorn Helgaas Subject: [PATCH 08/10] drm: move i915_pciids.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:15 +0300 Message-Id: <949c8dc81d825b29a4adc6a4f46751f89ae7a831.1712743191.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: Bjorn Helgaas 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 5b867c02d2b5..6019949a3f68 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 b8903bd0e82a..15525fbf91c1 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 405ca17a990b..983848e5b5b4 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 a0a43ea07f11..12948d586143 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 Wed Apr 10 10:05:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624028 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 BF873CD1297 for ; Wed, 10 Apr 2024 10:07:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8683F113288; Wed, 10 Apr 2024 10:07:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="I4jlE9iT"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4989C1132A4; Wed, 10 Apr 2024 10:07:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743633; x=1744279633; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Tdtgw0zhmL6ZddiUHnjD4R+nwLa11n3twLGZikb8y1A=; b=I4jlE9iTZ/A3HZXXQns7sbdsuUl5547NUF3zBbOF3VD8oOVLzd0xtbsW U9hwKcmA/erlTWRaOV3tsQcuK58T7Nwr4TNgpgmBnr+DkZ1M/ZGvasp3Y pbe5Ps8LfXLnB9T3ADr93BpfZ+rtSxQ9HvxPBSVYu731Zzz58DGK7/4nL v0sBKzYLbG4T1qeLO2BVsfyy1xY9w2CkarLlhiAJDI8e/wixlQeXHBXyN NVMYbBclsPLmwsCnJkmxkzyDMkiV1FCEhQJTNESifvpb5QAere2LOcWhJ L0Scc91GuAzGZIlPRX4Dnm5Czq1OLJchqIYPnkOlI/gd5cXbt0kTyf4ga g==; X-CSE-ConnectionGUID: E4Ldo3/hR6uJj/i68Crl5A== X-CSE-MsgGUID: 3ecwGbkjRIej/2KykRpzlg== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="11888354" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="11888354" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:20 -0700 X-CSE-ConnectionGUID: E9PlOsFmTzCf6F7GpmkcpQ== X-CSE-MsgGUID: JTdP+oAhQ8SXGg8cfdOprQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="25195148" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:18 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi Subject: [PATCH 09/10] drm: move xe_pciids.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:16 +0300 Message-Id: <062692b89828bc94ac24397241d24674811db2c5.1712743191.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 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 3b30353dbc09..46b3ee310ee7 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 Wed Apr 10 10:05:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13624027 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 98BF9CD1296 for ; Wed, 10 Apr 2024 10:06:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FFB411318A; Wed, 10 Apr 2024 10:06:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RH/XoaNk"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id F142E11318A; Wed, 10 Apr 2024 10:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712743587; x=1744279587; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YAt7jmyAAjcZBpDC4lz2Sr6eMFL1ACEpDiDwNsHt4YE=; b=RH/XoaNkHVPFfgyq+OIBDQ0161inPHagYjn+smPDD3WbGLrwXCiqmIs5 /kw9efnqoKAXqvoqVTz7g6hd9YXUG3JlG59ivgaS3nCa1LBG3ksddkZsX Iv8ApXEL8nktBlP5bUT7DCrJ1y/bSSPNlMkoSFGzj1xlfk46zr5XH1Xiw oQVeKP2IQCtckGKtS9HUvRkw7mVKdYIhfD69aIGNyC5oiYbPt6PoRwfy3 ipsupotVPhkdDO6jE0eWc0aTqgiZJE+e9fXjRQnoV434b8Ugu+rZbntB7 aQz7zFjAseCpNxKIUD5AxJSrToy9yPPxCT4TdpIv/rjYQc7s1wqS/FzMK w==; X-CSE-ConnectionGUID: Hl1dy5RMQCmApQrvSjNDqQ== X-CSE-MsgGUID: rstEl2vHSumufPEBCab5GA== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="18808982" X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="18808982" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:26 -0700 X-CSE-ConnectionGUID: tS44JXqMTF6rDNzsufVgkA== X-CSE-MsgGUID: SEM/RZtFR6O0P8LtFFwRvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,190,1708416000"; d="scan'208";a="51735774" Received: from oakasatk-mobl.ger.corp.intel.com (HELO localhost) ([10.252.60.54]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2024 03:06:23 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: jani.nikula@intel.com, Daniel Vetter , Dave Airlie , Lucas De Marchi , Tomas Winkler Subject: [PATCH 10/10] drm: move i915_hdcp_interface.h under include/drm/intel Date: Wed, 10 Apr 2024 13:05:17 +0300 Message-Id: <17b644710dc9746efea88ce7c7fd61eea912321d.1712743191.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 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 0f4bd5710796..98d3b6a57b82 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 ac4b870f73fa..378ee3f426dc 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 Apr 11 15:45:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13626173 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 8C663C4345F for ; Thu, 11 Apr 2024 15:45:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2675410F1B2; Thu, 11 Apr 2024 15:45:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="U5xpbGya"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5D3D510F1AC; Thu, 11 Apr 2024 15:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712850319; x=1744386319; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XGWVELg2qaMdFfmrFFk9Y3LNwzmLrR+g9/UOYabFxBk=; b=U5xpbGyaVfqEaJjQbDhSgX+Tfo0psMlshRhi+Z5QR94zWjTVNGrlD9Hz oW7US1mOmODvBrI9atHX8Clohv43PgFEtzNxq3lZQ2HGrgbR0xBUcu5SY b+gcFXxJ2TTMK9aigqOSk+scDXknJSFlxY6ww+jA4OH8CAbylzXqk0sLM Ekp49FM8OSaE7gkJV6dkuXx31VHN94iYkQZBORWqwnHxW7mrXDpPqkc8V SZouCs+W5uGeOLaJUAofTjyNAJ/J5XUnLesJnpELTIxKsXfB2kv8AM7jd nNsombCsmEWzBLOHpE/XPT6hCQGhguUHlUytWdf2yvbQafKbbIuQWvIBW w==; X-CSE-ConnectionGUID: 6ajQWc8vQiaNSRU2f62YhQ== X-CSE-MsgGUID: 31q5U/VARIiN9/jcIf2Rvg== X-IronPort-AV: E=McAfee;i="6600,9927,11041"; a="18827087" X-IronPort-AV: E=Sophos;i="6.07,193,1708416000"; d="scan'208";a="18827087" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 08:45:12 -0700 X-CSE-ConnectionGUID: mKoR+sRVR5Kdo46fv9GmUQ== X-CSE-MsgGUID: QX44pQXpRma6ajjP/TPHdA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,193,1708416000"; d="scan'208";a="20845021" Received: from unknown (HELO localhost) ([10.237.66.160]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 08:45:08 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@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 Subject: [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Date: Thu, 11 Apr 2024 18:45:03 +0300 Message-Id: <20240411154503.342217-1-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" 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 Signed-off-by: Jani Nikula Acked-by: Rodrigo Vivi Reviewed-by: Andi Shyti --- MAINTAINERS | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e7a511b443af..a71254fdbf4c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10841,6 +10841,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 @@ -10858,7 +10859,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) @@ -10875,7 +10876,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