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 0B7CEC25B4F for ; Fri, 10 May 2024 09:29:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BEE1910E724; Fri, 10 May 2024 09:29:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="IrYaZSGP"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4BB7310E724; Fri, 10 May 2024 09:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715333353; x=1746869353; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=jOlGr0f07G7nohP2bQvUoPkQdT1zw/VTSHnpfs13NtI=; b=IrYaZSGPhDYj4mHg0iJgRotCP6u/hnQOqa6JqQ5PoTyrRI6Di6dG9X9h wrrhm3XBh75BOKvImdlwWlhCgkwyBekjOJ+5zpOYD72fO8Nxl2uV3xK99 C9Ea9Q4Xt6H6HFsoYtSSWEIco3GR1gAHcF+wRL65Ka4LubF2jRoA6bw8z xB7YodX0/4TryvN6/dvx2q+mykhSRcr92g7sXTTRZHQnNstHbOywTpEvC bSFbs1c/UyAHiPGhHzgdsfinw0JpDTZB5XhYUBjeRnkSKqlqOEYyBjzPZ xaVK5IW8Zr1TXYIo77D74E9yE+M4ILWpleFA9APIIGZqHTz5xzI19eADT g==; X-CSE-ConnectionGUID: qicKNE1GRTWDmbgu6Z8YSw== X-CSE-MsgGUID: 1QZ47nhMTumPJJmlNrFYow== X-IronPort-AV: E=McAfee;i="6600,9927,11068"; a="11184724" X-IronPort-AV: E=Sophos;i="6.08,150,1712646000"; d="scan'208";a="11184724" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2024 02:29:13 -0700 X-CSE-ConnectionGUID: Pm2bPyxXS8ieN44SkxnrkA== X-CSE-MsgGUID: Xif+8oVrRQyFEUvg/IFn5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,150,1712646000"; d="scan'208";a="34333187" Received: from ettammin-desk.ger.corp.intel.com (HELO localhost) ([10.245.246.180]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2024 02:29:10 -0700 From: Jani Nikula To: Ville =?utf-8?B?U3lyasOkbMOk?= Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Lucas De Marchi , Oded Gabbay , Thomas =?utf-8?Q?Hellstr=C3=B6m?= Subject: Re: [PATCH] drm/xe: Nuke xe's copy of intel_fbdev_fb.h In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20240506183331.7720-1-ville.syrjala@linux.intel.com> <87msp2knor.fsf@intel.com> Date: Fri, 10 May 2024 12:29:06 +0300 Message-ID: <87ttj6hv6l.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Wed, 08 May 2024, Ville Syrj=C3=A4l=C3=A4 wrote: > On Tue, May 07, 2024 at 11:53:40AM +0300, Jani Nikula wrote: >> On Mon, 06 May 2024, Ville Syrjala wrote: >> > From: Ville Syrj=C3=A4l=C3=A4 >> > >> > For some reason xe and i915 each have an identical (fortunately) >> > copy of intel_fbdev_fb.h. The xe copy actually only gets included >> > by xe's intel_fbdev_fb.c, and the i915 copy by everyone else, >> > include intel_fbdev.c which is the actual caller of the >> > functions declared in the header. >> > >> > This means the xe and i915 headers are free to define/declare >> > completely incompatible things and the build would still succeed >> > as long as the symbol names match. >> > >> > That is not a good thing, so let's nuke xe's copy of the header >> > so that everyone will use the same header, and be forced to >> > agree on the same API/ABI. >> > >> > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 >>=20 >> Reviewed-by: Jani Nikula > > Thanks. > > I was going to push this to drm-xe-next, but I should actually > push it to drm-intel-next since I'll be massaging this stuff > there. Yeah, things often run more smoothly if we merge xe/display/ changes via drm-intel-next. It can take a while to merge stuff to drm-next and backmerge to respective drivers to sync it all up. BR, Jani. > > xe maintainers, ack for merging via drm-intel-next? > >>=20 >> > --- >> > drivers/gpu/drm/xe/display/intel_fbdev_fb.h | 21 --------------------- >> > 1 file changed, 21 deletions(-) >> > delete mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.h >> > >> > diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.h b/drivers/gpu= /drm/xe/display/intel_fbdev_fb.h >> > deleted file mode 100644 >> > index ea186772e0bb..000000000000 >> > --- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.h >> > +++ /dev/null >> > @@ -1,21 +0,0 @@ >> > -/* SPDX-License-Identifier: MIT */ >> > -/* >> > - * Copyright =C2=A9 2023 Intel Corporation >> > - */ >> > - >> > -#ifndef __INTEL_FBDEV_FB_H__ >> > -#define __INTEL_FBDEV_FB_H__ >> > - >> > -struct drm_fb_helper; >> > -struct drm_fb_helper_surface_size; >> > -struct drm_i915_gem_object; >> > -struct drm_i915_private; >> > -struct fb_info; >> > -struct i915_vma; >> > - >> > -struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *he= lper, >> > - struct drm_fb_helper_surface_size *sizes); >> > -int intel_fbdev_fb_fill_info(struct drm_i915_private *i915, struct fb= _info *info, >> > - struct drm_i915_gem_object *obj, struct i915_vma *vma); >> > - >> > -#endif >>=20 >> --=20 >> Jani Nikula, Intel --=20 Jani Nikula, Intel