From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 4/8] drm/tegra: dc: Consistently use the same pipe Date: Tue, 16 Dec 2014 17:15:11 +0100 Message-ID: <1418746515-24773-5-git-send-email-thierry.reding@gmail.com> References: <1418746515-24773-1-git-send-email-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D9406E8EF for ; Tue, 16 Dec 2014 08:15:40 -0800 (PST) Received: by mail-pd0-f170.google.com with SMTP id v10so14227221pde.29 for ; Tue, 16 Dec 2014 08:15:40 -0800 (PST) In-Reply-To: <1418746515-24773-1-git-send-email-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Alexandre Courbot List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClRoZSBoYXJkd2FyZSBw aXBlIG51bWJlcnMgZG9uJ3QgYWx3YXlzIG1hdGNoIHRoZSBEUk0gQ1JUQyBpbmRpY2VzLiBUaGlz CmNhbiBoYXBwZW4gZm9yIGV4YW1wbGUgaWYgdGhlIGZpcnN0IGRpc3BsYXkgY29udHJvbGxlciBk ZWZlcnMgcHJvYmUsCmNhdXNpbmcgaXQgdG8gYmUgcmVnaXN0ZXJlZCB3aXRoIERSTSBhZnRlciB0 aGUgc2Vjb25kIGRpc3BsYXkKY29udHJvbGxlci4gV2hlbiB0aGF0IGhhcHBlbnMgdGhlIGhhcmR3 YXJlIHBpcGUgbnVtYmVycyBhbmQgRFJNIENSVEMKaW5kaWNlcyBiZWNvbWUgZGlmZmVyZW50LiBN YWtlIHN1cmUgdGhhdCB0aGUgQ1JUQyBpbmRleCBpcyBhbHdheXMgdXNlZAp3aGVuIGFjY2Vzc2lu ZyBwZXItQ1JUQyBWQkxBTksgZGF0YS4gVGhpcyBjYW4gYmUgZW5zdXJlZCBieSB1c2luZyB0aGUK ZHJtX2NydGNfdmJsYW5rXyooKSBBUEksIHdoaWNoIHdpbGwgZG8gdGhlIHJpZ2h0IHRoaW5nIGF1 dG9tYXRpY2FsbHkKZ2l2ZW4gYSBzdHJ1Y3QgZHJtX2NydGMgKi4KClNpZ25lZC1vZmYtYnk6IFRo aWVycnkgUmVkaW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3Rl Z3JhL2RjLmMgIHwgMTQgKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS90ZWdyYS9kcm0u YyB8IDE2ICsrKysrKysrKystLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygr KSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2Rj LmMgYi9kcml2ZXJzL2dwdS9kcm0vdGVncmEvZGMuYwppbmRleCA3ZmU3YmIxMjI3Y2YuLjRjNmE4 YTgyODQ3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL3RlZ3JhL2RjLmMKQEAgLTgyNiw4ICs4MjYsOCBAQCBzdGF0aWMgdm9pZCB0 ZWdyYV9kY19maW5pc2hfcGFnZV9mbGlwKHN0cnVjdCB0ZWdyYV9kYyAqZGMpCiAKIAlpZiAoYmFz ZSA9PSBiby0+cGFkZHIgKyBjcnRjLT5wcmltYXJ5LT5mYi0+b2Zmc2V0c1swXSkgewogCQlzcGlu X2xvY2tfaXJxc2F2ZSgmZHJtLT5ldmVudF9sb2NrLCBmbGFncyk7Ci0JCWRybV9zZW5kX3ZibGFu a19ldmVudChkcm0sIGRjLT5waXBlLCBkYy0+ZXZlbnQpOwotCQlkcm1fdmJsYW5rX3B1dChkcm0s IGRjLT5waXBlKTsKKwkJZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoY3J0YywgZGMtPmV2ZW50 KTsKKwkJZHJtX2NydGNfdmJsYW5rX3B1dChjcnRjKTsKIAkJZGMtPmV2ZW50ID0gTlVMTDsKIAkJ c3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZHJtLT5ldmVudF9sb2NrLCBmbGFncyk7CiAJfQpAQCAt ODQzLDcgKzg0Myw3IEBAIHZvaWQgdGVncmFfZGNfY2FuY2VsX3BhZ2VfZmxpcChzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIAogCWlmIChkYy0+ZXZlbnQgJiYg ZGMtPmV2ZW50LT5iYXNlLmZpbGVfcHJpdiA9PSBmaWxlKSB7CiAJCWRjLT5ldmVudC0+YmFzZS5k ZXN0cm95KCZkYy0+ZXZlbnQtPmJhc2UpOwotCQlkcm1fdmJsYW5rX3B1dChkcm0sIGRjLT5waXBl KTsKKwkJZHJtX2NydGNfdmJsYW5rX3B1dChjcnRjKTsKIAkJZGMtPmV2ZW50ID0gTlVMTDsKIAl9 CiAKQEAgLTg1MywxNiArODUzLDE2IEBAIHZvaWQgdGVncmFfZGNfY2FuY2VsX3BhZ2VfZmxpcChz dHJ1Y3QgZHJtX2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSkKIHN0YXRpYyBpbnQg dGVncmFfZGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5rX2V2ZW50ICpl dmVudCwgdWludDMyX3QgcGFnZV9mbGlwX2ZsYWdzKQogeworCXVuc2lnbmVkIGludCBwaXBlID0g ZHJtX2NydGNfaW5kZXgoY3J0Yyk7CiAJc3RydWN0IHRlZ3JhX2RjICpkYyA9IHRvX3RlZ3JhX2Rj KGNydGMpOwotCXN0cnVjdCBkcm1fZGV2aWNlICpkcm0gPSBjcnRjLT5kZXY7CiAKIAlpZiAoZGMt PmV2ZW50KQogCQlyZXR1cm4gLUVCVVNZOwogCiAJaWYgKGV2ZW50KSB7Ci0JCWV2ZW50LT5waXBl ID0gZGMtPnBpcGU7CisJCWV2ZW50LT5waXBlID0gcGlwZTsKIAkJZGMtPmV2ZW50ID0gZXZlbnQ7 Ci0JCWRybV92YmxhbmtfZ2V0KGRybSwgZGMtPnBpcGUpOworCQlkcm1fY3J0Y192YmxhbmtfZ2V0 KGNydGMpOwogCX0KIAogCXRlZ3JhX2RjX3NldF9iYXNlKGRjLCAwLCAwLCBmYik7CkBAIC0xMTIy LDcgKzExMjIsNyBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgdGVncmFfZGNfaXJxKGludCBpcnEsIHZv aWQgKmRhdGEpCiAJCS8qCiAJCWRldl9kYmcoZGMtPmRldiwgIiVzKCk6IHZlcnRpY2FsIGJsYW5r XG4iLCBfX2Z1bmNfXyk7CiAJCSovCi0JCWRybV9oYW5kbGVfdmJsYW5rKGRjLT5iYXNlLmRldiwg ZGMtPnBpcGUpOworCQlkcm1fY3J0Y19oYW5kbGVfdmJsYW5rKCZkYy0+YmFzZSk7CiAJCXRlZ3Jh X2RjX2ZpbmlzaF9wYWdlX2ZsaXAoZGMpOwogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL3RlZ3JhL2RybS5jIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RybS5jCmluZGV4IGU1NDlh ZmVlY2UxZi4uZDRmODI3NTkzZGZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdGVncmEv ZHJtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3RlZ3JhL2RybS5jCkBAIC02OTQsMjQgKzY5NCwy OCBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGZpbGVfb3BlcmF0aW9ucyB0ZWdyYV9kcm1fZm9wcyA9 IHsKIAkubGxzZWVrID0gbm9vcF9sbHNlZWssCiB9OwogCi1zdGF0aWMgc3RydWN0IGRybV9jcnRj ICp0ZWdyYV9jcnRjX2Zyb21fcGlwZShzdHJ1Y3QgZHJtX2RldmljZSAqZHJtLCBpbnQgcGlwZSkK K3N0YXRpYyBzdHJ1Y3QgZHJtX2NydGMgKnRlZ3JhX2NydGNfZnJvbV9waXBlKHN0cnVjdCBkcm1f ZGV2aWNlICpkcm0sCisJCQkJCSAgICAgdW5zaWduZWQgaW50IHBpcGUpCiB7CiAJc3RydWN0IGRy bV9jcnRjICpjcnRjOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZHJtLT5tb2RlX2Nv bmZpZy5jcnRjX2xpc3QsIGhlYWQpIHsKLQkJc3RydWN0IHRlZ3JhX2RjICpkYyA9IHRvX3RlZ3Jh X2RjKGNydGMpOwotCi0JCWlmIChkYy0+cGlwZSA9PSBwaXBlKQorCQlpZiAocGlwZSA9PSBkcm1f Y3J0Y19pbmRleChjcnRjKSkKIAkJCXJldHVybiBjcnRjOwogCX0KIAogCXJldHVybiBOVUxMOwog fQogCi1zdGF0aWMgdTMyIHRlZ3JhX2RybV9nZXRfdmJsYW5rX2NvdW50ZXIoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgaW50IGNydGMpCitzdGF0aWMgdTMyIHRlZ3JhX2RybV9nZXRfdmJsYW5rX2Nv dW50ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRybSwgaW50IHBpcGUpCiB7CisJc3RydWN0IGRybV9j cnRjICpjcnRjID0gdGVncmFfY3J0Y19mcm9tX3BpcGUoZHJtLCBwaXBlKTsKKworCWlmICghY3J0 YykKKwkJcmV0dXJuIDA7CisKIAkvKiBUT0RPOiBpbXBsZW1lbnQgcmVhbCBoYXJkd2FyZSBjb3Vu dGVyIHVzaW5nIHN5bmNwb2ludHMgKi8KLQlyZXR1cm4gZHJtX3ZibGFua19jb3VudChkZXYsIGNy dGMpOworCXJldHVybiBkcm1fY3J0Y192YmxhbmtfY291bnQoY3J0Yyk7CiB9CiAKIHN0YXRpYyBp bnQgdGVncmFfZHJtX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRybSwgaW50IHBp cGUpCi0tIAoyLjEuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK