From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH v6 12/17] drm/vmwgfx: switch driver from
 bo->resv to bo->base.resv
Date: Mon,  5 Aug 2019 16:01:14 +0200
Message-ID: <20190805140119.7337-13-kraxel@redhat.com>
References: <20190805140119.7337-1-kraxel@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
In-Reply-To: <20190805140119.7337-1-kraxel@redhat.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: Thomas Hellstrom <thellstrom@vmware.com>, thomas@shipmail.org, David Airlie <airlied@linux.ie>, ckoenig.leichtzumerken@gmail.com, intel-gfx@lists.freedesktop.org, open list <linux-kernel@vger.kernel.org>, VMware Graphics <linux-graphics-maintainer@vmware.com>, bskeggs@redhat.com, tzimmermann@suse.de, Gerd Hoffmann <kraxel@redhat.com>
List-Id: intel-gfx@lists.freedesktop.org

U2lnbmVkLW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+CkFja2VkLWJ5
OiBUaG9tYXMgSGVsbHN0cm9tIDx0aGVsbHN0cm9tQHZtd2FyZS5jb20+Ci0tLQogZHJpdmVycy9n
cHUvZHJtL3Ztd2dmeC92bXdnZnhfYmxpdC5jICAgICB8IDQgKystLQogZHJpdmVycy9ncHUvZHJt
L3Ztd2dmeC92bXdnZnhfYm8uYyAgICAgICB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS92
bXdnZngvdm13Z2Z4X2NvdGFibGUuYyAgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngv
dm13Z2Z4X3Jlc291cmNlLmMgfCA2ICsrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRp
b25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13
Z2Z4L3Ztd2dmeF9ibGl0LmMgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9ibGl0LmMK
aW5kZXggNzAzNzg2ZTNkNTc5Li42YzAxYWQyNzg1ZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS92bXdnZngvdm13Z2Z4X2JsaXQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Zt
d2dmeF9ibGl0LmMKQEAgLTQ1OSw5ICs0NTksOSBAQCBpbnQgdm13X2JvX2NwdV9ibGl0KHN0cnVj
dCB0dG1fYnVmZmVyX29iamVjdCAqZHN0LAogCiAJLyogQnVmZmVyIG9iamVjdHMgbmVlZCB0byBi
ZSBlaXRoZXIgcGlubmVkIG9yIHJlc2VydmVkOiAqLwogCWlmICghKGRzdC0+bWVtLnBsYWNlbWVu
dCAmIFRUTV9QTF9GTEFHX05PX0VWSUNUKSkKLQkJcmVzZXJ2YXRpb25fb2JqZWN0X2Fzc2VydF9o
ZWxkKGRzdC0+cmVzdik7CisJCXJlc2VydmF0aW9uX29iamVjdF9hc3NlcnRfaGVsZChkc3QtPmJh
c2UucmVzdik7CiAJaWYgKCEoc3JjLT5tZW0ucGxhY2VtZW50ICYgVFRNX1BMX0ZMQUdfTk9fRVZJ
Q1QpKQotCQlyZXNlcnZhdGlvbl9vYmplY3RfYXNzZXJ0X2hlbGQoc3JjLT5yZXN2KTsKKwkJcmVz
ZXJ2YXRpb25fb2JqZWN0X2Fzc2VydF9oZWxkKHNyYy0+YmFzZS5yZXN2KTsKIAogCWlmIChkc3Qt
PnR0bS0+c3RhdGUgPT0gdHRfdW5wb3B1bGF0ZWQpIHsKIAkJcmV0ID0gZHN0LT50dG0tPmJkZXYt
PmRyaXZlci0+dHRtX3R0X3BvcHVsYXRlKGRzdC0+dHRtLCAmY3R4KTsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2JvLmMgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4
L3Ztd2dmeF9iby5jCmluZGV4IDU3MzljNmM0OWM5OS4uMzY5MDM0YzBkZTMxIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9iby5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry
bS92bXdnZngvdm13Z2Z4X2JvLmMKQEAgLTM0Miw3ICszNDIsNyBAQCB2b2lkIHZtd19ib19waW5f
cmVzZXJ2ZWQoc3RydWN0IHZtd19idWZmZXJfb2JqZWN0ICp2Ym8sIGJvb2wgcGluKQogCXVpbnQz
Ml90IG9sZF9tZW1fdHlwZSA9IGJvLT5tZW0ubWVtX3R5cGU7CiAJaW50IHJldDsKIAotCXJlc2Vy
dmF0aW9uX29iamVjdF9hc3NlcnRfaGVsZChiby0+cmVzdik7CisJcmVzZXJ2YXRpb25fb2JqZWN0
X2Fzc2VydF9oZWxkKGJvLT5iYXNlLnJlc3YpOwogCiAJaWYgKHBpbikgewogCQlpZiAodmJvLT5w
aW5fY291bnQrKyA+IDApCkBAIC02OTAsNyArNjkwLDcgQEAgc3RhdGljIGludCB2bXdfdXNlcl9i
b19zeW5jY3B1X2dyYWIoc3RydWN0IHZtd191c2VyX2J1ZmZlcl9vYmplY3QgKnVzZXJfYm8sCiAJ
CWxvbmcgbHJldDsKIAogCQlscmV0ID0gcmVzZXJ2YXRpb25fb2JqZWN0X3dhaXRfdGltZW91dF9y
Y3UKLQkJCShiby0+cmVzdiwgdHJ1ZSwgdHJ1ZSwKKwkJCShiby0+YmFzZS5yZXN2LCB0cnVlLCB0
cnVlLAogCQkJIG5vbmJsb2NrID8gMCA6IE1BWF9TQ0hFRFVMRV9USU1FT1VUKTsKIAkJaWYgKCFs
cmV0KQogCQkJcmV0dXJuIC1FQlVTWTsKQEAgLTEwMDcsMTAgKzEwMDcsMTAgQEAgdm9pZCB2bXdf
Ym9fZmVuY2Vfc2luZ2xlKHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCiAKIAlpZiAoZmVu
Y2UgPT0gTlVMTCkgewogCQl2bXdfZXhlY2J1Zl9mZW5jZV9jb21tYW5kcyhOVUxMLCBkZXZfcHJp
diwgJmZlbmNlLCBOVUxMKTsKLQkJcmVzZXJ2YXRpb25fb2JqZWN0X2FkZF9leGNsX2ZlbmNlKGJv
LT5yZXN2LCAmZmVuY2UtPmJhc2UpOworCQlyZXNlcnZhdGlvbl9vYmplY3RfYWRkX2V4Y2xfZmVu
Y2UoYm8tPmJhc2UucmVzdiwgJmZlbmNlLT5iYXNlKTsKIAkJZG1hX2ZlbmNlX3B1dCgmZmVuY2Ut
PmJhc2UpOwogCX0gZWxzZQotCQlyZXNlcnZhdGlvbl9vYmplY3RfYWRkX2V4Y2xfZmVuY2UoYm8t
PnJlc3YsICZmZW5jZS0+YmFzZSk7CisJCXJlc2VydmF0aW9uX29iamVjdF9hZGRfZXhjbF9mZW5j
ZShiby0+YmFzZS5yZXN2LCAmZmVuY2UtPmJhc2UpOwogfQogCiAKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2NvdGFibGUuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdn
Zngvdm13Z2Z4X2NvdGFibGUuYwppbmRleCA3MWU5MDFiYmVkNjguLjc5ODRmMTcyZWM0YSAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY290YWJsZS5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2NvdGFibGUuYwpAQCAtMTY5LDcgKzE2OSw3IEBA
IHN0YXRpYyBpbnQgdm13X2NvdGFibGVfdW5zY3J1YihzdHJ1Y3Qgdm13X3Jlc291cmNlICpyZXMp
CiAJfSAqY21kOwogCiAJV0FSTl9PTl9PTkNFKGJvLT5tZW0ubWVtX3R5cGUgIT0gVk1XX1BMX01P
Qik7Ci0JcmVzZXJ2YXRpb25fb2JqZWN0X2Fzc2VydF9oZWxkKGJvLT5yZXN2KTsKKwlyZXNlcnZh
dGlvbl9vYmplY3RfYXNzZXJ0X2hlbGQoYm8tPmJhc2UucmVzdik7CiAKIAljbWQgPSBWTVdfRklG
T19SRVNFUlZFKGRldl9wcml2LCBzaXplb2YoKmNtZCkpOwogCWlmICghY21kKQpAQCAtMzExLDcg
KzMxMSw3IEBAIHN0YXRpYyBpbnQgdm13X2NvdGFibGVfdW5iaW5kKHN0cnVjdCB2bXdfcmVzb3Vy
Y2UgKnJlcywKIAkJcmV0dXJuIDA7CiAKIAlXQVJOX09OX09OQ0UoYm8tPm1lbS5tZW1fdHlwZSAh
PSBWTVdfUExfTU9CKTsKLQlyZXNlcnZhdGlvbl9vYmplY3RfYXNzZXJ0X2hlbGQoYm8tPnJlc3Yp
OworCXJlc2VydmF0aW9uX29iamVjdF9hc3NlcnRfaGVsZChiby0+YmFzZS5yZXN2KTsKIAogCW11
dGV4X2xvY2soJmRldl9wcml2LT5iaW5kaW5nX211dGV4KTsKIAlpZiAoIXZjb3RibC0+c2NydWJi
ZWQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9yZXNvdXJjZS5j
IGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfcmVzb3VyY2UuYwppbmRleCAzMDNkMmM3
ZDlhYjMuLjcwMTY0M2I3YjBjNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92
bXdnZnhfcmVzb3VyY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9yZXNv
dXJjZS5jCkBAIC00MDIsMTQgKzQwMiwxNCBAQCB2b2lkIHZtd19yZXNvdXJjZV91bnJlc2VydmUo
c3RydWN0IHZtd19yZXNvdXJjZSAqcmVzLAogCiAJaWYgKHN3aXRjaF9iYWNrdXAgJiYgbmV3X2Jh
Y2t1cCAhPSByZXMtPmJhY2t1cCkgewogCQlpZiAocmVzLT5iYWNrdXApIHsKLQkJCXJlc2VydmF0
aW9uX29iamVjdF9hc3NlcnRfaGVsZChyZXMtPmJhY2t1cC0+YmFzZS5yZXN2KTsKKwkJCXJlc2Vy
dmF0aW9uX29iamVjdF9hc3NlcnRfaGVsZChyZXMtPmJhY2t1cC0+YmFzZS5iYXNlLnJlc3YpOwog
CQkJbGlzdF9kZWxfaW5pdCgmcmVzLT5tb2JfaGVhZCk7CiAJCQl2bXdfYm9fdW5yZWZlcmVuY2Uo
JnJlcy0+YmFja3VwKTsKIAkJfQogCiAJCWlmIChuZXdfYmFja3VwKSB7CiAJCQlyZXMtPmJhY2t1
cCA9IHZtd19ib19yZWZlcmVuY2UobmV3X2JhY2t1cCk7Ci0JCQlyZXNlcnZhdGlvbl9vYmplY3Rf
YXNzZXJ0X2hlbGQobmV3X2JhY2t1cC0+YmFzZS5yZXN2KTsKKwkJCXJlc2VydmF0aW9uX29iamVj
dF9hc3NlcnRfaGVsZChuZXdfYmFja3VwLT5iYXNlLmJhc2UucmVzdik7CiAJCQlsaXN0X2FkZF90
YWlsKCZyZXMtPm1vYl9oZWFkLCAmbmV3X2JhY2t1cC0+cmVzX2xpc3QpOwogCQl9IGVsc2Ugewog
CQkJcmVzLT5iYWNrdXAgPSBOVUxMOwpAQCAtNjkxLDcgKzY5MSw3IEBAIHZvaWQgdm13X3Jlc291
cmNlX3VuYmluZF9saXN0KHN0cnVjdCB2bXdfYnVmZmVyX29iamVjdCAqdmJvKQogCQkubnVtX3No
YXJlZCA9IDAKIAl9OwogCi0JcmVzZXJ2YXRpb25fb2JqZWN0X2Fzc2VydF9oZWxkKHZiby0+YmFz
ZS5yZXN2KTsKKwlyZXNlcnZhdGlvbl9vYmplY3RfYXNzZXJ0X2hlbGQodmJvLT5iYXNlLmJhc2Uu
cmVzdik7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHJlcywgbmV4dCwgJnZiby0+cmVzX2xp
c3QsIG1vYl9oZWFkKSB7CiAJCWlmICghcmVzLT5mdW5jLT51bmJpbmQpCiAJCQljb250aW51ZTsK
LS0gCjIuMTguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4