From patchwork Fri Mar 11 10:06:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 12777735 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 28787C433F5 for ; Fri, 11 Mar 2022 10:06:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B7C0110E88B; Fri, 11 Mar 2022 10:06:49 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC9C210E88B for ; Fri, 11 Mar 2022 10:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646993208; x=1678529208; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=tcb0awIFqKevEQXb7Bu45BtCNoGl1aqkIfpE0YCMK60=; b=W7FVYzhik+drYNHVQ6kpGCFfneYMhMs4rOKoJcWqtdBSv9QWA4UOuY54 8sySEq346EBurSgIDQxl/SBtvkyEDdjxPh97ZMTnXBJIfOfWaWHuZ6gie BgF0CxQgUHYxSkzk11wGYf56J680okXuJv6GVygQuYfy7imphfu6Gg9oB Ri0jFw1ejpHyDNlCrCYbA1kKfiX6eSk2gvQpV/RChvc7dDZ1516HwnP75 FTbkQkkLGgtQa7Cy0+++AuHA5ecZ9ov7sB1eoemgFaCAFN7wGL2rEmbRt 5x+I8QF1cqZwToJ2PEG3ZlC7lcAU0z0GAHxQfltLe52Io16cGzxEhBG4k Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="237717724" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="237717724" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 02:06:48 -0800 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="555245657" Received: from cchitora-mobl.ger.corp.intel.com (HELO localhost) ([10.252.46.187]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 02:06:46 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Fri, 11 Mar 2022 12:06:38 +0200 Message-Id: <20220311100639.114685-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, jani.nikula@intel.com, x86@kernel.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" early-quirks.c is the only user of drm/i915_drm.h that also needs drm/i915_pciids.h. Include the masses of PCI ID macros only where needed. Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Cc: x86@kernel.org Signed-off-by: Jani Nikula Acked-by: Bjorn Helgaas --- I'm hoping to merge this via drm-intel with the other patch. --- arch/x86/kernel/early-quirks.c | 1 + include/drm/i915_drm.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index bd6dad83c65b..805596736e20 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 6722005884db..afbf3ef5643e 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -26,7 +26,6 @@ #ifndef _I915_DRM_H_ #define _I915_DRM_H_ -#include #include /* For use by IPS driver */