Date:   Wed, 1 Feb 2023 10:31:25 -0500
From:   Rodrigo Vivi <rodrigo.vivi@intel.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
CC:     John Harrison <john.c.harrison@intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Greg KH <greg@kroah.com>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        "Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the
 drm-intel-fixes tree
Message-ID: <Y9qFmmi2C20AFQB7@intel.com>
References: <20230131130305.019029ff@canb.auug.org.au>
 <Y9kNRVppj5Uxa9ub@smile.fi.intel.com>
 <9566dc52-2ff1-760d-c9cb-fdfef9278f05@intel.com>
 <20230201151113.22382269@oak.ozlabs.ibm.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230201151113.22382269@oak.ozlabs.ibm.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XKJV8SJ19mDFW+RrZyNrJY2wMpmfIzZwj2gHgev+LaC6up/TPNklmGWSKqOs?=
 =?us-ascii?Q?MKkBJDVri/QPf086fWOS931wxrPcPxEzAZ6V584JX+g4XsNL9xePVeUJK/4K?=
 =?us-ascii?Q?whrLkCvZXMOMRuseFst4XRZAT6w/QUtO9l1cQSo8BALdkuwE82ezA368V6nQ?=
 =?us-ascii?Q?gf3OmfAq2YL13TX+2bSarAUG/C4qTxeFY8GtZZqNPegf+7gcnqkIAkDLKPil?=
 =?us-ascii?Q?wSeV58Wi27U1uyRB6i3VoWeigoMYp4jkK+HJKdK44izMxIqyEe/m+ih/jyFG?=
 =?us-ascii?Q?FCcooYdmwXCyST2vy2ZyhRAm1G/ht7guF810lCFNWG7sLIcywvooTngV9FUE?=
 =?us-ascii?Q?Kc/nkjPR+nQDPNAvLxMoLZBUPCt/86Yx1QxTuKkqHGL9rcc7whOL2v3hiUfF?=
 =?us-ascii?Q?dRIgKtU9LN6nGoOrdmde16cy8eixY6zXUZYp7GTFRDroyGTZbtenCz5r48qi?=
 =?us-ascii?Q?aF7xidQq9HxiyK759aGaU9r9muQozbD7vXUoBSfdOSfYHGNIgvfBz2oHM71M?=
 =?us-ascii?Q?H8cRzclcEX1JXjE+zIIHtiWP6zLGf8Z+a2HerbfT+1KE9yy18GRY8k5CwxY+?=
 =?us-ascii?Q?ajtswxGxAiU1e2hkmWFJ8OEe4/i1+4rgegJKiNgSr6dlZA9FWmeuDeXm/Ht1?=
 =?us-ascii?Q?IeK+xzsUWdBGyzXCIiX0R7SmA6x4Jbtoda1cib63NEPROap9WtYGBh7CvzWC?=
 =?us-ascii?Q?RB/BFZ0cEsTki0uDbsyspsC0xjS7E6SByXuGBkbv/TuVKzE2UPV4R6UUKL9w?=
 =?us-ascii?Q?C7qzRWc15oGjIyyQv/OxaJjv5tKhpXPmzjjrFwrD5+c0+y4fufD0b4OTZ/XJ?=
 =?us-ascii?Q?1okDlnu7NCWCDw2GyFGK3nV0/Lc4JhCGQlSRXrhzCioH34QD5LDd6QGKHdd7?=
 =?us-ascii?Q?2EpgW0yfDcQDKj/tMucRucX3053t7MIf14M0tHxpxpzgvM6WaGfkk5tmITtm?=
 =?us-ascii?Q?jTEUMv8pCVP02iiEwBt69hwPojORhX3hH0nF2zzzBDACW22e5swB1Ko26Ayc?=
 =?us-ascii?Q?4gulUdnOjYk2bVu++kPocqzeCIB1E2LAdDissIh/SDDArOi0/oyBIZBK6V20?=
 =?us-ascii?Q?jOLCNvw8iagaCeI+1bshHGpBVUj949SUqqaBTn0SY5gpWAEYbGpPSXv/XSOz?=
 =?us-ascii?Q?jGHsPGbfIWz4myU4upiH3ae6yH+U+gGuLPakJW70YWyM7A3Jcp4mghDpZcO9?=
 =?us-ascii?Q?pVESUnyrC+QBy7haCFa90bHlyklR29MA54OVkua8Panuguj1ztdbJ4RDxRaI?=
 =?us-ascii?Q?lE844EhCqT7dIJb2lWF/Sgx8BkBKmVV/ciXA7Bqyr52/3PF2ktC+eq2TJ27m?=
 =?us-ascii?Q?3optrngeg/YaoMFCL4RW5wOHfg9RXOpthdVxSf2ubDKyZb9QJ7Sfn5vhXDsV?=
 =?us-ascii?Q?mhYRMy/YIXjpM6aTeVKxuFmVjVen2NB6617g2UjsqK0u13efwMSZUNqxTKXb?=
 =?us-ascii?Q?0oMubuU1Iq6Jv8JYYohHzYOfJpPohxaQQkReBL0mzrtPfCHqk3I4TdblU5wh?=
 =?us-ascii?Q?bQnvjayDXkoK6ME95d2SWNKCCqNHvHJQgIR5VIa0505UanHfF47O9CGchKCJ?=
 =?us-ascii?Q?PnPCuskeWCHBy5LPDFSHyvtnLSzjA7BNuvK569VBdJWlLvYUSM46CyfmOL+7?=
 =?us-ascii?Q?bg=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 3b90b4d2-f6dc-4789-a77e-08db046964c3
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6059.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 15:31:31.8083
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: HU+wZvHxBT3KQjBGiOagxEC5swP5K8ZkYi5uwfFHZCPFxW97gWh2kr45pu0q/vzS8uJvSf4Ay12Taq2h9mLqdQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6333
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Feb 01, 2023 at 03:11:31PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 31 Jan 2023 10:27:29 -0800 John Harrison <john.c.harrison@intel.com> wrote:
> >
> > On 1/31/2023 04:44, Andy Shevchenko wrote:
> > > On Tue, Jan 31, 2023 at 01:03:05PM +1100, Stephen Rothwell wrote:  
> > >>
> > >> Today's linux-next merge of the usb tree got a conflict in:
> > >>
> > >>    drivers/gpu/drm/i915/gt/intel_engine_cs.c
> > >>
> > >> between commit:
> > >>
> > >>    5bc4b43d5c6c ("drm/i915: Fix up locking around dumping requests lists")
> > >>
> > >> from the drm-intel-fixes tree and commit:
> > >>
> > >>    4d70c74659d9 ("i915: Move list_count() to list.h as list_count_nodes() for broader use")
> > >>
> > >> from the usb tree.
> > >>
> > >> I fixed it up (the former removed the code changed by the latter)  
> > > Hmm... Currently I see that 20230127002842.3169194-4-John.C.Harrison@Intel.com
> > > moves the code to the drivers/gpu/drm/i915/gt/intel_execlists_submission.c.
> > >
> > > Is there any new series beside the above mentioned that touches that file and
> > > actually _removes_ that code?  
> > As long as the removal is limited to list_count/list_count_nodes,
> > that's fine. I only moved it from one file to another because the one
> > and only function that was using it was being moved to the other
> > file. If someone else has found a use for the same and wants to move
> > it to a more common place then great. I assume there was no conflict
> > happening in the i915 specific code.
> 
> I have added this fix up patch to linux-next today (more or less - this
> is a hand hacked version, but you get the idea):
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 1 Feb 2023 13:13:01 +1100
> Subject: [PATCH] i915: fix up for "drm/i915: Fix up locking around dumping requests lists"
> 
> interacting with "i915: Move list_count() to list.h as list_count_nodes() for broader use"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  .../gpu/drm/i915/gt/intel_execlists_submission.c    | 15 +------------
>  1 file changed, 2 insertion(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> index 3c573d41d404..e919d41a48d9 100644
> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
> @@ -4150,17 +4150,6 @@ void intel_execlists_show_requests(struct intel_engine_cs *engine,
>  	spin_unlock_irqrestore(&sched_engine->lock, flags);
>  }
>  
> -static unsigned long list_count(struct list_head *list)
> -{
> -	struct list_head *pos;
> -	unsigned long count = 0;
> -
> -	list_for_each(pos, list)
> -		count++;
> -
> -	return count;
> -}
> -
>  void intel_execlists_dump_active_requests(struct intel_engine_cs *engine,
>  					  struct i915_request *hung_rq,
>  					  struct drm_printer *m)
> @@ -4172,7 +4161,7 @@ void intel_execlists_dump_active_requests(struct intel_engine_cs *engine,
>  	intel_engine_dump_active_requests(&engine->sched_engine->requests, hung_rq, m);
>  
> -	drm_printf(m, "\tOn hold?: %lu\n",
> -		   list_count(&engine->sched_engine->hold));
> +	drm_printf(m, "\tOn hold?: %zu\n",
> +		   list_count_nodes(&engine->sched_engine->hold));

something awkward here.
The resolution on linux-next should align with the resolution on drm-tip
where we have the list_count still there as we preferred the version
on drm-intel-gt-next as the resolution of the conflict instead of the
fixes one.

>  
>  	spin_unlock_irqrestore(&engine->sched_engine->lock, flags);
>  }
> -- 
> 2.35.1
> 
> -- 
> Cheers,
> Stephen Rothwell