public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 02/10] drm/i915: Disentangle i915_drv.h includes
Date: Mon, 11 Apr 2016 11:00:28 +0300	[thread overview]
Message-ID: <1460361628.7744.2.camel@linux.intel.com> (raw)
In-Reply-To: <1460200753-28466-3-git-send-email-chris@chris-wilson.co.uk>

On la, 2016-04-09 at 12:19 +0100, Chris Wilson wrote:
> Separate out the layers of includes (linux, drm, intel, i915) so that it
> is a little easier to order our definitions between our multiple
> reentrant headers. A couple of headers needed fixes to make them more
> standalone (forgotten includes, forward declarations etc).
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.h  | 29 +++++++++++++++++------------
>  drivers/gpu/drm/i915/intel_guc.h |  2 ++
>  drivers/gpu/drm/i915/intel_lrc.h |  2 ++
>  3 files changed, 21 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 542401659013..1753077aebbc 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -33,27 +33,32 @@
>  #include 
>  #include 
>  
> -#include 
> -#include "i915_params.h"
> -#include "i915_reg.h"
> -#include "intel_bios.h"
> -#include "intel_ringbuffer.h"
> -#include "intel_lrc.h"
> -#include "i915_gem_gtt.h"
> -#include "i915_gem_render_state.h"
>  #include 
>  #include 
>  #include 
> -#include 
> -#include  /* for struct drm_dma_handle */
> -#include 
>  #include 
>  #include 
>  #include 
>  #include 
>  #include 
> -#include "intel_guc.h"
> +#include 
> +
> +#include 
> +#include 
> +#include  /* for struct drm_dma_handle */
> +#include 
> +
> +#include "i915_params.h"
> +#include "i915_reg.h"
> +
> +#include "intel_bios.h"
>  #include "intel_dpll_mgr.h"
> +#include "intel_guc.h"
> +#include "intel_lrc.h"
> +#include "intel_ringbuffer.h"
> +
> +#include "i915_gem_gtt.h"
> +#include "i915_gem_render_state.h"
>  
>  /* General customization:
>   */
> diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
> index 73002e901ff2..3bb85b127cb0 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -27,6 +27,8 @@
>  #include "intel_guc_fwif.h"
>  #include "i915_guc_reg.h"
>  
> +struct drm_i915_gem_request;
> +
>  struct i915_guc_client {
>  	struct drm_i915_gem_object *client_obj;
>  	struct intel_context *owner;
> diff --git a/drivers/gpu/drm/i915/intel_lrc.h b/drivers/gpu/drm/i915/intel_lrc.h
> index 0b0853eee91e..5136a2cf50b5 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.h
> +++ b/drivers/gpu/drm/i915/intel_lrc.h
> @@ -24,6 +24,8 @@
>  #ifndef _INTEL_LRC_H_
>  #define _INTEL_LRC_H_
>  
> +#include "intel_ringbuffer.h"
> +
>  #define GEN8_LR_CONTEXT_ALIGN 4096
>  
>  /* Execlists regs */
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2016-04-11  7:59 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-09 11:19 EIO cleanup Chris Wilson
2016-04-09 11:19 ` [PATCH 01/10] drm/i915: Force clean compilation with -Werror Chris Wilson
2016-04-09 11:19 ` [PATCH 02/10] drm/i915: Disentangle i915_drv.h includes Chris Wilson
2016-04-11  8:00   ` Joonas Lahtinen [this message]
2016-04-09 11:19 ` [PATCH 03/10] drm/i915: Add GEM debugging Kconfig option Chris Wilson
2016-04-11  8:12   ` Joonas Lahtinen
2016-04-11  8:27     ` Chris Wilson
2016-04-09 11:19 ` [PATCH 04/10] drm/i915: Hide the atomic_read(reset_counter) behind a helper Chris Wilson
2016-04-09 11:19 ` [PATCH 05/10] drm/i915: Simplify checking of GPU reset_counter in display pageflips Chris Wilson
2016-04-09 11:19 ` [PATCH 06/10] drm/i915: Tighten reset_counter for reset status Chris Wilson
2016-04-09 11:19 ` [PATCH 07/10] drm/i915: Store the reset counter when constructing a request Chris Wilson
2016-04-11  7:56   ` Joonas Lahtinen
2016-04-09 11:19 ` [PATCH 08/10] drm/i915: Simplify reset_counter handling during atomic modesetting Chris Wilson
2016-04-09 11:19 ` [PATCH 09/10] drm/i915: Prevent leaking of -EIO from i915_wait_request() Chris Wilson
2016-04-09 11:19 ` [PATCH 10/10] drm/i915: Suppress error message when GPU resets are disabled Chris Wilson
2016-04-09 12:27 ` ✗ Fi.CI.BAT: failure for series starting with [01/10] drm/i915: Force clean compilation with -Werror Patchwork
2016-04-09 12:39   ` Chris Wilson

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=1460361628.7744.2.camel@linux.intel.com \
    --to=joonas.lahtinen@linux.intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.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