From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: build failure after merge of the drm-misc tree Date: Wed, 7 Aug 2019 13:21:22 +1000 Message-ID: <20190807132122.698277b3@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1245928305==" Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , Intel Graphics , DRI , Alex Deucher Cc: Felix Kuehling , Linux Next Mailing List , Linux Kernel Mailing List , Gerd Hoffmann List-Id: dri-devel@lists.freedesktop.org --===============1245928305== Content-Type: multipart/signed; boundary="Sig_/CDHrW63E0.twJ01h6XrsSgb"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/CDHrW63E0.twJ01h6XrsSgb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_object.c: In function 'amdgpu_bo_release_= notify': drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1245:28: error: 'struct ttm_buff= er_object' has no member named 'resv' reservation_object_lock(bo->resv, NULL); ^~ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1247:47: error: 'struct ttm_buff= er_object' has no member named 'resv' r =3D amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence); ^~ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c:1253:30: error: 'struct ttm_buff= er_object' has no member named 'resv' reservation_object_unlock(bo->resv); ^~ Caused by commit 5a5011a72489 ("drm/amdgpu: switch driver from bo->resv to bo->base.resv") interacting with commit ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release") from the amdgpu tree. I have added the following patch for today: From: Stephen Rothwell Date: Wed, 7 Aug 2019 13:17:54 +1000 Subject: [PATCH] drm/amdgpu: fix up for "drm/amdgpu: switch driver from bo-= >resv to bo->base.resv" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/a= md/amdgpu/amdgpu_object.c index b2c03be51c29..2d07f16f1789 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1242,15 +1242,15 @@ void amdgpu_bo_release_notify(struct ttm_buffer_obj= ect *bo) !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) return; =20 - reservation_object_lock(bo->resv, NULL); + reservation_object_lock(bo->base.resv, NULL); =20 - r =3D amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->resv, &fence); + r =3D amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence); if (!WARN_ON(r)) { amdgpu_bo_fence(abo, fence, false); dma_fence_put(fence); } =20 - reservation_object_unlock(bo->resv); + reservation_object_unlock(bo->base.resv); } =20 /** --=20 2.20.1 --=20 Cheers, Stephen Rothwell --Sig_/CDHrW63E0.twJ01h6XrsSgb Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl1KQ7IACgkQAVBC80lX 0Gx9xQgAnT0UG7gTC4SWsKJsckbfUk5lxfcwSny+VZR29NGb3WjT4YzhiU/Xnbdw J5Ifvhnu8JGxHQgv+/0x/2tE1jfK7LssrRYXbzu/0KVfgOLIe1IGEJ3a+rxoIM7x QShhok2gWudajNFMdS3zD66JDVk/u/F0hvduM4SQSBES1fEwqFSbZWbQecol4OTm RSfLRGcyZhpvRqbuI2xTHloswHQHsRFSU6f3EGwaClQnEdYJFiUV2E7rGGROd7QP fXTY08hV0wUOdAuoBFRJRyNakaoAK/Qe1LprR4uG4FCyWo+Q/E6xOJ5AchhHCHC5 onh3r3kitOFYGwOANgcbPldfVYHsuQ== =OTBj -----END PGP SIGNATURE----- --Sig_/CDHrW63E0.twJ01h6XrsSgb-- --===============1245928305== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============1245928305==--