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