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 12608C4167B for ; Tue, 14 Nov 2023 11:01:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C42A710E214; Tue, 14 Nov 2023 11:01:34 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82CDF10E1FD for ; Tue, 14 Nov 2023 11:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699959687; x=1731495687; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6c0y3KkBN7szdaYGE8zUFwOQx4+csDxRUDH20j+0wCM=; b=X2CR0FIbdNAHrs4zV0GoyRpTA4rSaHXl1+0sufT4ET05mRYtrMdSGqSG 8jgUNQYkIZYe36y8vlOv1JBjHhblyRZdUZHdC6TPwYgvPsiWG4ivZKGan 3ySohK6XDM/fb051W6REYaGtZpYeimOpM69JV41/0byUBQYUT2UkMW3ZJ 1v7pqpTw75e23aY+zAYr7SxZKWQ326uATTgwzx8QerSB1mX9rAhKi35GG WxckgOy5DUb2MRFFBzUv5yTf3GP3YF1Ns0eWOCdDEnyUyAjBGN1TcG4j0 ogjiYYAI20hmEd5M8LSl99/5X2Czwty97HMCgtQGyVwTz/XyuI9qasYZ7 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="454924422" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="454924422" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 03:01:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="1096057502" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="1096057502" Received: from mmaiores-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.56.172]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 03:01:20 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Date: Tue, 14 Nov 2023 13:00:53 +0200 Message-Id: <20231114110056.2423853-7-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231114110056.2423853-1-jouni.hogander@intel.com> References: <20231114110056.2423853-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH 6/9] fixup! drm/xe/display: Implement display support 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: =?UTF-8?q?Jouni=20H=C3=B6gander?= Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" ifndef _I915_GEM_OBJECT_H_ was used in several header files due to copy paste error. Signed-off-by: Jouni Högander Signed-off-by: Maarten Lankhorst --- .../xe/compat-i915-headers/gem/i915_gem_object_frontbuffer.h | 4 ++-- drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_frontbuffer.h b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_frontbuffer.h index 227965e5f784..2a3f12d2978c 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_frontbuffer.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_frontbuffer.h @@ -3,8 +3,8 @@ * Copyright © 2022 Intel Corporation */ -#ifndef _I915_GEM_OBJECT_H_ -#define _I915_GEM_OBJECT_H_ +#ifndef _I915_GEM_OBJECT_FRONTBUFFER_H_ +#define _I915_GEM_OBJECT_FRONTBUFFER_H_ #define i915_gem_object_get_frontbuffer(obj) NULL #define i915_gem_object_set_frontbuffer(obj, front) (front) diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h index 32f60258ded6..888e7a87a925 100644 --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h @@ -1,5 +1,5 @@ -#ifndef _I915_GEM_OBJECT_H_ -#define _I915_GEM_OBJECT_H_ +#ifndef _I915_GEM_STOLEN_H_ +#define _I915_GEM_STOLEN_H_ #include "xe_ttm_stolen_mgr.h" #include "xe_res_cursor.h" -- 2.34.1