From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: [PATCH 3/5] drm/armada: fix UV swap code Date: Wed, 29 Nov 2017 11:45:54 +0000 Message-ID: References: <20171129114516.GD8356@n2100.armlinux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by gabe.freedesktop.org (Postfix) with ESMTPS id C79816E377 for ; Wed, 29 Nov 2017 11:45:57 +0000 (UTC) In-Reply-To: <20171129114516.GD8356@n2100.armlinux.org.uk> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIFVWIHN3YXAgY29kZSB3YXMgbm90IGFsd2F5cyBwcm9ncmFtbWluZyB0aGluZ3MgY29ycmVj dGx5IHdoZW4KdGhlIHNvdXJjZSBvcmlnaW4gYm94IGhhcyBiZWVuIG9mZnNldC4gIEZpeCB0aGlz LgoKU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsra2VybmVsQGFybWxpbnV4Lm9yZy51 az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYXJtYWRhL2FybWFkYV9jcnRjLmggICAgfCAgMiArKwog ZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfb3ZlcmxheS5jIHwgMzggKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDIxIGluc2VydGlvbnMoKyks IDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJt YWRhX2NydGMuaCBiL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2NydGMuaAppbmRleCBi YWIxMWY0ODM1NzUuLmJmZDM1MTRmYmU5YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Fy bWFkYS9hcm1hZGFfY3J0Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX2Ny dGMuaApAQCAtNDIsNiArNDIsOCBAQCBzdHJ1Y3QgYXJtYWRhX3BsYW5lX3dvcmsgewogfTsKIAog c3RydWN0IGFybWFkYV9wbGFuZV9zdGF0ZSB7CisJdTE2IHNyY194OworCXUxNiBzcmNfeTsKIAl1 MzIgc3JjX2h3OwogCXUzMiBkc3RfaHc7CiAJdTMyIGRzdF95eDsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX292ZXJsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hcm1h ZGEvYXJtYWRhX292ZXJsYXkuYwppbmRleCBiNDExYjYwODgyMWEuLmFiYTk0NzY5NjE3OCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FybWFkYS9hcm1hZGFfb3ZlcmxheS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hcm1hZGEvYXJtYWRhX292ZXJsYXkuYwpAQCAtOTksNiArOTksNyBAQCBh cm1hZGFfb3ZsX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRy bV9jcnRjICpjcnRjLAogewogCXN0cnVjdCBhcm1hZGFfb3ZsX3BsYW5lICpkcGxhbmUgPSBkcm1f dG9fYXJtYWRhX292bF9wbGFuZShwbGFuZSk7CiAJc3RydWN0IGFybWFkYV9jcnRjICpkY3J0YyA9 IGRybV90b19hcm1hZGFfY3J0YyhjcnRjKTsKKwljb25zdCBzdHJ1Y3QgZHJtX2Zvcm1hdF9pbmZv ICpmb3JtYXQ7CiAJc3RydWN0IGRybV9yZWN0IHNyYyA9IHsKIAkJLngxID0gc3JjX3gsCiAJCS55 MSA9IHNyY195LApAQCAtMTE3LDcgKzExOCw3IEBAIGFybWFkYV9vdmxfcGxhbmVfdXBkYXRlKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJfTsKIAl1aW50 MzJfdCB2YWwsIGN0cmwwOwogCXVuc2lnbmVkIGlkeCA9IDA7Ci0JYm9vbCB2aXNpYmxlOworCWJv b2wgdmlzaWJsZSwgZmJfY2hhbmdlZDsKIAlpbnQgcmV0OwogCiAJdHJhY2VfYXJtYWRhX292bF9w bGFuZV91cGRhdGUocGxhbmUsIGNydGMsIGZiLApAQCAtMTM4LDYgKzEzOSwxOCBAQCBhcm1hZGFf b3ZsX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCWlmICghdmlzaWJsZSkKIAkJY3RybDAgJj0gfkNGR19ETUFfRU5BOwogCisJLyoK KwkgKiBTaGlmdGluZyBhIFlVViBwYWNrZWQgZm9ybWF0IGltYWdlIGJ5IG9uZSBwaXhlbCBjYXVz ZXMgdGhlIFUvVgorCSAqIHBsYW5lcyB0byBzd2FwLiAgQ29tcGVuc2F0ZSBmb3IgaXQgYnkgYWxz byB0b2dnbGluZyB0aGUgVVYgc3dhcC4KKwkgKi8KKwlmb3JtYXQgPSBmYi0+Zm9ybWF0OworCWlm IChmb3JtYXQtPm51bV9wbGFuZXMgPT0gMSAmJiBzcmMueDEgPj4gMTYgJiAoZm9ybWF0LT5oc3Vi IC0gMSkpCisJCWN0cmwwIF49IENGR19ETUFfTU9EKENGR19TV0FQVVYpOworCisJZmJfY2hhbmdl ZCA9IHBsYW5lLT5mYiAhPSBmYiB8fAorCQkgICAgIGRwbGFuZS0+YmFzZS5zdGF0ZS5zcmNfeCAh PSBzcmMueDEgPj4gMTYgfHwKKwkgICAgICAgICAgICAgZHBsYW5lLT5iYXNlLnN0YXRlLnNyY195 ICE9IHNyYy55MSA+PiAxNjsKKwogCWlmICghZGNydGMtPnBsYW5lKSB7CiAJCWRjcnRjLT5wbGFu ZSA9IHBsYW5lOwogCQlhcm1hZGFfb3ZsX3VwZGF0ZV9hdHRyKCZkcGxhbmUtPnByb3AsIGRjcnRj KTsKQEAgLTE0NSw3ICsxNTgsNyBAQCBhcm1hZGFfb3ZsX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiAJLyogRklYTUU6IG92ZXJs YXkgb24gYW4gaW50ZXJsYWNlZCBkaXNwbGF5ICovCiAJLyogSnVzdCB1cGRhdGluZyB0aGUgcG9z aXRpb24vc2l6ZT8gKi8KLQlpZiAocGxhbmUtPmZiID09IGZiICYmIGRwbGFuZS0+YmFzZS5zdGF0 ZS5jdHJsMCA9PSBjdHJsMCkgeworCWlmICghZmJfY2hhbmdlZCAmJiBkcGxhbmUtPmJhc2Uuc3Rh dGUuY3RybDAgPT0gY3RybDApIHsKIAkJdmFsID0gKGRybV9yZWN0X2hlaWdodCgmc3JjKSAmIDB4 ZmZmZjAwMDApIHwKIAkJICAgICAgZHJtX3JlY3Rfd2lkdGgoJnNyYykgPj4gMTY7CiAJCWRwbGFu ZS0+YmFzZS5zdGF0ZS5zcmNfaHcgPSB2YWw7CkBAIC0xNjksOSArMTgyLDggQEAgYXJtYWRhX292 bF9wbGFuZV91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAlpZiAoYXJtYWRhX2RybV9wbGFuZV93b3JrX3dhaXQoJmRwbGFuZS0+YmFzZSwgSFog LyAyNSkgPT0gMCkKIAkJYXJtYWRhX2RybV9wbGFuZV93b3JrX2NhbmNlbChkY3J0YywgJmRwbGFu ZS0+YmFzZSk7CiAKLQlpZiAocGxhbmUtPmZiICE9IGZiKSB7Ci0JCXUzMiBhZGRyc1szXSwgcGl4 ZWxfZm9ybWF0OwotCQlpbnQgbnVtX3BsYW5lcywgaHN1YjsKKwlpZiAoZmJfY2hhbmdlZCkgewor CQl1MzIgYWRkcnNbM107CiAKIAkJLyoKIAkJICogVGFrZSBhIHJlZmVyZW5jZSBvbiB0aGUgbmV3 IGZyYW1lYnVmZmVyIC0gd2Ugd2FudCB0bwpAQCAtMTgyLDIzICsxOTQsMTEgQEAgYXJtYWRhX292 bF9wbGFuZV91cGRhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAkJaWYgKHBsYW5lLT5mYikKIAkJCWFybWFkYV9vdmxfcmV0aXJlX2ZiKGRwbGFuZSwg cGxhbmUtPmZiKTsKIAotCQlzcmNfeSA9IHNyYy55MSA+PiAxNjsKLQkJc3JjX3ggPSBzcmMueDEg Pj4gMTY7CisJCWRwbGFuZS0+YmFzZS5zdGF0ZS5zcmNfeSA9IHNyY195ID0gc3JjLnkxID4+IDE2 OworCQlkcGxhbmUtPmJhc2Uuc3RhdGUuc3JjX3ggPSBzcmNfeCA9IHNyYy54MSA+PiAxNjsKIAog CQlhcm1hZGFfZHJtX3BsYW5lX2NhbGNfYWRkcnMoYWRkcnMsIGZiLCBzcmNfeCwgc3JjX3kpOwog Ci0JCXBpeGVsX2Zvcm1hdCA9IGZiLT5mb3JtYXQtPmZvcm1hdDsKLQkJaHN1YiA9IGRybV9mb3Jt YXRfaG9yel9jaHJvbWFfc3Vic2FtcGxpbmcocGl4ZWxfZm9ybWF0KTsKLQkJbnVtX3BsYW5lcyA9 IGZiLT5mb3JtYXQtPm51bV9wbGFuZXM7Ci0KLQkJLyoKLQkJICogQW5ub3lpbmdseSwgc2hpZnRp bmcgYSBZVVlWLWZvcm1hdCBpbWFnZSBieSBvbmUgcGl4ZWwKLQkJICogY2F1c2VzIHRoZSBVL1Yg cGxhbmVzIHRvIHRvZ2dsZS4gIFRvZ2dsZSB0aGUgVVYgc3dhcC4KLQkJICogKFVuZm9ydHVuYXRl bHksIHRoaXMgY2F1c2VzIG1vbWVudGFyeSBjb2xvdXIgZmxpY2tlcmluZy4pCi0JCSAqLwotCQlp ZiAoc3JjX3ggJiAoaHN1YiAtIDEpICYmIG51bV9wbGFuZXMgPT0gMSkKLQkJCWN0cmwwIF49IENG R19ETUFfTU9EKENGR19TV0FQVVYpOwotCiAJCWFybWFkYV9yZWdfcXVldWVfc2V0KGRwbGFuZS0+ dmJsLnJlZ3MsIGlkeCwgYWRkcnNbMF0sCiAJCQkJICAgICBMQ0RfU1BVX0RNQV9TVEFSVF9BRERS X1kwKTsKIAkJYXJtYWRhX3JlZ19xdWV1ZV9zZXQoZHBsYW5lLT52YmwucmVncywgaWR4LCBhZGRy c1sxXSwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwK