diff mbox

[v3,1/9] drm/i915: Make intel_uncore.h header self-contained

Message ID 20171003163607.61680-2-michal.wajdeczko@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michal Wajdeczko Oct. 3, 2017, 4:35 p.m. UTC
We're trying to resolve inter-header dependencies.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/intel_uncore.h | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Chris Wilson Oct. 3, 2017, 5:02 p.m. UTC | #1
Quoting Michal Wajdeczko (2017-10-03 17:35:59)
> We're trying to resolve inter-header dependencies.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  drivers/gpu/drm/i915/intel_uncore.h | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
> index 03786f9..66eae2c 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.h
> +++ b/drivers/gpu/drm/i915/intel_uncore.h
> @@ -25,6 +25,12 @@
>  #ifndef __INTEL_UNCORE_H__
>  #define __INTEL_UNCORE_H__
>  
> +#include <linux/spinlock.h>
> +#include <linux/notifier.h>
> +#include <linux/hrtimer.h>
> +
> +#include "i915_reg.h"

Hmm, what do we pull in directly? Something like i915_mmio_offset()?

In my head I have i915_reg.h == unwieldy list of register defines and
nothing more.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>

Looks sensible but if it's only one small thing for i915_reg.h can you
add a comment and we can try and split it up.
-Chris
Michal Wajdeczko Oct. 3, 2017, 6:16 p.m. UTC | #2
On Tue, 03 Oct 2017 19:02:42 +0200, Chris Wilson  
<chris@chris-wilson.co.uk> wrote:

> Quoting Michal Wajdeczko (2017-10-03 17:35:59)
>> We're trying to resolve inter-header dependencies.
>>
>> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> ---
>>  drivers/gpu/drm/i915/intel_uncore.h | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_uncore.h  
>> b/drivers/gpu/drm/i915/intel_uncore.h
>> index 03786f9..66eae2c 100644
>> --- a/drivers/gpu/drm/i915/intel_uncore.h
>> +++ b/drivers/gpu/drm/i915/intel_uncore.h
>> @@ -25,6 +25,12 @@
>>  #ifndef __INTEL_UNCORE_H__
>>  #define __INTEL_UNCORE_H__
>>
>> +#include <linux/spinlock.h>
>> +#include <linux/notifier.h>
>> +#include <linux/hrtimer.h>
>> +
>> +#include "i915_reg.h"
>
> Hmm, what do we pull in directly? Something like i915_mmio_offset()?
>
> In my head I have i915_reg.h == unwieldy list of register defines and
> nothing more.

We need this:

typedef struct {
	uint32_t reg;
} i915_reg_t;

>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Looks sensible but if it's only one small thing for i915_reg.h can you
> add a comment and we can try and split it up.
> -Chris
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_uncore.h b/drivers/gpu/drm/i915/intel_uncore.h
index 03786f9..66eae2c 100644
--- a/drivers/gpu/drm/i915/intel_uncore.h
+++ b/drivers/gpu/drm/i915/intel_uncore.h
@@ -25,6 +25,12 @@ 
 #ifndef __INTEL_UNCORE_H__
 #define __INTEL_UNCORE_H__
 
+#include <linux/spinlock.h>
+#include <linux/notifier.h>
+#include <linux/hrtimer.h>
+
+#include "i915_reg.h"
+
 struct drm_i915_private;
 
 enum forcewake_domain_id {