All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
	Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>
Cc: Flora Cui <flora.cui@amd.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the amdgpu tree
Date: Fri, 3 Dec 2021 12:11:19 +1100	[thread overview]
Message-ID: <20211203121119.25674209@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2206 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c: In function 'amdgpu_vkms_sw_fini':
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:521:34: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  521 |   if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
      |                                  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:522:47: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  522 |    hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
      |                                               ^

Caused by commit

  deefd07eedb7 ("drm/amdgpu: fix vkms crtc settings")

interacting with commit

  3e467e478ed3 ("drm/amdgpu: cancel the correct hrtimer on exit")

from the drm-fixes tree.  The problem is that this latter patch also
appears in the amdgpu tree as a different commit and git resolves it
incorrectly in the presence of the former commit :-(

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Dec 2021 12:06:57 +1100
Subject: [PATCH] fix up for "drm/amdgpu: cancel the correct hrtimer on exit"

interacting with "drm/amdgpu: fix vkms crtc settings"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index e07fc64b655e..6c62c45e3e3e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -518,8 +518,8 @@ static int amdgpu_vkms_sw_fini(void *handle)
 	int i = 0;
 
 	for (i = 0; i < adev->mode_info.num_crtc; i++)
-		if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
-			hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
+		if (adev->mode_info.crtcs[i])
+			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);
 
 	kfree(adev->mode_info.bios_hardcoded_edid);
 	kfree(adev->amdgpu_vkms_output);
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alex Deucher <alexdeucher@gmail.com>,
	Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Flora Cui <flora.cui@amd.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the amdgpu tree
Date: Fri, 3 Dec 2021 12:11:19 +1100	[thread overview]
Message-ID: <20211203121119.25674209@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2206 bytes --]

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c: In function 'amdgpu_vkms_sw_fini':
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:521:34: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  521 |   if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
      |                                  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c:522:47: error: 'struct amdgpu_vkms_output' has no member named 'vblank_hrtimer'
  522 |    hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
      |                                               ^

Caused by commit

  deefd07eedb7 ("drm/amdgpu: fix vkms crtc settings")

interacting with commit

  3e467e478ed3 ("drm/amdgpu: cancel the correct hrtimer on exit")

from the drm-fixes tree.  The problem is that this latter patch also
appears in the amdgpu tree as a different commit and git resolves it
incorrectly in the presence of the former commit :-(

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Dec 2021 12:06:57 +1100
Subject: [PATCH] fix up for "drm/amdgpu: cancel the correct hrtimer on exit"

interacting with "drm/amdgpu: fix vkms crtc settings"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index e07fc64b655e..6c62c45e3e3e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@ -518,8 +518,8 @@ static int amdgpu_vkms_sw_fini(void *handle)
 	int i = 0;
 
 	for (i = 0; i < adev->mode_info.num_crtc; i++)
-		if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)
-			hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);
+		if (adev->mode_info.crtcs[i])
+			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);
 
 	kfree(adev->mode_info.bios_hardcoded_edid);
 	kfree(adev->amdgpu_vkms_output);
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2021-12-03  1:11 UTC|newest]

