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@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
> ---
> 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@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
