From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu] Store FB for each CRTC in drmmode_flipdata_rec Date: Fri, 27 Jul 2018 18:04:52 +0200 Message-ID: <20180727160452.18212-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 RnJlZSBoYWNrLgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVy QGFtZC5jb20+Ci0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5jIHwgNDcgKysrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5oIHwgIDIg Ky0KIDIgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5jIGIvc3JjL2RybW1vZGVfZGlzcGxheS5j CmluZGV4IDkyZjU4YzE1Ny4uZTU4ZTE1ZDdiIDEwMDY0NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNw bGF5LmMKKysrIGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCkBAIC0zMDUxLDE3ICszMDUxLDIxIEBA IGRybW1vZGVfZmxpcF9hYm9ydCh4Zjg2Q3J0Y1B0ciBjcnRjLCB2b2lkICpldmVudF9kYXRhKQog CWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJp dmF0ZTsKIAlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYoY3J0Yy0+c2Ny bik7CiAJZHJtbW9kZV9mbGlwZGF0YV9wdHIgZmxpcGRhdGEgPSBldmVudF9kYXRhOworCWludCBj cnRjX2lkID0gZHJtbW9kZV9nZXRfY3J0Y19pZChjcnRjKTsKKwlzdHJ1Y3QgZHJtbW9kZV9mYiAq KmZiID0gJmZsaXBkYXRhLT5mYltjcnRjX2lkXTsKKworCWlmIChkcm1tb2RlX2NydGMtPmZsaXBf cGVuZGluZyA9PSAqZmIpIHsKKwkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQs ICZkcm1tb2RlX2NydGMtPmZsaXBfcGVuZGluZywKKwkJCQkgICAgIE5VTEwpOworCX0KKwlkcm1t b2RlX2ZiX3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgZmIsIE5VTEwpOwogCiAJaWYgKC0tZmxp cGRhdGEtPmZsaXBfY291bnQgPT0gMCkgewogCQlpZiAoIWZsaXBkYXRhLT5mZV9jcnRjKQogCQkJ ZmxpcGRhdGEtPmZlX2NydGMgPSBjcnRjOwogCQlmbGlwZGF0YS0+YWJvcnQoZmxpcGRhdGEtPmZl X2NydGMsIGZsaXBkYXRhLT5ldmVudF9kYXRhKTsKLQkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFN REdQVUVudC0+ZmQsICZmbGlwZGF0YS0+ZmIsIE5VTEwpOwogCQlmcmVlKGZsaXBkYXRhKTsKIAl9 Ci0KLQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ ZmxpcF9wZW5kaW5nLAotCQkJICAgICBOVUxMKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTMwNzAs NiArMzA3NCw4IEBAIGRybW1vZGVfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQz Ml90IGZyYW1lLCB1aW50NjRfdCB1c2VjLCB2b2lkICpldmVuCiAJQU1ER1BVRW50UHRyIHBBTURH UFVFbnQgPSBBTURHUFVFbnRQcml2KGNydGMtPnNjcm4pOwogCWRybW1vZGVfY3J0Y19wcml2YXRl X3B0ciBkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAlkcm1tb2RlX2ZsaXBk YXRhX3B0ciBmbGlwZGF0YSA9IGV2ZW50X2RhdGE7CisJaW50IGNydGNfaWQgPSBkcm1tb2RlX2dl dF9jcnRjX2lkKGNydGMpOworCXN0cnVjdCBkcm1tb2RlX2ZiICoqZmIgPSAmZmxpcGRhdGEtPmZi W2NydGNfaWRdOwogCiAJLyogSXMgdGhpcyB0aGUgZXZlbnQgd2hvc2UgaW5mbyBzaGFsbCBiZSBk ZWxpdmVyZWQgdG8gaGlnaGVyIGxldmVsPyAqLwogCWlmIChjcnRjID09IGZsaXBkYXRhLT5mZV9j cnRjKSB7CkBAIC0zMDc4LDEzICszMDg0LDEyIEBAIGRybW1vZGVfZmxpcF9oYW5kbGVyKHhmODZD cnRjUHRyIGNydGMsIHVpbnQzMl90IGZyYW1lLCB1aW50NjRfdCB1c2VjLCB2b2lkICpldmVuCiAJ CWZsaXBkYXRhLT5mZV91c2VjID0gdXNlYzsKIAl9CiAKLQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShw QU1ER1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsCi0JCQkgICAgIGZsaXBkYXRhLT5mYik7 Ci0JaWYgKGRybW1vZGVfY3J0Yy0+dGVhcl9mcmVlIHx8Ci0JICAgIGRybW1vZGVfY3J0Yy0+Zmxp cF9wZW5kaW5nID09IGZsaXBkYXRhLT5mYikgeworCWlmIChkcm1tb2RlX2NydGMtPmZsaXBfcGVu ZGluZyA9PSAqZmIpIHsKIAkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsCiAJ CQkJICAgICAmZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcsIE5VTEwpOwogCX0KKwlkcm1tb2Rl X2ZiX3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIsICpmYik7CisJ ZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsIGZiLCBOVUxMKTsKIAogCWlmICgt LWZsaXBkYXRhLT5mbGlwX2NvdW50ID09IDApIHsKIAkJLyogRGVsaXZlciBNU0MgJiBVU1QgZnJv bSByZWZlcmVuY2UvY3VycmVudCBDUlRDIHRvIGZsaXAgZXZlbnQKQEAgLTMwOTYsNyArMzEwMSw2 IEBAIGRybW1vZGVfZmxpcF9oYW5kbGVyKHhmODZDcnRjUHRyIGNydGMsIHVpbnQzMl90IGZyYW1l LCB1aW50NjRfdCB1c2VjLCB2b2lkICpldmVuCiAJCWVsc2UKIAkJCWZsaXBkYXRhLT5oYW5kbGVy KGNydGMsIGZyYW1lLCB1c2VjLCBmbGlwZGF0YS0+ZXZlbnRfZGF0YSk7CiAKLQkJZHJtbW9kZV9m Yl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZmbGlwZGF0YS0+ZmIsIE5VTEwpOwogCQlmcmVl KGZsaXBkYXRhKTsKIAl9CiB9CkBAIC0zODc1LDIxICszODc5LDIyIEBAIEJvb2wgYW1kZ3B1X2Rv X3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4sIENsaWVudFB0ciBjbGllbnQsCiAJeGY4NkNydGND b25maWdQdHIgY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIoc2Nybik7CiAJeGY4NkNydGNQ dHIgY3J0YyA9IE5VTEw7CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9 IGNvbmZpZy0+Y3J0Y1swXS0+ZHJpdmVyX3ByaXZhdGU7Ci0JaW50IGk7CiAJdWludDMyX3QgZmxp cF9mbGFncyA9IGZsaXBfc3luYyA9PSBGTElQX0FTWU5DID8gRFJNX01PREVfUEFHRV9GTElQX0FT WU5DIDogMDsKIAlkcm1tb2RlX2ZsaXBkYXRhX3B0ciBmbGlwZGF0YTsKIAl1aW50cHRyX3QgZHJt X3F1ZXVlX3NlcSA9IDA7CisJc3RydWN0IGRybW1vZGVfZmIgKmZiOworCWludCBpID0gMDsKIAot CWZsaXBkYXRhID0gY2FsbG9jKDEsIHNpemVvZihkcm1tb2RlX2ZsaXBkYXRhX3JlYykpOworCWZs aXBkYXRhID0gY2FsbG9jKDEsIHNpemVvZigqZmxpcGRhdGEpICsgY29uZmlnLT5udW1fY3J0YyAq CisJCQkgIHNpemVvZihmbGlwZGF0YS0+ZmJbMF0pKTsKIAlpZiAoIWZsaXBkYXRhKSB7CiAJCXhm ODZEcnZNc2coc2Nybi0+c2NybkluZGV4LCBYX1dBUk5JTkcsCiAJCQkgICAiZmxpcCBxdWV1ZTog ZGF0YSBhbGxvYyBmYWlsZWQuXG4iKTsKIAkJZ290byBlcnJvcjsKIAl9CiAKLQlkcm1tb2RlX2Zi X3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgJmZsaXBkYXRhLT5mYiwKLQkJCSAgICAgYW1kZ3B1 X3BpeG1hcF9nZXRfZmIobmV3X2Zyb250KSk7Ci0JaWYgKCFmbGlwZGF0YS0+ZmIpIHsKKwlmYiA9 IGFtZGdwdV9waXhtYXBfZ2V0X2ZiKG5ld19mcm9udCk7CisJaWYgKCFmYikgewogCQlFcnJvckYo IkZhaWxlZCB0byBnZXQgRkIgZm9yIGZsaXBcbiIpOwogCQlnb3RvIGVycm9yOwogCX0KQEAgLTM5 MTAsOCArMzkxNSw2IEBAIEJvb2wgYW1kZ3B1X2RvX3BhZ2VmbGlwKFNjcm5JbmZvUHRyIHNjcm4s IENsaWVudFB0ciBjbGllbnQsCiAJZmxpcGRhdGEtPmZlX2NydGMgPSByZWZfY3J0YzsKIAogCWZv ciAoaSA9IDA7IGkgPCBjb25maWctPm51bV9jcnRjOyBpKyspIHsKLQkJc3RydWN0IGRybW1vZGVf ZmIgKmZiID0gZmxpcGRhdGEtPmZiOwotCiAJCWNydGMgPSBjb25maWctPmNydGNbaV07CiAJCWRy bW1vZGVfY3J0YyA9IGNydGMtPmRyaXZlcl9wcml2YXRlOwogCkBAIC0zOTQ3LDggKzM5NTAsOSBA QCBCb29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xp ZW50LAogCQkJCWdvdG8gbmV4dDsKIAkJCX0KIAotCQkJZmIgPSBhbWRncHVfcGl4bWFwX2dldF9m Yihkcm1tb2RlX2NydGMtPnNjYW5vdXRbc2Nhbm91dF9pZF0ucGl4bWFwKTsKLQkJCWlmICghZmIp IHsKKwkJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBBTURHUFVFbnQtPmZkLCAmZmxpcGRhdGEtPmZi W2ldLAorCQkJCQkgICAgIGFtZGdwdV9waXhtYXBfZ2V0X2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91 dFtzY2Fub3V0X2lkXS5waXhtYXApKTsKKwkJCWlmICghZmxpcGRhdGEtPmZiW2ldKSB7CiAJCQkJ RXJyb3JGKCJGYWlsZWQgdG8gZ2V0IEZCIGZvciBUZWFyRnJlZSBmbGlwXG4iKTsKIAkJCQlnb3Rv IGVycm9yOwogCQkJfQpAQCAtMzk2Myw2ICszOTY3LDggQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZs aXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRyIGNsaWVudCwKIAkJCQlhbWRncHVfZHJtX2Fi b3J0X2VudHJ5KGRybW1vZGVfY3J0Yy0+c2Nhbm91dF91cGRhdGVfcGVuZGluZyk7CiAJCQkJZHJt bW9kZV9jcnRjLT5zY2Fub3V0X3VwZGF0ZV9wZW5kaW5nID0gMDsKIAkJCX0KKwkJfSBlbHNlIHsK KwkJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBBTURHUFVFbnQtPmZkLCAmZmxpcGRhdGEtPmZiW2ld LCBmYik7CiAJCX0KIAogCQlpZiAoY3J0YyA9PSByZWZfY3J0YykgewpAQCAtMzk4OCw4ICszOTk0 LDggQEAgQm9vbCBhbWRncHVfZG9fcGFnZWZsaXAoU2NybkluZm9QdHIgc2NybiwgQ2xpZW50UHRy IGNsaWVudCwKIAkJfQogCiAJbmV4dDoKLQkJZHJtbW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVu dC0+ZmQsCi0JCQkJICAgICAmZHJtbW9kZV9jcnRjLT5mbGlwX3BlbmRpbmcsIGZiKTsKKwkJZHJt bW9kZV9mYl9yZWZlcmVuY2UocEFNREdQVUVudC0+ZmQsICZkcm1tb2RlX2NydGMtPmZsaXBfcGVu ZGluZywKKwkJCQkgICAgIGZsaXBkYXRhLT5mYltpXSk7CiAJCWRybV9xdWV1ZV9zZXEgPSAwOwog CX0KIApAQCAtNDAwNyw3ICs0MDEzLDYgQEAgZXJyb3I6CiAJCWRybW1vZGVfZmxpcF9hYm9ydChj cnRjLCBmbGlwZGF0YSk7CiAJZWxzZSB7CiAJCWFib3J0KE5VTEwsIGRhdGEpOwotCQlkcm1tb2Rl X2ZiX3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgJmZsaXBkYXRhLT5mYiwgTlVMTCk7CiAJCWZy ZWUoZmxpcGRhdGEpOwogCX0KIApkaWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxheS5oIGIv c3JjL2RybW1vZGVfZGlzcGxheS5oCmluZGV4IDhiOTQ5Zjc5ZC4uNTYxOGM2YjQwIDEwMDY0NAot LS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmgKKysrIGIvc3JjL2RybW1vZGVfZGlzcGxheS5oCkBA IC03NCw3ICs3NCw2IEBAIHR5cGVkZWYgc3RydWN0IHsKIH0gZHJtbW9kZV9yZWMsICpkcm1tb2Rl X3B0cjsKIAogdHlwZWRlZiBzdHJ1Y3QgewotCXN0cnVjdCBkcm1tb2RlX2ZiICpmYjsKIAl2b2lk ICpldmVudF9kYXRhOwogCWludCBmbGlwX2NvdW50OwogCXVuc2lnbmVkIGludCBmZV9mcmFtZTsK QEAgLTgyLDYgKzgxLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgewogCXhmODZDcnRjUHRyIGZlX2NydGM7 CiAJYW1kZ3B1X2RybV9oYW5kbGVyX3Byb2MgaGFuZGxlcjsKIAlhbWRncHVfZHJtX2Fib3J0X3By b2MgYWJvcnQ7CisJc3RydWN0IGRybW1vZGVfZmIgKmZiWzBdOwogfSBkcm1tb2RlX2ZsaXBkYXRh X3JlYywgKmRybW1vZGVfZmxpcGRhdGFfcHRyOwogCiBzdHJ1Y3QgZHJtbW9kZV9mYiB7Ci0tIAoy LjE4LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFt ZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=