Thread overview: 152+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-03  1:11 Stephen Rothwell [this message]
2021-12-03  1:11 ` linux-next: build failure after merge of the amdgpu tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-02-13  4:00 Stephen Rothwell
2024-02-13 14:00 ` Alex Deucher
2023-10-10  1:43 Stephen Rothwell
2023-10-10 21:14 ` Rodrigo Siqueira Jordao
2023-10-16  0:39   ` Stephen Rothwell
2023-10-16 14:53     ` Rodrigo Siqueira Jordao
2023-10-16 20:59       ` Stephen Rothwell
2023-10-17  1:08         ` Stephen Rothwell
2023-10-16  0:18 ` Stephen Rothwell
2023-10-19  1:06 ` Stephen Rothwell
2023-10-19  1:06   ` Stephen Rothwell
2023-10-24  0:59   ` Stephen Rothwell
2023-10-24  0:59     ` Stephen Rothwell
2023-10-24 12:57     ` Alex Deucher
2023-10-24 12:57       ` Alex Deucher
2023-10-24 19:52       ` Alex Deucher
2023-10-24 19:52         ` Alex Deucher
2023-10-24 21:47       ` Stephen Rothwell
2023-10-24 21:47         ` Stephen Rothwell
2023-05-22  7:15 Stephen Rothwell
2023-05-22 16:29 ` Nick Desaulniers
2023-05-22 16:35   ` Alex Deucher
2023-05-22 16:47     ` Nick Desaulniers
2023-05-22 19:14       ` Alex Deucher
2023-05-22  7:11 Stephen Rothwell
2023-05-22  7:24 ` Lazar, Lijo
2023-05-22  7:00 Stephen Rothwell
2023-05-22  7:04 ` Zhang, Hawking
2023-05-19  0:06 Stephen Rothwell
2023-05-19  0:06 ` Stephen Rothwell
2023-05-19  3:10 ` James Zhu
2023-05-19  3:10   ` James Zhu
2023-05-19 13:38 ` Alex Deucher
2023-05-19 13:38   ` Alex Deucher
2023-01-30  1:20 Stephen Rothwell
2022-10-31  0:13 Stephen Rothwell
2022-08-30  1:41 Stephen Rothwell
2022-07-25 11:16 Stephen Rothwell
2022-07-27 16:21 ` Rodrigo Siqueira Jordao
2022-07-27 16:23   ` Alex Deucher
2022-07-19  2:36 Stephen Rothwell
2022-07-20  2:47 ` Stephen Rothwell
2022-07-21  2:16   ` Stephen Rothwell
2022-07-22  2:52     ` Stephen Rothwell
2022-07-22 13:30       ` Alex Deucher
2022-06-23  6:07 Stephen Rothwell
2022-06-23 11:01 ` Greg KH
2022-06-27 14:40 ` Greg KH
2022-06-15  4:37 Stephen Rothwell
2022-06-15 18:17 ` Alex Deucher
2022-06-14  4:51 Stephen Rothwell
2022-06-03  4:43 Stephen Rothwell
2022-06-09  3:14 ` Stephen Rothwell
2022-06-15  5:00 ` Stephen Rothwell
2022-06-21  8:15   ` Stephen Rothwell
2022-06-21 15:02     ` Alex Deucher
2022-06-21 22:07       ` Stephen Rothwell
2022-06-22 14:48         ` Alex Deucher
2022-06-23  7:47           ` Stephen Rothwell
2022-06-02  0:30 Stephen Rothwell
2022-05-06  1:06 Stephen Rothwell
2022-05-05  9:47 Stephen Rothwell
2022-05-05 18:12 ` Nathan Chancellor
2022-05-05 18:46   ` Alex Deucher
2022-05-06  1:05     ` Stephen Rothwell
     [not found] <BN9PR12MB5145ECB75120FF9AC1AA4CFB8DEC9@BN9PR12MB5145.namprd12.prod.outlook.com>
2022-04-13 14:18 ` Alex Deucher
     [not found]   ` <BN9PR12MB5145D81F9978B656E9BB67C78DEF9@BN9PR12MB5145.namprd12.prod.outlook.com>
