From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati 2/2] Store FB for each CRTC in drmmode_flipdata_rec Date: Thu, 2 Aug 2018 19:05:30 +0200 Message-ID: <20180802170530.29060-2-michel@daenzer.net> References: <20180802170530.29060-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180802170530.29060-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpXZSB3ZXJlIG9u bHkgc3RvcmluZyB0aGUgRkIgcHJvdmlkZWQgYnkgdGhlIGNsaWVudCwgYnV0IG9uIENSVENzIHdp dGgKVGVhckZyZWUgZW5hYmxlZCwgd2UgdXNlIGEgc2VwYXJhdGUgRkIuIFRoaXMgY291bGQgY2F1 c2UKZHJtbW9kZV9mbGlwX2hhbmRsZXIgdG8gZmFpbCB0byBjbGVhciBkcm1tb2RlX2NydGMtPmZs aXBfcGVuZGluZywgd2hpY2gKY291bGQgcmVzdWx0IGluIGEgaGFuZyB3aGVuIHdhaXRpbmcgZm9y IHRoZSBwZW5kaW5nIGZsaXAgdG8gY29tcGxldGUuIFdlCndlcmUgdHJ5aW5nIHRvIGF2b2lkIHRo YXQgYnkgYWx3YXlzIGNsZWFyaW5nIGRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nCndoZW4gVGVh ckZyZWUgaXMgZW5hYmxlZCwgYnV0IHRoYXQgd2Fzbid0IHJlbGlhYmxlLCBiZWNhdXNlCmRybW1v ZGVfY3J0Yy0+dGVhcl9mcmVlIGNhbiBhbHJlYWR5IGJlIEZBTFNFIGF0IHRoaXMgcG9pbnQgd2hl bgpkaXNhYmxpbmcgVGVhckZyZWUuCgpOb3cgdGhhdCB3ZSdyZSBrZWVwaW5nIHRyYWNrIG9mIGVh Y2ggQ1JUQydzIGZsaXAgRkIgc2VwYXJhdGVseSwKZHJtbW9kZV9mbGlwX2hhbmRsZXIgY2FuIHJl bGlhYmx5IGNsZWFyIGZsaXBfcGVuZGluZywgYW5kIHdlIG5vIGxvbmdlcgpuZWVkIHRoZSBUZWFy RnJlZSBoYWNrLgoKKFBvcnRlZCBmcm9tIGFtZGdwdSBjb21taXQgOWI2NzgyYzgyMWUwYmRjNTMz MzZkOThmODdkZGRlNzUyZmFmNzkwMikKClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxt aWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIHNyYy9kcm1tb2RlX2Rpc3BsYXkuYyB8IDQ3ICsr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIHNyYy9kcm1tb2RlX2Rp c3BsYXkuaCB8ICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDIyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYyBiL3NyYy9kcm1t b2RlX2Rpc3BsYXkuYwppbmRleCA2YTBkYmEyYzguLjBiOTJiNzBjNiAxMDA2NDQKLS0tIGEvc3Jj L2RybW1vZGVfZGlzcGxheS5jCisrKyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwpAQCAtMjUzNiwx NyArMjUzNiwyMSBAQCBkcm1tb2RlX2ZsaXBfYWJvcnQoeGY4NkNydGNQdHIgY3J0Yywgdm9pZCAq ZXZlbnRfZGF0YSkKIAlkcm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjID0gY3J0 Yy0+ZHJpdmVyX3ByaXZhdGU7CiAJUkFERU9ORW50UHRyIHBSQURFT05FbnQgPSBSQURFT05FbnRQ cml2KGNydGMtPnNjcm4pOwogCWRybW1vZGVfZmxpcGRhdGFfcHRyIGZsaXBkYXRhID0gZXZlbnRf ZGF0YTsKKwlpbnQgY3J0Y19pZCA9IGRybW1vZGVfZ2V0X2NydGNfaWQoY3J0Yyk7CisJc3RydWN0 IGRybW1vZGVfZmIgKipmYiA9ICZmbGlwZGF0YS0+ZmJbY3J0Y19pZF07CisKKwlpZiAoZHJtbW9k ZV9jcnRjLT5mbGlwX3BlbmRpbmcgPT0gKmZiKSB7CisJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBS QURFT05FbnQtPmZkLCAmZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcsCisJCQkJICAgICBOVUxM KTsKKwl9CisJZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsIGZiLCBOVUxMKTsK IAogCWlmICgtLWZsaXBkYXRhLT5mbGlwX2NvdW50ID09IDApIHsKIAkJaWYgKCFmbGlwZGF0YS0+ ZmVfY3J0YykKIAkJCWZsaXBkYXRhLT5mZV9jcnRjID0gY3J0YzsKIAkJZmxpcGRhdGEtPmFib3J0 KGZsaXBkYXRhLT5mZV9jcnRjLCBmbGlwZGF0YS0+ZXZlbnRfZGF0YSk7Ci0JCWRybW1vZGVfZmJf cmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmZmxpcGRhdGEtPmZiLCBOVUxMKTsKIAkJZnJlZShm bGlwZGF0YSk7CiAJfQotCi0JZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsICZk cm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZywKLQkJCSAgICAgTlVMTCk7CiB9CiAKIHN0YXRpYyB2 b2lkCkBAIC0yNTU1LDYgKzI1NTksOCBAQCBkcm1tb2RlX2ZsaXBfaGFuZGxlcih4Zjg2Q3J0Y1B0 ciBjcnRjLCB1aW50MzJfdCBmcmFtZSwgdWludDY0X3QgdXNlYywgdm9pZCAqZXZlbgogCWRybW1v ZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsK IAlSQURFT05FbnRQdHIgcFJBREVPTkVudCA9IFJBREVPTkVudFByaXYoY3J0Yy0+c2Nybik7CiAJ ZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGEgPSBldmVudF9kYXRhOworCWludCBjcnRjX2lk ID0gZHJtbW9kZV9nZXRfY3J0Y19pZChjcnRjKTsKKwlzdHJ1Y3QgZHJtbW9kZV9mYiAqKmZiID0g JmZsaXBkYXRhLT5mYltjcnRjX2lkXTsKIAogCS8qIElzIHRoaXMgdGhlIGV2ZW50IHdob3NlIGlu Zm8gc2hhbGwgYmUgZGVsaXZlcmVkIHRvIGhpZ2hlciBsZXZlbD8gKi8KIAlpZiAoY3J0YyA9PSBm bGlwZGF0YS0+ZmVfY3J0YykgewpAQCAtMjU2MywxMyArMjU2OSwxMiBAQCBkcm1tb2RlX2ZsaXBf aGFuZGxlcih4Zjg2Q3J0Y1B0ciBjcnRjLCB1aW50MzJfdCBmcmFtZSwgdWludDY0X3QgdXNlYywg dm9pZCAqZXZlbgogCQlmbGlwZGF0YS0+ZmVfdXNlYyA9IHVzZWM7CiAJfQogCi0JZHJtbW9kZV9m Yl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZiLAotCQkJICAgICBm bGlwZGF0YS0+ZmIpOwotCWlmIChkcm1tb2RlX2NydGMtPnRlYXJfZnJlZSB8fAotCSAgICBkcm1t b2RlX2NydGMtPmZsaXBfcGVuZGluZyA9PSBmbGlwZGF0YS0+ZmIpIHsKKwlpZiAoZHJtbW9kZV9j cnRjLT5mbGlwX3BlbmRpbmcgPT0gKmZiKSB7CiAJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURF T05FbnQtPmZkLAogCQkJCSAgICAgJmRybW1vZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nLCBOVUxMKTsK IAl9CisJZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsICZkcm1tb2RlX2NydGMt PmZiLCAqZmIpOworCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCBmYiwgTlVM TCk7CiAKIAlpZiAoLS1mbGlwZGF0YS0+ZmxpcF9jb3VudCA9PSAwKSB7CiAJCS8qIERlbGl2ZXIg TVNDICYgVVNUIGZyb20gcmVmZXJlbmNlL2N1cnJlbnQgQ1JUQyB0byBmbGlwIGV2ZW50CkBAIC0y NTgxLDcgKzI1ODYsNiBAQCBkcm1tb2RlX2ZsaXBfaGFuZGxlcih4Zjg2Q3J0Y1B0ciBjcnRjLCB1 aW50MzJfdCBmcmFtZSwgdWludDY0X3QgdXNlYywgdm9pZCAqZXZlbgogCQllbHNlCiAJCQlmbGlw ZGF0YS0+aGFuZGxlcihjcnRjLCBmcmFtZSwgdXNlYywgZmxpcGRhdGEtPmV2ZW50X2RhdGEpOwog Ci0JCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmZmxpcGRhdGEtPmZiLCBO VUxMKTsKIAkJZnJlZShmbGlwZGF0YSk7CiAJfQogfQpAQCAtMzI4NywyMSArMzI5MSwyMiBAQCBC b29sIHJhZGVvbl9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50 LAogCXhmODZDcnRjQ29uZmlnUHRyIGNvbmZpZyA9IFhGODZfQ1JUQ19DT05GSUdfUFRSKHNjcm4p OwogCXhmODZDcnRjUHRyIGNydGMgPSBOVUxMOwogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBk cm1tb2RlX2NydGMgPSBjb25maWctPmNydGNbMF0tPmRyaXZlcl9wcml2YXRlOwotCWludCBpOwog CXVpbnQzMl90IGZsaXBfZmxhZ3MgPSBmbGlwX3N5bmMgPT0gRkxJUF9BU1lOQyA/IERSTV9NT0RF X1BBR0VfRkxJUF9BU1lOQyA6IDA7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGE7CiAJ dWludHB0cl90IGRybV9xdWV1ZV9zZXEgPSAwOworCXN0cnVjdCBkcm1tb2RlX2ZiICpmYjsKKwlp bnQgaSA9IDA7CiAKLSAgICAgICAgZmxpcGRhdGEgPSBjYWxsb2MoMSwgc2l6ZW9mKGRybW1vZGVf ZmxpcGRhdGFfcmVjKSk7CisJZmxpcGRhdGEgPSBjYWxsb2MoMSwgc2l6ZW9mKCpmbGlwZGF0YSkg KyBjb25maWctPm51bV9jcnRjICoKKwkJCSAgc2l6ZW9mKGZsaXBkYXRhLT5mYlswXSkpOwogICAg ICAgICBpZiAoIWZsaXBkYXRhKSB7CiAgICAgICAgICAgICAgeGY4NkRydk1zZyhzY3JuLT5zY3Ju SW5kZXgsIFhfV0FSTklORywKICAgICAgICAgICAgICAgICAgICAgICAgICJmbGlwIHF1ZXVlOiBk YXRhIGFsbG9jIGZhaWxlZC5cbiIpOwogICAgICAgICAgICAgIGdvdG8gZXJyb3I7CiAgICAgICAg IH0KIAotCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAmZmxpcGRhdGEtPmZi LAotCQkJICAgICByYWRlb25fcGl4bWFwX2dldF9mYihuZXdfZnJvbnQpKTsKLQlpZiAoIWZsaXBk YXRhLT5mYikgeworCWZiID0gcmFkZW9uX3BpeG1hcF9nZXRfZmIobmV3X2Zyb250KTsKKwlpZiAo IWZiKSB7CiAJCUVycm9yRigiRmFpbGVkIHRvIGdldCBGQiBmb3IgZmxpcFxuIik7CiAJCWdvdG8g ZXJyb3I7CiAJfQpAQCAtMzMyMiw4ICszMzI3LDYgQEAgQm9vbCByYWRlb25fZG9fcGFnZWZsaXAo U2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwKICAgICAgICAgZmxpcGRhdGEtPmZl X2NydGMgPSByZWZfY3J0YzsKIAogCWZvciAoaSA9IDA7IGkgPCBjb25maWctPm51bV9jcnRjOyBp KyspIHsKLQkJc3RydWN0IGRybW1vZGVfZmIgKmZiID0gZmxpcGRhdGEtPmZiOwotCiAJCWNydGMg PSBjb25maWctPmNydGNbaV07CiAJCWRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZlcl9wcml2YXRl OwogCkBAIC0zMzU5LDggKzMzNjIsOSBAQCBCb29sIHJhZGVvbl9kb19wYWdlZmxpcChTY3JuSW5m b1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50LAogCQkJCWdvdG8gbmV4dDsKIAkJCX0KIAotCQkJ ZmIgPSByYWRlb25fcGl4bWFwX2dldF9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9p ZF0ucGl4bWFwKTsKLQkJCWlmICghZmIpIHsKKwkJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURF T05FbnQtPmZkLCAmZmxpcGRhdGEtPmZiW2ldLAorCQkJCQkgICAgIHJhZGVvbl9waXhtYXBfZ2V0 X2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFtzY2Fub3V0X2lkXS5waXhtYXApKTsKKwkJCWlmICgh ZmxpcGRhdGEtPmZiW2ldKSB7CiAJCQkJRXJyb3JGKCJGYWlsZWQgdG8gZ2V0IEZCIGZvciBUZWFy RnJlZSBmbGlwXG4iKTsKIAkJCQlnb3RvIGVycm9yOwogCQkJfQpAQCAtMzM3NSw2ICszMzc5LDgg QEAgQm9vbCByYWRlb25fZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNs aWVudCwKIAkJCQlyYWRlb25fZHJtX2Fib3J0X2VudHJ5KGRybW1vZGVfY3J0Yy0+c2Nhbm91dF91 cGRhdGVfcGVuZGluZyk7CiAJCQkJZHJtbW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5n ID0gMDsKIAkJCX0KKwkJfSBlbHNlIHsKKwkJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05F bnQtPmZkLCAmZmxpcGRhdGEtPmZiW2ldLCBmYik7CiAJCX0KIAogCQlpZiAoY3J0YyA9PSByZWZf Y3J0YykgewpAQCAtMzQwMCw4ICszNDA2LDggQEAgQm9vbCByYWRlb25fZG9fcGFnZWZsaXAoU2Ny bkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwKIAkJfQogCiAJbmV4dDoKLQkJZHJtbW9k ZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQsCi0JCQkJICAgICAmZHJtbW9kZV9jcnRjLT5m bGlwX3BlbmRpbmcsIGZiKTsKKwkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocFJBREVPTkVudC0+ZmQs ICZkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZywKKwkJCQkgICAgIGZsaXBkYXRhLT5mYltpXSk7 CiAJCWRybV9xdWV1ZV9zZXEgPSAwOwogCX0KIApAQCAtMzQxOSw3ICszNDI1LDYgQEAgZXJyb3I6 CiAJCWRybW1vZGVfZmxpcF9hYm9ydChjcnRjLCBmbGlwZGF0YSk7CiAJZWxzZSB7CiAJCWFib3J0 KE5VTEwsIGRhdGEpOwotCQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwUkFERU9ORW50LT5mZCwgJmZs aXBkYXRhLT5mYiwgTlVMTCk7CiAJCWZyZWUoZmxpcGRhdGEpOwogCX0KIApkaWZmIC0tZ2l0IGEv c3JjL2RybW1vZGVfZGlzcGxheS5oIGIvc3JjL2RybW1vZGVfZGlzcGxheS5oCmluZGV4IGM1YTU1 ODkxYS4uNDY0NDljOGUzIDEwMDY0NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKKysrIGIv c3JjL2RybW1vZGVfZGlzcGxheS5oCkBAIC01Niw3ICs1Niw2IEBAIHR5cGVkZWYgc3RydWN0IHsK IH0gZHJtbW9kZV9yZWMsICpkcm1tb2RlX3B0cjsKIAogdHlwZWRlZiBzdHJ1Y3QgewotICBzdHJ1 Y3QgZHJtbW9kZV9mYiAqZmI7CiAgIHZvaWQgKmV2ZW50X2RhdGE7CiAgIGludCBmbGlwX2NvdW50 OwogICB1bnNpZ25lZCBpbnQgZmVfZnJhbWU7CkBAIC02NCw2ICs2Myw3IEBAIHR5cGVkZWYgc3Ry dWN0IHsKICAgeGY4NkNydGNQdHIgZmVfY3J0YzsKICAgcmFkZW9uX2RybV9oYW5kbGVyX3Byb2Mg aGFuZGxlcjsKICAgcmFkZW9uX2RybV9hYm9ydF9wcm9jIGFib3J0OworICBzdHJ1Y3QgZHJtbW9k ZV9mYiAqZmJbMF07CiB9IGRybW1vZGVfZmxpcGRhdGFfcmVjLCAqZHJtbW9kZV9mbGlwZGF0YV9w dHI7CiAKIHN0cnVjdCBkcm1tb2RlX2ZiIHsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==