[Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[kernel test robot]

tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
head:   d1f59526925ae851c6abf77af8ae6f8c3cffeebd
commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <yujie.liu@intel.com>
| Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/

includecheck warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.

vim +9 drivers/gpu/drm/i915/display/intel_display_power.h

     8	
   > 9	#include <linux/mutex.h>
    10	#include <linux/workqueue.h>
    11	
    12	#include "intel_wakeref.h"
    13	#include <linux/types.h>
    14	#include <linux/bitops.h>
  > 15	#include <linux/mutex.h>
    16	#include <linux/workqueue.h>
    17	#include "intel_runtime_pm.h"
    18	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

Re: [Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Jani Nikula]

On Tue, 07 Nov 2023, kernel test robot <yujie.liu@intel.com> wrote:
> tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru

Why do we have this stale branch? I don't think developers should push
their branches to xe/kernel.git but their own repos instead.

BR,
Jani.


> head:   d1f59526925ae851c6abf77af8ae6f8c3cffeebd
> commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
> compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <yujie.liu@intel.com>
> | Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
>
> includecheck warnings: (new ones prefixed by >>)
>>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.
>
> vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
>
>      8	
>    > 9	#include <linux/mutex.h>
>     10	#include <linux/workqueue.h>
>     11	
>     12	#include "intel_wakeref.h"
>     13	#include <linux/types.h>
>     14	#include <linux/bitops.h>
>   > 15	#include <linux/mutex.h>
>     16	#include <linux/workqueue.h>
>     17	#include "intel_runtime_pm.h"
>     18	

-- 
Jani Nikula, Intel

Re: [Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Zeng, Oak]

> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Tuesday, November 7, 2023 3:42 AM
> To: Liu, Yujie <yujie.liu@intel.com>; Zeng, Oak <oak.zeng@intel.com>
> Cc: oe-kbuild-all@lists.linux.dev; intel-xe@lists.freedesktop.org; Vivi, Rodrigo
> <rodrigo.vivi@intel.com>
> Subject: Re: [drm-xe:oak/drm-evictable-lru 2911/3055]
> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included
> more than once.
> 
> On Tue, 07 Nov 2023, kernel test robot <yujie.liu@intel.com> wrote:
> > tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
> 
> Why do we have this stale branch? I don't think developers should push
> their branches to xe/kernel.git but their own repos instead.

Jani, I didn't know we are not allowed so. Branch deleted.

Oak

> 
> BR,
> Jani.
> 
> 
> > head:   d1f59526925ae851c6abf77af8ae6f8c3cffeebd
> > commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME:
> drm/i915: add a lot of includes in intel_display_power.h
> > compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
> >
> > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > the same patch/commit), kindly add following tags
> > | Reported-by: kernel test robot <yujie.liu@intel.com>
> > | Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
> >
> > includecheck warnings: (new ones prefixed by >>)
> >>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is
> included more than once.
> >>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is
> included more than once.
> >
> > vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
> >
> >      8
> >    > 9	#include <linux/mutex.h>
> >     10	#include <linux/workqueue.h>
> >     11
> >     12	#include "intel_wakeref.h"
> >     13	#include <linux/types.h>
> >     14	#include <linux/bitops.h>
> >   > 15	#include <linux/mutex.h>
> >     16	#include <linux/workqueue.h>
> >     17	#include "intel_runtime_pm.h"
> >     18
> 
> --
> Jani Nikula, Intel

Re: [Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Lucas De Marchi]

On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>On Tue, 07 Nov 2023, kernel test robot <yujie.liu@intel.com> wrote:
>> tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
>
>Why do we have this stale branch? I don't think developers should push
>their branches to xe/kernel.git but their own repos instead.

agreed. I just blocked branch creation in gitlab so we don't have
those accidents anymore.

Lucas De Marchi

Re: [Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Jani Nikula]

On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>>On Tue, 07 Nov 2023, kernel test robot <yujie.liu@intel.com> wrote:
>>> tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
>>
>>Why do we have this stale branch? I don't think developers should push
>>their branches to xe/kernel.git but their own repos instead.
>
> agreed. I just blocked branch creation in gitlab so we don't have
> those accidents anymore.

I was looking for this yesterday. For future reference, which knob is it
and where in the gitlab UI?

TIA,
Jani.


-- 
Jani Nikula, Intel

Re: [Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Lucas De Marchi]

On Wed, Nov 08, 2023 at 12:02:17PM +0200, Jani Nikula wrote:
>On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>>>On Tue, 07 Nov 2023, kernel test robot <yujie.liu@intel.com> wrote:
>>>> tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
>>>
>>>Why do we have this stale branch? I don't think developers should push
>>>their branches to xe/kernel.git but their own repos instead.
>>
>> agreed. I just blocked branch creation in gitlab so we don't have
>> those accidents anymore.
>
>I was looking for this yesterday. For future reference, which knob is it
>and where in the gitlab UI?

Settings > Repository > Protected branches

	- "drm-xe-next" [default] [protected]
		- Allowed to merge: Maintainers
		- Allowed to push and merge: Developers + Maintainers, Maintainers

	"*" (12 matching branches)
		- Allowed to push and merge: No one 
		- Allowed to merge: No one

I thought about creating a role to allow branch creation, but to keep it
simple, I just blocked it. When/if we need it then we can temporarily
disable the rule, like we do for force pushes when we rebase.

Lucas De Marchi

Re: [Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

[Jani Nikula]

On Wed, 08 Nov 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Wed, Nov 08, 2023 at 12:02:17PM +0200, Jani Nikula wrote:
>>On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>> On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>>>>On Tue, 07 Nov 2023, kernel test robot <yujie.liu@intel.com> wrote:
>>>>> tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
>>>>
>>>>Why do we have this stale branch? I don't think developers should push
>>>>their branches to xe/kernel.git but their own repos instead.
>>>
>>> agreed. I just blocked branch creation in gitlab so we don't have
>>> those accidents anymore.
>>
>>I was looking for this yesterday. For future reference, which knob is it
>>and where in the gitlab UI?
>
> Settings > Repository > Protected branches
>
> 	- "drm-xe-next" [default] [protected]
> 		- Allowed to merge: Maintainers
> 		- Allowed to push and merge: Developers + Maintainers, Maintainers
>
> 	"*" (12 matching branches)
> 		- Allowed to push and merge: No one 
> 		- Allowed to merge: No one

Right. I was close. I was looking at branch rules, and adding a branch
rule says, "To create a branch rule, you first need to create a
protected branch." but I didn't want to create a branch. Even under
protected branches it says, "Add protected branch", but I didn't want to
*add* branches, just prevent pushing. Oh well.

Thanks for doing this.

> I thought about creating a role to allow branch creation, but to keep it
> simple, I just blocked it. When/if we need it then we can temporarily
> disable the rule, like we do for force pushes when we rebase.

I'm not even sure you can add new roles in the free version.


BR,
Jani.

-- 
Jani Nikula, Intel