2022-04-14 14:23     ` Rodrigo Siqueira Jordao
2022-04-14 14:27       ` Alex Deucher
2022-04-14 14:31         ` Rodrigo Siqueira Jordao
2022-04-13  2:32 Stephen Rothwell
2022-04-08  4:46 Stephen Rothwell
2022-03-07  0:13 Stephen Rothwell
2022-03-07  7:16 ` Uwe Kleine-König
2022-03-07 13:04 ` Mark Brown
2022-03-08 11:15   ` Noralf Trønnes
2022-03-08 11:15     ` Noralf Trønnes
2022-02-15  0:57 Stephen Rothwell
2022-02-01  3:32 Stephen Rothwell
2022-02-01 18:32 ` Limonciello, Mario
2022-02-01 18:53   ` Alex Deucher
2022-01-26 23:42 Stephen Rothwell
2022-01-14  0:36 Stephen Rothwell
2022-01-14 23:25 ` Stephen Rothwell
2021-11-18  4:23 Stephen Rothwell
2021-10-08  0:31 Stephen Rothwell
2021-10-08  6:27 ` Simon Ser
2021-10-08  8:29   ` Stephen Rothwell
2021-10-08  9:22     ` Simon Ser
2021-10-08 14:11       ` Alex Deucher
2021-10-08 18:07         ` Simon Ser
2021-10-11  7:33           ` Christoph Hellwig
2021-10-11  7:39             ` Simon Ser
2021-10-11  7:43               ` Christoph Hellwig
2021-10-11  7:49                 ` Simon Ser
2021-10-11  7:51                   ` Christoph Hellwig
2021-10-11  7:57                     ` Simon Ser
2021-10-11  8:01                       ` Christoph Hellwig
2021-10-11  8:21                         ` Simon Ser
2021-10-09  4:57       ` Stephen Rothwell
2021-10-12  2:25 ` Stephen Rothwell
2021-10-12 13:32   ` Alex Deucher
2021-09-29  1:20 Stephen Rothwell
2021-09-17  0:57 Stephen Rothwell
2021-08-02 15:55 linux-next: Build " Mark Brown
2021-07-28 12:34 linux-next: build " Mark Brown
2021-07-28 12:34 ` Mark Brown
2021-07-28 12:34 ` Mark Brown
2021-05-27  5:58 Stephen Rothwell
2021-05-04 23:34 Stephen Rothwell
2021-05-09 22:46 ` Stephen Rothwell
2021-05-10 14:24   ` Alex Deucher
2021-05-10 22:18     ` Stephen Rothwell
2021-05-10 22:23       ` Alex Deucher
2021-05-10 23:02         ` Stephen Rothwell
2021-03-30  2:18 Stephen Rothwell
2021-03-19  1:21 Stephen Rothwell
2021-02-23  1:11 Stephen Rothwell
2021-02-05  2:12 Stephen Rothwell
2021-02-05  2:12 ` Stephen Rothwell
2021-01-15  5:35 Stephen Rothwell
2021-01-15  5:57 ` Huang Rui
2021-01-15  8:46   ` Huang, Ray
2021-01-15 14:56     ` Alex Deucher
2021-01-08  1:17 Stephen Rothwell
2020-10-27  1:08 Stephen Rothwell
2020-06-17  0:26 Stephen Rothwell
2020-06-12  0:25 Stephen Rothwell
2020-06-26  1:47 ` Stephen Rothwell
2020-06-26  1:47   ` Stephen Rothwell
2020-02-11 22:48 Stephen Rothwell
2020-02-12 16:14 ` Rodrigo Siqueira
2020-01-28  4:42 Stephen Rothwell
2020-01-28 21:18 ` Alex Deucher
2020-01-08  2:18 Stephen Rothwell
2019-11-08  5:31 Stephen Rothwell
2019-11-08 15:50 ` Grodzovsky, Andrey
2019-11-08 15:59 ` Alex Deucher
2019-11-07  0:46 Stephen Rothwell
2019-08-13  8:10 Stephen Rothwell
2019-08-13  8:21 ` Huang, Ray
2019-08-13 14:01   ` Alex Deucher
2019-08-16  0:21     ` Stephen Rothwell
2019-08-16  1:52       ` Alex Deucher
2019-08-16  2:43         ` Stephen Rothwell
2019-06-26 11:22 Stephen Rothwell
2019-06-27  3:35 ` Stephen Rothwell
2019-06-27 14:18   ` Alex Deucher
2019-06-27 22:01     ` Stephen Rothwell
2019-06-24  4:24 Stephen Rothwell
2019-03-19  0:04 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211203121119.25674209@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=alexdeucher@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=flora.cui@amd.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.