From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
Cc: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
"Lucas De Marchi" <lucas.demarchi@intel.com>,
"Oded Gabbay" <ogabbay@kernel.org>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: Re: [PATCH] drm/xe: Nuke xe's copy of intel_fbdev_fb.h
Date: Fri, 10 May 2024 12:29:06 +0300 [thread overview]
Message-ID: <87ttj6hv6l.fsf@intel.com> (raw)
In-Reply-To: <ZjvYFkUbsP_hXOG4@intel.com>
On Wed, 08 May 2024, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Tue, May 07, 2024 at 11:53:40AM +0300, Jani Nikula wrote:
>> On Mon, 06 May 2024, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
>> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> >
>> > 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älä <ville.syrjala@linux.intel.com>
>>
>> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
>
> 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?
>
>>
>> > ---
>> > 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 © 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 *helper,
>> > - 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
>>
>> --
>> Jani Nikula, Intel
--
Jani Nikula, Intel
prev parent reply other threads:[~2024-05-10 9:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 18:33 [PATCH] drm/xe: Nuke xe's copy of intel_fbdev_fb.h Ville Syrjala
2024-05-06 20:13 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2024-05-06 20:21 ` ✓ Fi.CI.BAT: success " Patchwork
2024-05-07 4:08 ` ✓ Fi.CI.IGT: " Patchwork
2024-05-07 8:53 ` [PATCH] " Jani Nikula
2024-05-08 19:52 ` Ville Syrjälä
2024-05-08 20:54 ` Lucas De Marchi
2024-05-10 9:29 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ttj6hv6l.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=ogabbay@kernel.org \
--cc=thomas.hellstrom@linux.intel.com \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).