From mboxrd@z Thu Jan 1 00:00:00 1970 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 D625FC6FD1D for ; Thu, 23 Mar 2023 12:09:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B137410EA7C; Thu, 23 Mar 2023 12:09:39 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F62810EA7C for ; Thu, 23 Mar 2023 12:09: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=1679573378; x=1711109378; h=message-id:date:mime-version:subject:to:references:from: in-reply-to:content-transfer-encoding; bh=O9GMGmVnWKdp86o1jbK7N3hGdi4GKsiI1Fyv+3i711A=; b=iOJyoAzqU4NgZT7XEkG5Jekjrtn0FxhK+gD02dclcI8p/Cv37b4ibjXg M/ME3OzqW9JCvqfrnjQYul3meljJ0nvYKlgprKpQF3nctGFCW/tvdFgnh 8YwYW+UqFJBbvb5nKKu4gxwXvWVnrWrt7ww7GUH+58aTlHaxJcCYuzSlC syYXQxCurRt2wqtGc0qTFIVbW87veUEpMY0a6/VD3lDXZBz5jgdcfmaXl B7zPOVDRdmEV4feHOQ8RnzZ9aKiCXPLHDQFWsZ8Uq15c7taN5pGyHQCTV 4KB0vvFrcBKgCWD7YI6HJB5dXaHEQJpHRpirU7ULzFaBPWJ5wVlE0xYCp A==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="319122548" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="319122548" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:09:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="825795800" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="825795800" Received: from ymekhani-mobl2.amr.corp.intel.com (HELO [10.251.222.144]) ([10.251.222.144]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:09:27 -0700 Message-ID: Date: Thu, 23 Mar 2023 13:09:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0 Thunderbird/102.9.0 Content-Language: en-US To: Jani Nikula , intel-xe@lists.freedesktop.org, =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= References: <20230323085052.153697-1-maarten.lankhorst@linux.intel.com> <875yar7n01.fsf@intel.com> <87zg83678k.fsf@intel.com> From: Maarten Lankhorst In-Reply-To: <87zg83678k.fsf@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Intel-xe] [PATCH] drm/xe: Rename intel_de.h to xe_de.h 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: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On 2023-03-23 12:24, Jani Nikula wrote: > On Thu, 23 Mar 2023, Maarten Lankhorst wrote: >> On 2023-03-23 11:58, Jani Nikula wrote: >>> On Thu, 23 Mar 2023, Maarten Lankhorst wrote: >>>> Rename intel_de.h to xe_de.h in order to remove #include_next, >>>> and change the ifdef guard to be the same as the rest of xe headers. >>>> >>>> This is consistent with the other files that are inside xe/display, >>>> and implement xe specific behavior. >>>> >>>> Signed-off-by: Maarten Lankhorst >>>> --- >>>> drivers/gpu/drm/i915/display/intel_de.h | 2 +- >>>> drivers/gpu/drm/xe/display/{intel_de.h => xe_de.h} | 8 ++++---- >>>> 2 files changed, 5 insertions(+), 5 deletions(-) >>>> rename drivers/gpu/drm/xe/display/{intel_de.h => xe_de.h} (97%) >>>> >>>> diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h >>>> index 5c223ff6b3ec..267b1108abbb 100644 >>>> --- a/drivers/gpu/drm/i915/display/intel_de.h >>>> +++ b/drivers/gpu/drm/i915/display/intel_de.h >>>> @@ -4,7 +4,7 @@ >>>> */ >>>> >>>> #ifdef BUILD_FOR_XE >>> I wonder why this isn't just >>> >>> #ifndef I915 >>> >>> and why do we need the separate >>> >>> -DBUILD_FOR_XE=1 \ >>> >>> in xe Makefile? >> If you give the ack, I will remove the BUILD_FOR_XE too when committing. > Ack, FWIW. All this needs to be squashed to something else, > eventually... > > BR, > Jani. Thanks, pushed! I think BUILD_FOR_XE was introduced when we stopped doing the symlinks in xe, but ifndef I915 also works since this was the only user. ~Maarten