diff mbox series

[1/4] drm/i915/gvt: remove unused to_gvt() and reduce includes

Message ID 20230926121904.499888-1-jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show
Series [1/4] drm/i915/gvt: remove unused to_gvt() and reduce includes | expand

Commit Message

Jani Nikula Sept. 26, 2023, 12:19 p.m. UTC
gvt.h has no need to include i915_drv.h once the unused to_gvt() has
been removed.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Jani Nikula Oct. 4, 2023, 12:54 p.m. UTC | #1
On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
> gvt.h has no need to include i915_drv.h once the unused to_gvt() has
> been removed.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Zhenyu, Zhi, ping?

BR,
Jani.



> ---
>  drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
> index 53a0a42a50db..3a0624fe63bf 100644
> --- a/drivers/gpu/drm/i915/gvt/gvt.h
> +++ b/drivers/gpu/drm/i915/gvt/gvt.h
> @@ -39,7 +39,7 @@
>  
>  #include <asm/kvm_page_track.h>
>  
> -#include "i915_drv.h"
> +#include "gt/intel_gt.h"
>  #include "intel_gvt.h"
>  
>  #include "debug.h"
> @@ -368,11 +368,6 @@ struct intel_gvt {
>  	struct dentry *debugfs_root;
>  };
>  
> -static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915)
> -{
> -	return i915->gvt;
> -}
> -
>  enum {
>  	/* Scheduling trigger by timer */
>  	INTEL_GVT_REQUEST_SCHED = 0,
Wang, Zhi A Oct. 4, 2023, 4:03 p.m. UTC | #2
Singed-off-by: Zhi Wang <zhi.a.wang@intel.com>

Thanks,
Zhi.

-----Original Message-----
From: Nikula, Jani <jani.nikula@intel.com> 
Sent: Wednesday, October 4, 2023 3:54 PM
To: intel-gvt-dev@lists.freedesktop.org; Zhenyu Wang <zhenyuw@linux.intel.com>; Wang, Zhi A <zhi.a.wang@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/4] drm/i915/gvt: remove unused to_gvt() and reduce includes

On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
> gvt.h has no need to include i915_drv.h once the unused to_gvt() has 
> been removed.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Zhenyu, Zhi, ping?

BR,
Jani.



