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 0D351C77B75 for ; Mon, 8 May 2023 14:47:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D093610E2C2; Mon, 8 May 2023 14:47:04 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEFA310E2C2 for ; Mon, 8 May 2023 14:47: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=1683557222; x=1715093222; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zip6wNunLqH864T2SW/aOFWHc/VAQdnKvNBNpta877M=; b=ARJSPCX6tM5AeIaDdaSP9kIgCcr8fVwRfzHFt9JM5OsdKjGez1ww5MUm He7EjiG6JXFF9dd/ydK437qCbZG8tG4OW2QHzjmTUPcUWec8eYpnsQU8w F5NZB9WdIMRpTKZIadq5Ln4KIMTLtFUXFzwny+cR2Iib5dsLGxlRoweoP Kw+LTU3FftcEBejueO3qmT86iEKcm7fbv/wXC6DKeKYvJxbuXur10u1FB Hkjmi9cS/jxnQgYXiwCGencwhmwGhbW0z68eapHPlXAd3qgVBOE7+v4iB 51uc80L22HvfAmzBrCTOHlZyNeFXwolBcdJFOk7WWD357MoAUCf2Xja+6 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="349697715" X-IronPort-AV: E=Sophos;i="5.99,259,1677571200"; d="scan'208";a="349697715" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 07:47:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="648908076" X-IronPort-AV: E=Sophos;i="5.99,259,1677571200"; d="scan'208";a="648908076" Received: from heid-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.62.78]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 07:46:59 -0700 From: Jani Nikula To: intel-xe@lists.freedesktop.org Date: Mon, 8 May 2023 17:46:06 +0300 Message-Id: <20230508144618.162140-7-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230508144618.162140-1-jani.nikula@intel.com> References: <20230508144618.162140-1-jani.nikula@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH 06/18] fixup! drm/i915/display: Remaining changes to make xe compile X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jani.nikula@intel.com, lucas.demarchi@intel.com, rodrigo.vivi@intel.com Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Use i915/display/intel_de.h for real. Signed-off-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_de.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h index 5c223ff6b3ec..22907719bb1e 100644 --- a/drivers/gpu/drm/i915/display/intel_de.h +++ b/drivers/gpu/drm/i915/display/intel_de.h @@ -3,9 +3,6 @@ * Copyright © 2019 Intel Corporation */ -#ifdef BUILD_FOR_XE -#include_next "intel_de.h" -#else #ifndef __INTEL_DE_H__ #define __INTEL_DE_H__ @@ -177,4 +174,3 @@ static inline int intel_de_pcode_request(struct drm_i915_private *i915, u32 mbox } #endif /* __INTEL_DE_H__ */ -#endif -- 2.39.2