From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org,
Bjorn Helgaas <bhelgaas@google.com>,
linux-pci@vger.kernel.org, x86@kernel.org
Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
Date: Thu, 17 Mar 2022 19:50:17 +0200 [thread overview]
Message-ID: <YjN02ff81NR8EPFI@intel.com> (raw)
In-Reply-To: <20220311100639.114685-2-jani.nikula@intel.com>
On Fri, Mar 11, 2022 at 12:06:39PM +0200, Jani Nikula wrote:
> Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
> being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
> drm/i915_drm.h only where needed.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Looks sensible to me. Series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
> drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
> drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
> drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
> drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
> include/drm/i915_drm.h | 2 +-
> 6 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 444f8268b9c5..ede084f36ca9 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "gem/i915_gem_region.h"
> #include "gem/i915_gem_lmem.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> index c9b2e8b91053..f4fbae2f9dcc 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "i915_gem_region.h"
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
> index 1c841f68169a..ded78b83e0b5 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
> @@ -5,6 +5,8 @@
>
> #include <linux/prandom.h>
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "i915_drv.h"
> #include "i915_ttm_buddy_manager.h"
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
> index 21dcbd620758..bbc35ec5c090 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.h
> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
> @@ -10,7 +10,7 @@
> #include <linux/mutex.h>
> #include <linux/io-mapping.h>
> #include <drm/drm_mm.h>
> -#include <drm/i915_drm.h>
> +#include <uapi/drm/i915_drm.h>
>
> struct drm_i915_private;
> struct drm_i915_gem_object;
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> index 598840b73dfa..92b00b4de240 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> @@ -3,8 +3,6 @@
> * Copyright(c) 2020, Intel Corporation. All rights reserved.
> */
>
> -#include <drm/i915_drm.h>
> -
> #include "i915_drv.h"
>
> #include "intel_pxp.h"
> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> index afbf3ef5643e..7adce327c1c2 100644
> --- a/include/drm/i915_drm.h
> +++ b/include/drm/i915_drm.h
> @@ -26,7 +26,7 @@
> #ifndef _I915_DRM_H_
> #define _I915_DRM_H_
>
> -#include <uapi/drm/i915_drm.h>
> +#include <linux/types.h>
>
> /* For use by IPS driver */
> unsigned long i915_read_mch_val(void);
> --
> 2.30.2
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2022-03-17 17:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 10:06 [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
2022-03-11 10:06 ` [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
2022-03-17 17:50 ` Ville Syrjälä [this message]
2022-03-17 18:23 ` [Intel-gfx] " Jani Nikula
2022-03-11 16:21 ` [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Bjorn Helgaas
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=YjN02ff81NR8EPFI@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-pci@vger.kernel.org \
--cc=x86@kernel.org \
/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 NNTP newsgroup(s).