From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92E7D172798; Wed, 3 Jul 2024 11:46:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720007193; cv=none; b=EU6QqED3E/vIDtsKqS9E4MAHEIudcC4OyW43UqbGfI1WUTKsiS/hZu/o/E6SQk0grNSgR8EV2AIyrdYrTZM7Vn/9H/thgJprxhz+/79bevO7IQzxE+ZeiRq1YR2pQG0KdKzrB6AognkNG+2HzJtSHR7h5lLR6URivrXnLrbl8Ss= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720007193; c=relaxed/simple; bh=ccSSB5ntIgvLAQBJKwo1I+LWZkPdt11bRXA2in5N+ak=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=BQwPpo1zeMrzaEiiFzW3T19Cmoe/gUR4jo79NafI3YOuS8KYBsxRcJLhUu4uYV0yOLogYUqjc7K6b2RK34NidtdOexmtpBrGTmvOhpj74L5NdOBj3JSPT/uX2cVjYzP2ZVcZIA8zuSkpUaGKnnPpU84JVmUHaYxPE5dBr9vZitI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=m+DFD4NI; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="m+DFD4NI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720007191; x=1751543191; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=ccSSB5ntIgvLAQBJKwo1I+LWZkPdt11bRXA2in5N+ak=; b=m+DFD4NIfTIgHK4nnF6s9z2b2GVPz+6mKi1CNMQMgaD6Z4D6hAaKTl60 24IqFDpLSVQioAdFg2wTtvNajS8g8f2MrftAr4yy9LGDyzuU3AjuCLWz8 /ahsb8g1Tnddng5tioSQshI9xqUIhXzh2xNs9qxaVyHw4PF+gJN3g5d7k H7kFJwTNV8ASSdglrWonxOygvzPl+rrv/lYftXVBspY4XPyjRirwtltUy gwEwtZbR00XBwmMxTI0Lb0yJaNbOPt5QGKpqCNXv8ZH3KDE+Jx3sv9ThW ZnpVOI4m3NsW57+o+OW7j0yxO4Vy2v+NJAoY7IptC3aUAh+pLbDi1CS91 g==; X-CSE-ConnectionGUID: bSIGfMeZSpaj80t7/M1w7A== X-CSE-MsgGUID: UVtjcWXWRu2aqiR+P8l5/Q== X-IronPort-AV: E=McAfee;i="6700,10204,11121"; a="34679636" X-IronPort-AV: E=Sophos;i="6.09,182,1716274800"; d="scan'208";a="34679636" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2024 04:46:31 -0700 X-CSE-ConnectionGUID: 1DbAtIMHT7i9igPX/tAdng== X-CSE-MsgGUID: EIT9haWkTTKqfKMieYH4tg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,182,1716274800"; d="scan'208";a="76963793" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa002.jf.intel.com with ESMTP; 03 Jul 2024 04:46:28 -0700 Received: from [10.246.34.68] (mwajdecz-MOBL.ger.corp.intel.com [10.246.34.68]) by irvmail002.ir.intel.com (Postfix) with ESMTP id F409A284FE; Wed, 3 Jul 2024 12:46:24 +0100 (IST) Message-ID: <10c3d9b8-bf5b-42c1-9c87-36828f5c995c@intel.com> Date: Wed, 3 Jul 2024 13:46:23 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: build failure after merge of the drm To: Stephen Rothwell , Dave Airlie , Rodrigo Vivi Cc: Mark Brown , DRI , =?UTF-8?Q?Piotr_Pi=C3=B3rkowski?= , buildfailureaftermergeofthedrmtree@sirena.org.uk, Linux Kernel Mailing List , Linux Next Mailing List References: <20240703123643.5b4dc83f@canb.auug.org.au> Content-Language: en-US From: Michal Wajdeczko In-Reply-To: <20240703123643.5b4dc83f@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit + Rodrigo for help On 03.07.2024 04:36, Stephen Rothwell wrote: > Hi all, > > On Fri, 28 Jun 2024 18:03:39 +0100 Mark Brown wrote: >> >> After merging the drm tree, today's linux-next build (x86_64 >> allmodconfig) failed like this: >> >> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In function 'pf_get_threshold': >> /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:27: error: unused variable 'xe' [-Werror=unused-variable] >> 1788 | struct xe_device *xe = gt_to_xe(gt); >> | ^~ >> cc1: all warnings being treated as errors >> >> Caused by commit >> >> 629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF thresholds") >> >> I have used the tree from 20240627 instead. > > I am still seeing that build failure. > as explained before, this additional var is not present in drm-xe/drm-xe-next AFAICS this additional var comes from the drm/drm-next and is applied to drm-tip as something like: commit fa60cd98341b3a176de428a182e13ebd7a5ea4b7 (from fb625bf6187d97c3cd28d680b14bf80f84207e5a) Merge: f733fce76fff fb625bf6187d Author: Thomas Zimmermann Date: Wed Jul 3 10:12:05 2024 +0200 Merge remote-tracking branch 'drm/drm-next' into drm-tip # Conflicts: # drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c # drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c # drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h # drivers/gpu/drm/xe/xe_gt_idle.c # drivers/gpu/drm/xe/xe_guc_pc.c diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c index 694671497f6e..a5c9dfa1077c 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c @@ -1785,6 +1785,7 @@ static int pf_get_threshold(struct xe_gt *gt, unsigned int vfid, enum xe_guc_klv_threshold_index index) { struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid); + struct xe_device *xe = gt_to_xe(gt); return config->thresholds[index]; } and later drm-tip removes that by merging fixup from the topic branch: commit 1179bb6a96b57c1584497920768ac9c40c7874e4 (from 29a62552d265091cd444bf819f4e4fd3fa7f471c) Merge: 29a62552d265 428c3ef38ef5 Author: Thomas Zimmermann Date: Wed Jul 3 10:12:10 2024 +0200 Merge remote-tracking branch 'drm-xe/topic/xe-for-CI' into drm-tip diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c index c8936aae7f43..db6c213da847 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c @@ -1785,7 +1785,6 @@ static int pf_get_threshold(struct xe_gt *gt, unsigned int vfid, enum xe_guc_klv_threshold_index index) { struct xe_gt_sriov_config *config = pf_pick_vf_config(gt, vfid); - struct xe_device *xe = gt_to_xe(gt); return config->thresholds[index]; }