> ---
>  drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/gvt.h 
> b/drivers/gpu/drm/i915/gvt/gvt.h index 53a0a42a50db..3a0624fe63bf 
> 100644
> --- a/drivers/gpu/drm/i915/gvt/gvt.h
> +++ b/drivers/gpu/drm/i915/gvt/gvt.h
> @@ -39,7 +39,7 @@
>  
>  #include <asm/kvm_page_track.h>
>  
> -#include "i915_drv.h"
> +#include "gt/intel_gt.h"
>  #include "intel_gvt.h"
>  
>  #include "debug.h"
> @@ -368,11 +368,6 @@ struct intel_gvt {
>  	struct dentry *debugfs_root;
>  };
>  
> -static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915) 
> -{
> -	return i915->gvt;
> -}
> -
>  enum {
>  	/* Scheduling trigger by timer */
>  	INTEL_GVT_REQUEST_SCHED = 0,

--
Jani Nikula, Intel
Jani Nikula Oct. 4, 2023, 4:33 p.m. UTC | #3
On Wed, 04 Oct 2023, "Wang, Zhi A" <zhi.a.wang@intel.com> wrote:
> Singed-off-by: Zhi Wang <zhi.a.wang@intel.com>

Mmh, sorry, what does that mean here? Are you picking them up via gvt?

BR,
Jani.

>
> Thanks,
> Zhi.
>
> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Wednesday, October 4, 2023 3:54 PM
> To: intel-gvt-dev@lists.freedesktop.org; Zhenyu Wang <zhenyuw@linux.intel.com>; Wang, Zhi A <zhi.a.wang@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [PATCH 1/4] drm/i915/gvt: remove unused to_gvt() and reduce includes
>
> On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
>> gvt.h has no need to include i915_drv.h once the unused to_gvt() has
>> been removed.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Zhenyu, Zhi, ping?
>
> BR,
> Jani.
>
>
>
>> ---
>>  drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
>>  1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/gvt.h
>> b/drivers/gpu/drm/i915/gvt/gvt.h index 53a0a42a50db..3a0624fe63bf
>> 100644
>> --- a/drivers/gpu/drm/i915/gvt/gvt.h
>> +++ b/drivers/gpu/drm/i915/gvt/gvt.h
>> @@ -39,7 +39,7 @@
>>
>>  #include <asm/kvm_page_track.h>
>>
>> -#include "i915_drv.h"
>> +#include "gt/intel_gt.h"
>>  #include "intel_gvt.h"
>>
>>  #include "debug.h"
>> @@ -368,11 +368,6 @@ struct intel_gvt {
>>       struct dentry *debugfs_root;
>>  };
>>
>> -static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915)
>> -{
>> -     return i915->gvt;
>> -}
>> -
>>  enum {
>>       /* Scheduling trigger by timer */
>>       INTEL_GVT_REQUEST_SCHED = 0,
>
> --
> Jani Nikula, Intel
Wang, Zhi A Oct. 4, 2023, 5:02 p.m. UTC | #4
I will try to ping Zhenyu to pick it up from GVT-g. 

Thanks,
Zhi.

-----Original Message-----
From: Nikula, Jani <jani.nikula@intel.com> 
Sent: Wednesday, October 4, 2023 7:33 PM
To: Wang, Zhi A <zhi.a.wang@intel.com>; intel-gvt-dev@lists.freedesktop.org; Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: RE: [PATCH 1/4] drm/i915/gvt: remove unused to_gvt() and reduce includes

On Wed, 04 Oct 2023, "Wang, Zhi A" <zhi.a.wang@intel.com> wrote:
> Singed-off-by: Zhi Wang <zhi.a.wang@intel.com>

Mmh, sorry, what does that mean here? Are you picking them up via gvt?

BR,
Jani.

>
> Thanks,
> Zhi.
>
> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Wednesday, October 4, 2023 3:54 PM
> To: intel-gvt-dev@lists.freedesktop.org; Zhenyu Wang 
> <zhenyuw@linux.intel.com>; Wang, Zhi A <zhi.a.wang@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [PATCH 1/4] drm/i915/gvt: remove unused to_gvt() and 
> reduce includes
>
> On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
>> gvt.h has no need to include i915_drv.h once the unused to_gvt() has 
>> been removed.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Zhenyu, Zhi, ping?
>
> BR,
> Jani.
>
>
>
>> ---
>>  drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
>>  1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/gvt.h 
>> b/drivers/gpu/drm/i915/gvt/gvt.h index 53a0a42a50db..3a0624fe63bf
>> 100644
>> --- a/drivers/gpu/drm/i915/gvt/gvt.h
>> +++ b/drivers/gpu/drm/i915/gvt/gvt.h
>> @@ -39,7 +39,7 @@
>>
>>  #include <asm/kvm_page_track.h>
>>
>> -#include "i915_drv.h"
>> +#include "gt/intel_gt.h"
>>  #include "intel_gvt.h"
>>
>>  #include "debug.h"
>> @@ -368,11 +368,6 @@ struct intel_gvt {
>>       struct dentry *debugfs_root;
>>  };
>>
>> -static inline struct intel_gvt *to_gvt(struct drm_i915_private 
>> *i915) -{
>> -     return i915->gvt;
>> -}
>> -
>>  enum {
>>       /* Scheduling trigger by timer */
>>       INTEL_GVT_REQUEST_SCHED = 0,
>
> --
> Jani Nikula, Intel

--
Jani Nikula, Intel
Zhenyu Wang Oct. 11, 2023, 5:07 a.m. UTC | #5
On 2023.10.04 15:54:11 +0300, Jani Nikula wrote:
> On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
> > gvt.h has no need to include i915_drv.h once the unused to_gvt() has
> > been removed.
> >
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> Zhenyu, Zhi, ping?
> 

Sorry for late reply, as last week was full holiday here.

Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>

I don't think I need to do extra pick and pull request for this or
let me know if you has question.

Thanks!

> 
> 
> 
> > ---
> >  drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
> >  1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
> > index 53a0a42a50db..3a0624fe63bf 100644
> > --- a/drivers/gpu/drm/i915/gvt/gvt.h
> > +++ b/drivers/gpu/drm/i915/gvt/gvt.h
> > @@ -39,7 +39,7 @@
> >  
> >  #include <asm/kvm_page_track.h>
> >  
> > -#include "i915_drv.h"
> > +#include "gt/intel_gt.h"
> >  #include "intel_gvt.h"
> >  
> >  #include "debug.h"
> > @@ -368,11 +368,6 @@ struct intel_gvt {
> >  	struct dentry *debugfs_root;
> >  };
> >  
> > -static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915)
> > -{
> > -	return i915->gvt;
> > -}
> > -
> >  enum {
> >  	/* Scheduling trigger by timer */
> >  	INTEL_GVT_REQUEST_SCHED = 0,
> 
> -- 
> Jani Nikula, Intel
Jani Nikula Oct. 11, 2023, 7:04 a.m. UTC | #6
On Wed, 11 Oct 2023, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> On 2023.10.04 15:54:11 +0300, Jani Nikula wrote:
>> On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
>> > gvt.h has no need to include i915_drv.h once the unused to_gvt() has
>> > been removed.
>> >
>> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> 
>> Zhenyu, Zhi, ping?
>> 
>
> Sorry for late reply, as last week was full holiday here.
>
> Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
>
> I don't think I need to do extra pick and pull request for this or
> let me know if you has question.

Did you pick them up to gvt-next or shall I pick them up to
drm-intel-next?

If the former, I think I'd actually like a pull request, because
otherwise the trees will be out-of-sync for a long time.


BR,
Jani.


>
> Thanks!
>
>> 
>> 
>> 
>> > ---
>> >  drivers/gpu/drm/i915/gvt/gvt.h | 7 +------
>> >  1 file changed, 1 insertion(+), 6 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
>> > index 53a0a42a50db..3a0624fe63bf 100644
>> > --- a/drivers/gpu/drm/i915/gvt/gvt.h
>> > +++ b/drivers/gpu/drm/i915/gvt/gvt.h
>> > @@ -39,7 +39,7 @@
>> >  
>> >  #include <asm/kvm_page_track.h>
>> >  
>> > -#include "i915_drv.h"
>> > +#include "gt/intel_gt.h"
>> >  #include "intel_gvt.h"
>> >  
>> >  #include "debug.h"
>> > @@ -368,11 +368,6 @@ struct intel_gvt {
>> >  	struct dentry *debugfs_root;
>> >  };
>> >  
>> > -static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915)
>> > -{
>> > -	return i915->gvt;
>> > -}
>> > -
>> >  enum {
>> >  	/* Scheduling trigger by timer */
>> >  	INTEL_GVT_REQUEST_SCHED = 0,
>> 
>> -- 
>> Jani Nikula, Intel
Zhenyu Wang Oct. 11, 2023, 8:44 a.m. UTC | #7
On 2023.10.11 10:04:09 +0300, Jani Nikula wrote:
> On Wed, 11 Oct 2023, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> > On 2023.10.04 15:54:11 +0300, Jani Nikula wrote:
> >> On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
> >> > gvt.h has no need to include i915_drv.h once the unused to_gvt() has
> >> > been removed.
> >> >
> >> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> >> 
> >> Zhenyu, Zhi, ping?
> >> 
> >
> > Sorry for late reply, as last week was full holiday here.
> >
> > Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
> >
> > I don't think I need to do extra pick and pull request for this or
> > let me know if you has question.
> 
> Did you pick them up to gvt-next or shall I pick them up to
> drm-intel-next?
> 
> If the former, I think I'd actually like a pull request, because
> otherwise the trees will be out-of-sync for a long time.
> 

Sorry, I mean it's fine for me if you directly pick them for drm-intel-next.

thanks
Jani Nikula Oct. 11, 2023, 11:36 a.m. UTC | #8
On Wed, 11 Oct 2023, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
> On 2023.10.11 10:04:09 +0300, Jani Nikula wrote:
>> On Wed, 11 Oct 2023, Zhenyu Wang <zhenyuw@linux.intel.com> wrote:
>> > On 2023.10.04 15:54:11 +0300, Jani Nikula wrote:
>> >> On Tue, 26 Sep 2023, Jani Nikula <jani.nikula@intel.com> wrote:
>> >> > gvt.h has no need to include i915_drv.h once the unused to_gvt() has
>> >> > been removed.
>> >> >
>> >> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> >> 
>> >> Zhenyu, Zhi, ping?
>> >> 
>> >
>> > Sorry for late reply, as last week was full holiday here.
>> >
>> > Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
>> >
>> > I don't think I need to do extra pick and pull request for this or
>> > let me know if you has question.
>> 
>> Did you pick them up to gvt-next or shall I pick them up to
>> drm-intel-next?
>> 
>> If the former, I think I'd actually like a pull request, because
>> otherwise the trees will be out-of-sync for a long time.
>> 
>
> Sorry, I mean it's fine for me if you directly pick them for drm-intel-next.

Thanks for the review, pushed to drm-intel-next.

BR,
Jani.
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 53a0a42a50db..3a0624fe63bf 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -39,7 +39,7 @@ 
 
 #include <asm/kvm_page_track.h>
 
-#include "i915_drv.h"
+#include "gt/intel_gt.h"
 #include "intel_gvt.h"
 
 #include "debug.h"
@@ -368,11 +368,6 @@  struct intel_gvt {
 	struct dentry *debugfs_root;
 };
 
-static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915)
-{
-	return i915->gvt;
-}
-
 enum {
 	/* Scheduling trigger by timer */
 	INTEL_GVT_REQUEST_SCHED = 0,