From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rob Herring <robh@kernel.org>
Subject: [PATCH 5/5] drm: vc4: Switch to use drm_gem_object reservation_object
Date: Thu, 31 Jan 2019 18:50:57 -0600
Message-ID: <20190201005057.13648-6-robh@kernel.org>
References: <20190201005057.13648-1-robh@kernel.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
In-Reply-To: <20190201005057.13648-1-robh@kernel.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: dri-devel@lists.freedesktop.org
Cc: Sean Paul <sean@poorly.run>, Maxime Ripard <maxime.ripard@bootlin.com>, David Airlie <airlied@linux.ie>, linux-arm-msm@vger.kernel.org, etnaviv@lists.freedesktop.org, Russell King <linux+etnaviv@armlinux.org.uk>, freedreno@lists.freedesktop.org
List-Id: linux-arm-msm@vger.kernel.org

Tm93IHRoYXQgdGhlIGJhc2Ugc3RydWN0IGRybV9nZW1fb2JqZWN0IGhhcyBhIHJlc2VydmF0aW9u
X29iamVjdCwgdXNlIGl0CmFuZCByZW1vdmUgdGhlIHByaXZhdGUgQk8gb25lLgoKQ2M6IEVyaWMg
QW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXgu
aWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWxAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnClNpZ25lZC1vZmYtYnk6IFJvYiBIZXJyaW5nIDxyb2JoQGtlcm5l
bC5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8uYyAgICB8IDE1ICstLS0tLS0t
LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmMgICB8ICAxIC0KIGRyaXZlcnMv
Z3B1L2RybS92YzQvdmM0X2Rydi5oICAgfCAgNyArLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmM0
L3ZjNF9nZW0uYyAgIHwgMTggKysrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vdmM0
L3ZjNF9wbGFuZS5jIHwgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwg
MzEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8u
YyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2JvLmMKaW5kZXggOGRjY2U3MTgyYmI3Li45MmUz
Zjk4ZDg0NzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2JvLmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfYm8uYwpAQCAtMjAxLDggKzIwMSw2IEBAIHN0YXRpYyB2
b2lkIHZjNF9ib19kZXN0cm95KHN0cnVjdCB2YzRfYm8gKmJvKQogCQliby0+dmFsaWRhdGVkX3No
YWRlciA9IE5VTEw7CiAJfQogCi0JcmVzZXJ2YXRpb25fb2JqZWN0X2ZpbmkoJmJvLT5fcmVzdik7
Ci0KIAlkcm1fZ2VtX2NtYV9mcmVlX29iamVjdChvYmopOwogfQogCkBAIC00MjcsOCArNDI1LDYg
QEAgc3RydWN0IGRybV9nZW1fb2JqZWN0ICp2YzRfY3JlYXRlX29iamVjdChzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2LCBzaXplX3Qgc2l6ZSkKIAl2YzQtPmJvX2xhYmVsc1tWQzRfQk9fVFlQRV9LRVJO
RUxdLm51bV9hbGxvY2F0ZWQrKzsKIAl2YzQtPmJvX2xhYmVsc1tWQzRfQk9fVFlQRV9LRVJORUxd
LnNpemVfYWxsb2NhdGVkICs9IHNpemU7CiAJbXV0ZXhfdW5sb2NrKCZ2YzQtPmJvX2xvY2spOwot
CWJvLT5yZXN2ID0gJmJvLT5fcmVzdjsKLQlyZXNlcnZhdGlvbl9vYmplY3RfaW5pdChiby0+cmVz
dik7CiAKIAlyZXR1cm4gJmJvLT5iYXNlLmJhc2U7CiB9CkBAIC02ODQsMTMgKzY4MCw2IEBAIHN0
YXRpYyB2b2lkIHZjNF9ib19jYWNoZV90aW1lX3RpbWVyKHN0cnVjdCB0aW1lcl9saXN0ICp0KQog
CXNjaGVkdWxlX3dvcmsoJnZjNC0+Ym9fY2FjaGUudGltZV93b3JrKTsKIH0KIAotc3RydWN0IHJl
c2VydmF0aW9uX29iamVjdCAqdmM0X3ByaW1lX3Jlc19vYmooc3RydWN0IGRybV9nZW1fb2JqZWN0
ICpvYmopCi17Ci0Jc3RydWN0IHZjNF9ibyAqYm8gPSB0b192YzRfYm8ob2JqKTsKLQotCXJldHVy
biBiby0+cmVzdjsKLX0KLQogc3RydWN0IGRtYV9idWYgKgogdmM0X3ByaW1lX2V4cG9ydChzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgaW50IGZsYWdz
KQogewpAQCAtODIyLDE0ICs4MTEsMTIgQEAgdmM0X3ByaW1lX2ltcG9ydF9zZ190YWJsZShzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJICBzdHJ1Y3Qgc2dfdGFibGUgKnNndCkKIHsKIAlzdHJ1
Y3QgZHJtX2dlbV9vYmplY3QgKm9iajsKLQlzdHJ1Y3QgdmM0X2JvICpibzsKIAogCW9iaiA9IGRy
bV9nZW1fY21hX3ByaW1lX2ltcG9ydF9zZ190YWJsZShkZXYsIGF0dGFjaCwgc2d0KTsKIAlpZiAo
SVNfRVJSKG9iaikpCiAJCXJldHVybiBvYmo7CiAKLQlibyA9IHRvX3ZjNF9ibyhvYmopOwotCWJv
LT5yZXN2ID0gYXR0YWNoLT5kbWFidWYtPnJlc3Y7CisJb2JqLT5yZXN2ID0gYXR0YWNoLT5kbWFi
dWYtPnJlc3Y7CiAKIAlyZXR1cm4gb2JqOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L3ZjNC92YzRfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9kcnYuYwppbmRleCBmNmY1
Y2Q4MGMwNGQuLmQxN2RmOGMwMjkxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92
YzRfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2LmMKQEAgLTIwMSw3ICsy
MDEsNiBAQCBzdGF0aWMgc3RydWN0IGRybV9kcml2ZXIgdmM0X2RybV9kcml2ZXIgPSB7CiAJLnBy
aW1lX2ZkX3RvX2hhbmRsZSA9IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlLAogCS5nZW1fcHJp
bWVfaW1wb3J0ID0gZHJtX2dlbV9wcmltZV9pbXBvcnQsCiAJLmdlbV9wcmltZV9leHBvcnQgPSB2
YzRfcHJpbWVfZXhwb3J0LAotCS5nZW1fcHJpbWVfcmVzX29iaiA9IHZjNF9wcmltZV9yZXNfb2Jq
LAogCS5nZW1fcHJpbWVfZ2V0X3NnX3RhYmxlCT0gZHJtX2dlbV9jbWFfcHJpbWVfZ2V0X3NnX3Rh
YmxlLAogCS5nZW1fcHJpbWVfaW1wb3J0X3NnX3RhYmxlID0gdmM0X3ByaW1lX2ltcG9ydF9zZ190
YWJsZSwKIAkuZ2VtX3ByaW1lX3ZtYXAgPSB2YzRfcHJpbWVfdm1hcCwKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfZHJ2
LmgKaW5kZXggNGY4N2IwM2Y4MzdkLi43NmU2YmU5ZjdmN2IgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS92YzQvdmM0X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2Rydi5o
CkBAIC03LDcgKzcsNyBAQAogICovCiAKICNpbmNsdWRlIDxsaW51eC9tbV90eXBlcy5oPgotI2lu
Y2x1ZGUgPGxpbnV4L3Jlc2VydmF0aW9uLmg+CisvLyNpbmNsdWRlIDxsaW51eC9yZXNlcnZhdGlv
bi5oPgogI2luY2x1ZGUgPGRybS9kcm1QLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9lbmNvZGVyLmg+
CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21hX2hlbHBlci5oPgpAQCAtMjM5LDEwICsyMzksNiBA
QCBzdHJ1Y3QgdmM0X2JvIHsKIAkgKi8KIAlzdHJ1Y3QgdmM0X3ZhbGlkYXRlZF9zaGFkZXJfaW5m
byAqdmFsaWRhdGVkX3NoYWRlcjsKIAotCS8qIG5vcm1hbGx5IChyZXN2ID09ICZfcmVzdikgZXhj
ZXB0IGZvciBpbXBvcnRlZCBibydzICovCi0Jc3RydWN0IHJlc2VydmF0aW9uX29iamVjdCAqcmVz
djsKLQlzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0IF9yZXN2OwotCiAJLyogT25lIG9mIGVudW0g
dmM0X2tlcm5lbF9ib190eXBlLCBvciBWQzRfQk9fVFlQRV9DT1VOVCArIGkKIAkgKiBmb3IgdXNl
ci1hbGxvY2F0ZWQgbGFiZWxzLgogCSAqLwpAQCAtNjg0LDcgKzY4MCw2IEBAIGludCB2YzRfbGFi
ZWxfYm9faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJICAgICAg
IHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KTsKIHZtX2ZhdWx0X3QgdmM0X2ZhdWx0KHN0cnVj
dCB2bV9mYXVsdCAqdm1mKTsKIGludCB2YzRfbW1hcChzdHJ1Y3QgZmlsZSAqZmlscCwgc3RydWN0
IHZtX2FyZWFfc3RydWN0ICp2bWEpOwotc3RydWN0IHJlc2VydmF0aW9uX29iamVjdCAqdmM0X3By
aW1lX3Jlc19vYmooc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopOwogaW50IHZjNF9wcmltZV9t
bWFwKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZt
YSk7CiBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKnZjNF9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJCSBzdHJ1Y3QgZG1hX2J1Zl9hdHRhY2htZW50ICph
dHRhY2gsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0uYyBiL2RyaXZl
cnMvZ3B1L2RybS92YzQvdmM0X2dlbS5jCmluZGV4IGFlYTJiOGRmZWMxNy4uNWVlNWJmN2ZlZGY3
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9nZW0uYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vdmM0L3ZjNF9nZW0uYwpAQCAtNTM2LDcgKzUzNiw3IEBAIHZjNF91cGRhdGVfYm9f
c2Vxbm9zKHN0cnVjdCB2YzRfZXhlY19pbmZvICpleGVjLCB1aW50NjRfdCBzZXFubykKIAkJYm8g
PSB0b192YzRfYm8oJmV4ZWMtPmJvW2ldLT5iYXNlKTsKIAkJYm8tPnNlcW5vID0gc2Vxbm87CiAK
LQkJcmVzZXJ2YXRpb25fb2JqZWN0X2FkZF9zaGFyZWRfZmVuY2UoYm8tPnJlc3YsIGV4ZWMtPmZl
bmNlKTsKKwkJcmVzZXJ2YXRpb25fb2JqZWN0X2FkZF9zaGFyZWRfZmVuY2UoYm8tPmJhc2UuYmFz
ZS5yZXN2LCBleGVjLT5mZW5jZSk7CiAJfQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShibywgJmV4
ZWMtPnVucmVmX2xpc3QsIHVucmVmX2hlYWQpIHsKQEAgLTU0Nyw3ICs1NDcsNyBAQCB2YzRfdXBk
YXRlX2JvX3NlcW5vcyhzdHJ1Y3QgdmM0X2V4ZWNfaW5mbyAqZXhlYywgdWludDY0X3Qgc2Vxbm8p
CiAJCWJvID0gdG9fdmM0X2JvKCZleGVjLT5yY2xfd3JpdGVfYm9baV0tPmJhc2UpOwogCQliby0+
d3JpdGVfc2Vxbm8gPSBzZXFubzsKIAotCQlyZXNlcnZhdGlvbl9vYmplY3RfYWRkX2V4Y2xfZmVu
Y2UoYm8tPnJlc3YsIGV4ZWMtPmZlbmNlKTsKKwkJcmVzZXJ2YXRpb25fb2JqZWN0X2FkZF9leGNs
X2ZlbmNlKGJvLT5iYXNlLmJhc2UucmVzdiwgZXhlYy0+ZmVuY2UpOwogCX0KIH0KIApAQCAtNTU5
LDcgKzU1OSw3IEBAIHZjNF91bmxvY2tfYm9fcmVzZXJ2YXRpb25zKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsCiAJaW50IGk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgZXhlYy0+Ym9fY291bnQ7IGkrKykg
ewotCQlzdHJ1Y3QgdmM0X2JvICpibyA9IHRvX3ZjNF9ibygmZXhlYy0+Ym9baV0tPmJhc2UpOwor
CQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKmJvID0gJmV4ZWMtPmJvW2ldLT5iYXNlOwogCiAJCXd3
X211dGV4X3VubG9jaygmYm8tPnJlc3YtPmxvY2spOwogCX0KQEAgLTU4MSwxMyArNTgxLDEzIEBA
IHZjNF9sb2NrX2JvX3Jlc2VydmF0aW9ucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogewogCWlu
dCBjb250ZW5kZWRfbG9jayA9IC0xOwogCWludCBpLCByZXQ7Ci0Jc3RydWN0IHZjNF9ibyAqYm87
CisJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpibzsKIAogCXd3X2FjcXVpcmVfaW5pdChhY3F1aXJl
X2N0eCwgJnJlc2VydmF0aW9uX3d3X2NsYXNzKTsKIAogcmV0cnk6CiAJaWYgKGNvbnRlbmRlZF9s
b2NrICE9IC0xKSB7Ci0JCWJvID0gdG9fdmM0X2JvKCZleGVjLT5ib1tjb250ZW5kZWRfbG9ja10t
PmJhc2UpOworCQlibyA9ICZleGVjLT5ib1tjb250ZW5kZWRfbG9ja10tPmJhc2U7CiAJCXJldCA9
IHd3X211dGV4X2xvY2tfc2xvd19pbnRlcnJ1cHRpYmxlKCZiby0+cmVzdi0+bG9jaywKIAkJCQkJ
CSAgICAgICBhY3F1aXJlX2N0eCk7CiAJCWlmIChyZXQpIHsKQEAgLTYwMCwxOSArNjAwLDE5IEBA
IHZjNF9sb2NrX2JvX3Jlc2VydmF0aW9ucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAo
aSA9PSBjb250ZW5kZWRfbG9jaykKIAkJCWNvbnRpbnVlOwogCi0JCWJvID0gdG9fdmM0X2JvKCZl
eGVjLT5ib1tpXS0+YmFzZSk7CisJCWJvID0gJmV4ZWMtPmJvW2ldLT5iYXNlOwogCiAJCXJldCA9
IHd3X211dGV4X2xvY2tfaW50ZXJydXB0aWJsZSgmYm8tPnJlc3YtPmxvY2ssIGFjcXVpcmVfY3R4
KTsKIAkJaWYgKHJldCkgewogCQkJaW50IGo7CiAKIAkJCWZvciAoaiA9IDA7IGogPCBpOyBqKysp
IHsKLQkJCQlibyA9IHRvX3ZjNF9ibygmZXhlYy0+Ym9bal0tPmJhc2UpOworCQkJCWJvID0gJmV4
ZWMtPmJvW2pdLT5iYXNlOwogCQkJCXd3X211dGV4X3VubG9jaygmYm8tPnJlc3YtPmxvY2spOwog
CQkJfQogCiAJCQlpZiAoY29udGVuZGVkX2xvY2sgIT0gLTEgJiYgY29udGVuZGVkX2xvY2sgPj0g
aSkgewotCQkJCWJvID0gdG9fdmM0X2JvKCZleGVjLT5ib1tjb250ZW5kZWRfbG9ja10tPmJhc2Up
OworCQkJCWJvID0gJmV4ZWMtPmJvW2NvbnRlbmRlZF9sb2NrXS0+YmFzZTsKIAogCQkJCXd3X211
dGV4X3VubG9jaygmYm8tPnJlc3YtPmxvY2spOwogCQkJfQpAQCAtNjMzLDcgKzYzMyw3IEBAIHZj
NF9sb2NrX2JvX3Jlc2VydmF0aW9ucyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIGJlZm9y
ZSB3ZSBjb21taXQgdGhlIENMIHRvIHRoZSBoYXJkd2FyZS4KIAkgKi8KIAlmb3IgKGkgPSAwOyBp
IDwgZXhlYy0+Ym9fY291bnQ7IGkrKykgewotCQlibyA9IHRvX3ZjNF9ibygmZXhlYy0+Ym9baV0t
PmJhc2UpOworCQlibyA9ICZleGVjLT5ib1tpXS0+YmFzZTsKIAogCQlyZXQgPSByZXNlcnZhdGlv
bl9vYmplY3RfcmVzZXJ2ZV9zaGFyZWQoYm8tPnJlc3YsIDEpOwogCQlpZiAocmV0KSB7CmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jIGIvZHJpdmVycy9ncHUvZHJt
L3ZjNC92YzRfcGxhbmUuYwppbmRleCA3NWRiNjJjYmU0NjguLmI4YmFjZWViYjczYiAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vdmM0L3ZjNF9wbGFuZS5jCkBAIC05OTQsNyArOTk0LDcgQEAgc3RhdGljIGludCB2YzRfcHJl
cGFyZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCWJvID0gdG9fdmM0X2JvKCZkcm1f
ZmJfY21hX2dldF9nZW1fb2JqKHN0YXRlLT5mYiwgMCktPmJhc2UpOwogCi0JZmVuY2UgPSByZXNl
cnZhdGlvbl9vYmplY3RfZ2V0X2V4Y2xfcmN1KGJvLT5yZXN2KTsKKwlmZW5jZSA9IHJlc2VydmF0
aW9uX29iamVjdF9nZXRfZXhjbF9yY3UoYm8tPmJhc2UuYmFzZS5yZXN2KTsKIAlkcm1fYXRvbWlj
X3NldF9mZW5jZV9mb3JfcGxhbmUoc3RhdGUsIGZlbmNlKTsKIAogCWlmIChwbGFuZS0+c3RhdGUt
PmZiID09IHN0YXRlLT5mYikKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v
bGlzdGluZm8vZHJpLWRldmVsCg==