[v2,04/13] drm/i915: make i915_gem_gtt.h self-contained

Submitted by Jani Nikula on June 26, 2019, 2:40 p.m.

Details

Message ID 20190626144020.2155-5-jani.nikula@intel.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Intel GFX

Not browsing as part of any series.

Commit Message

Jani Nikula June 26, 2019, 2:40 p.m.
Add the minimal includes/declarations to make the header self-contained,
and ensure it stays that way.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 028be3b44d07..883a5ed146c3 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -42,6 +42,8 @@ 
 
 #include <drm/drm_mm.h>
 
+#include <drm/drm_mm.h>
+
 #include "gt/intel_reset.h"
 #include "i915_gem_fence_reg.h"
 #include "i915_request.h"

Comments

On Wed, 26 Jun 2019 16:40:11 +0200, Jani Nikula <jani.nikula@intel.com>  
wrote:

> Add the minimal includes/declarations to make the header self-contained,
> and ensure it stays that way.
>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h  
> b/drivers/gpu/drm/i915/i915_gem_gtt.h
> index 028be3b44d07..883a5ed146c3 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
> @@ -42,6 +42,8 @@
> #include <drm/drm_mm.h>
> +#include <drm/drm_mm.h>

this seems to be redundant ;)

> +
>  #include "gt/intel_reset.h"
>  #include "i915_gem_fence_reg.h"
>  #include "i915_request.h"
On Wed, 26 Jun 2019, Michal Wajdeczko <michal.wajdeczko@intel.com> wrote:
> On Wed, 26 Jun 2019 16:40:11 +0200, Jani Nikula <jani.nikula@intel.com>  
> wrote:
>
>> Add the minimal includes/declarations to make the header self-contained,
>> and ensure it stays that way.
>>
>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h  
>> b/drivers/gpu/drm/i915/i915_gem_gtt.h
>> index 028be3b44d07..883a5ed146c3 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
>> @@ -42,6 +42,8 @@
>> #include <drm/drm_mm.h>
>> +#include <drm/drm_mm.h>
>
> this seems to be redundant ;)

Gah, curiously silent rebase fail. Thanks for spotting!

BR,
Jani.

>
>> +
>>  #include "gt/intel_reset.h"
>>  #include "i915_gem_fence_reg.h"
>>  #include "i915_request.h"
On Wed, 26 Jun 2019, Jani Nikula <jani.nikula@intel.com> wrote:
> On Wed, 26 Jun 2019, Michal Wajdeczko <michal.wajdeczko@intel.com> wrote:
>> On Wed, 26 Jun 2019 16:40:11 +0200, Jani Nikula <jani.nikula@intel.com>  
>> wrote:
>>
>>> Add the minimal includes/declarations to make the header self-contained,
>>> and ensure it stays that way.
>>>
>>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>> ---
>>>  drivers/gpu/drm/i915/i915_gem_gtt.h | 2 ++
>>>  1 file changed, 2 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h  
>>> b/drivers/gpu/drm/i915/i915_gem_gtt.h
>>> index 028be3b44d07..883a5ed146c3 100644
>>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.h
>>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
>>> @@ -42,6 +42,8 @@
>>> #include <drm/drm_mm.h>
>>> +#include <drm/drm_mm.h>
>>
>> this seems to be redundant ;)
>
> Gah, curiously silent rebase fail. Thanks for spotting!

Heh, I went back to fix it, but we can just drop this one. It was all
done by Chris in b32fa8111563 ("drm/i915/gtt: Defer address space
cleanup to an RCU worker").

J.





>
> BR,
> Jani.
>
>>
>>> +
>>>  #include "gt/intel_reset.h"
>>>  #include "i915_gem_fence_reg.h"
>>>  #include "i915_request.h"