From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: [PATCH resend 08/15] staging: vboxvideo: Atomic phase 2: Stop using plane->fb and crtc->* Date: Sat, 29 Sep 2018 14:18:18 +0200 Message-ID: <20180929121825.25765-9-hdegoede@redhat.com> References: <20180929121825.25765-1-hdegoede@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 01BB96E1F6 for ; Sat, 29 Sep 2018 12:18:40 +0000 (UTC) In-Reply-To: <20180929121825.25765-1-hdegoede@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org, Hans de Goede , Michael Thayer , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T25jZSB3ZSBhcmUgZnVsbHkgYXRvbWljIHBsYW5lLT5mYiB3aWxsIGFsd2F5cyBiZSBOVUxMIGFu ZCB3ZSBhbHNvCnNob3VsZCBub3QgYWNjZXNzIHRoaW5ncyBsaWtlIGNydGMtPmVuYWJsZWQgYW5k IGNydC0+W2h3XW1vZGUuCgpOb3cgdGhhdCB3ZSd2ZSB3aXJlZCB1cCB0aGUgc3RhdGUgb2JqZWN0 IGhhbmRsZXJzLCB3ZSBhbHdheXMgaGF2ZSBhCnBsYW5lX3N0YXRlIGFuZCBjcnRjX3N0YXRlIHNv IGNoYW5nZSB0aGUgY29kZSByZWZlcmVuY2luZyBwbGFuZS0+ZmIgYW5kCmNydGMtPiogdG8gdXNl IHRoZSBkYXRhIGZyb20gdGhlIHBsYW5lX3N0YXRlIGFuZCBjcnRfc3RhdGUgaW5zdGVhZC4KClNp Z25lZC1vZmYtYnk6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+Ci0tLQogZHJp dmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2Rydi5oICB8ICAxIC0KIGRyaXZlcnMvc3RhZ2lu Zy92Ym94dmlkZW8vdmJveF9tYWluLmMgfCAxNiArKysrKysrKysrKy0tLS0tCiBkcml2ZXJzL3N0 YWdpbmcvdmJveHZpZGVvL3Zib3hfbW9kZS5jIHwgMTUgKysrKysrKy0tLS0tLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuaCBiL2RyaXZlcnMvc3RhZ2luZy92 Ym94dmlkZW8vdmJveF9kcnYuaAppbmRleCA3ZmM2NjhmZjQ0NjUuLmZjY2IzODUxZDZhMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X2Rydi5oCisrKyBiL2RyaXZl cnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9kcnYuaApAQCAtMTk5LDcgKzE5OSw2IEBAIGludCB2 Ym94X21vZGVfaW5pdChzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KTsKIHZvaWQgdmJveF9tb2Rl X2Zpbmkoc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCk7CiAKICNkZWZpbmUgRFJNX01PREVfRkJf Q01EIGRybV9tb2RlX2ZiX2NtZDIKLSNkZWZpbmUgQ1JUQ19GQihjcnRjKSAoKGNydGMpLT5wcmlt YXJ5LT5mYikKIAogdm9pZCB2Ym94X2VuYWJsZV9hY2NlbChzdHJ1Y3QgdmJveF9wcml2YXRlICp2 Ym94KTsKIHZvaWQgdmJveF9kaXNhYmxlX2FjY2VsKHN0cnVjdCB2Ym94X3ByaXZhdGUgKnZib3gp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21haW4uYyBiL2Ry aXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9tYWluLmMKaW5kZXggOTUxMDBjNTk3NmU0Li4z YjgyZDQ4M2FiNTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9t YWluLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21haW4uYwpAQCAtMTAy LDI0ICsxMDIsMzAgQEAgdm9pZCB2Ym94X2ZyYW1lYnVmZmVyX2RpcnR5X3JlY3RhbmdsZXMoc3Ry dWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJCQkJICAgICAgIHVuc2lnbmVkIGludCBudW1fcmVj dHMpCiB7CiAJc3RydWN0IHZib3hfcHJpdmF0ZSAqdmJveCA9IGZiLT5kZXYtPmRldl9wcml2YXRl OworCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlOwogCXN0cnVjdCBkcm1fY3J0YyAqY3J0 YzsKKwlpbnQgY3J0Y194LCBjcnRjX3k7CiAJdW5zaWduZWQgaW50IGk7CiAKIAltdXRleF9sb2Nr KCZ2Ym94LT5od19tdXRleCk7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeShjcnRjLCAmZmItPmRldi0+ bW9kZV9jb25maWcuY3J0Y19saXN0LCBoZWFkKSB7Ci0JCWlmIChDUlRDX0ZCKGNydGMpICE9IGZi KQorCQlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiICE9IGZiKQogCQkJY29udGludWU7CiAK KwkJbW9kZSA9ICZjcnRjLT5zdGF0ZS0+bW9kZTsKKwkJY3J0Y194ID0gY3J0Yy0+cHJpbWFyeS0+ c3RhdGUtPnNyY194ID4+IDE2OworCQljcnRjX3kgPSBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+c3Jj X3kgPj4gMTY7CisKIAkJdmJveF9lbmFibGVfYWNjZWwodmJveCk7CiAKIAkJZm9yIChpID0gMDsg aSA8IG51bV9yZWN0czsgKytpKSB7CiAJCQlzdHJ1Y3QgdmJ2YV9jbWRfaGRyIGNtZF9oZHI7CiAJ CQl1bnNpZ25lZCBpbnQgY3J0Y19pZCA9IHRvX3Zib3hfY3J0YyhjcnRjKS0+Y3J0Y19pZDsKIAot CQkJaWYgKChyZWN0c1tpXS54MSA+IGNydGMtPnggKyBjcnRjLT5od21vZGUuaGRpc3BsYXkpIHx8 Ci0JCQkgICAgKHJlY3RzW2ldLnkxID4gY3J0Yy0+eSArIGNydGMtPmh3bW9kZS52ZGlzcGxheSkg fHwKLQkJCSAgICAocmVjdHNbaV0ueDIgPCBjcnRjLT54KSB8fAotCQkJICAgIChyZWN0c1tpXS55 MiA8IGNydGMtPnkpKQorCQkJaWYgKChyZWN0c1tpXS54MSA+IGNydGNfeCArIG1vZGUtPmhkaXNw bGF5KSB8fAorCQkJICAgIChyZWN0c1tpXS55MSA+IGNydGNfeSArIG1vZGUtPnZkaXNwbGF5KSB8 fAorCQkJICAgIChyZWN0c1tpXS54MiA8IGNydGNfeCkgfHwKKwkJCSAgICAocmVjdHNbaV0ueTIg PCBjcnRjX3kpKQogCQkJCWNvbnRpbnVlOwogCiAJCQljbWRfaGRyLnggPSAoczE2KXJlY3RzW2ld LngxOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21vZGUuYyBi L2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJveF9tb2RlLmMKaW5kZXggY2I4OTdiNjcyNzUy Li41NGU2YWFjNzg0ZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvc3RhZ2luZy92Ym94dmlkZW8vdmJv eF9tb2RlLmMKKysrIGIvZHJpdmVycy9zdGFnaW5nL3Zib3h2aWRlby92Ym94X21vZGUuYwpAQCAt NDYsNiArNDYsNyBAQAogICovCiBzdGF0aWMgdm9pZCB2Ym94X2RvX21vZGVzZXQoc3RydWN0IGRy bV9jcnRjICpjcnRjKQogeworCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gY3J0Yy0+cHJp bWFyeS0+c3RhdGUtPmZiOwogCXN0cnVjdCB2Ym94X2NydGMgKnZib3hfY3J0YyA9IHRvX3Zib3hf Y3J0YyhjcnRjKTsKIAlzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94OwogCWludCB3aWR0aCwgaGVp Z2h0LCBicHAsIHBpdGNoOwpAQCAtNTUsOCArNTYsOCBAQCBzdGF0aWMgdm9pZCB2Ym94X2RvX21v ZGVzZXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXZib3ggPSBjcnRjLT5kZXYtPmRldl9wcml2 YXRlOwogCXdpZHRoID0gdmJveF9jcnRjLT53aWR0aCA/IHZib3hfY3J0Yy0+d2lkdGggOiA2NDA7 CiAJaGVpZ2h0ID0gdmJveF9jcnRjLT5oZWlnaHQgPyB2Ym94X2NydGMtPmhlaWdodCA6IDQ4MDsK LQlicHAgPSBjcnRjLT5lbmFibGVkID8gQ1JUQ19GQihjcnRjKS0+Zm9ybWF0LT5jcHBbMF0gKiA4 IDogMzI7Ci0JcGl0Y2ggPSBjcnRjLT5lbmFibGVkID8gQ1JUQ19GQihjcnRjKS0+cGl0Y2hlc1sw XSA6IHdpZHRoICogYnBwIC8gODsKKwlicHAgPSBmYiA/IGZiLT5mb3JtYXQtPmNwcFswXSAqIDgg OiAzMjsKKwlwaXRjaCA9IGZiID8gZmItPnBpdGNoZXNbMF0gOiB3aWR0aCAqIGJwcCAvIDg7CiAJ eF9vZmZzZXQgPSB2Ym94LT5zaW5nbGVfZnJhbWVidWZmZXIgPyB2Ym94X2NydGMtPnggOiB2Ym94 X2NydGMtPnhfaGludDsKIAl5X29mZnNldCA9IHZib3gtPnNpbmdsZV9mcmFtZWJ1ZmZlciA/IHZi b3hfY3J0Yy0+eSA6IHZib3hfY3J0Yy0+eV9oaW50OwogCkBAIC02NiwxNCArNjcsMTMgQEAgc3Rh dGljIHZvaWQgdmJveF9kb19tb2Rlc2V0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkgKiBWaXJ0 dWFsQm94LCBjZXJ0YWluIHBhcnRzIG9mIHRoZSBjb2RlIHN0aWxsIGFzc3VtZSB0aGF0IHRoZSBm aXJzdAogCSAqIHNjcmVlbiBpcyBwcm9ncmFtbWVkIHRoaXMgd2F5LCBzbyB0cnkgdG8gZmFrZSBp dC4KIAkgKi8KLQlpZiAodmJveF9jcnRjLT5jcnRjX2lkID09IDAgJiYgY3J0Yy0+ZW5hYmxlZCAm JgorCWlmICh2Ym94X2NydGMtPmNydGNfaWQgPT0gMCAmJiBmYiAmJgogCSAgICB2Ym94X2NydGMt PmZiX29mZnNldCAvIHBpdGNoIDwgMHhmZmZmIC0gY3J0Yy0+eSAmJgogCSAgICB2Ym94X2NydGMt PmZiX29mZnNldCAlIChicHAgLyA4KSA9PSAwKSB7CiAJCXZib3hfd3JpdGVfaW9wb3J0KFZCRV9E SVNQSV9JTkRFWF9YUkVTLCB3aWR0aCk7CiAJCXZib3hfd3JpdGVfaW9wb3J0KFZCRV9ESVNQSV9J TkRFWF9ZUkVTLCBoZWlnaHQpOwogCQl2Ym94X3dyaXRlX2lvcG9ydChWQkVfRElTUElfSU5ERVhf VklSVF9XSURUSCwgcGl0Y2ggKiA4IC8gYnBwKTsKLQkJdmJveF93cml0ZV9pb3BvcnQoVkJFX0RJ U1BJX0lOREVYX0JQUCwKLQkJCQkgIENSVENfRkIoY3J0YyktPmZvcm1hdC0+Y3BwWzBdICogOCk7 CisJCXZib3hfd3JpdGVfaW9wb3J0KFZCRV9ESVNQSV9JTkRFWF9CUFAsIGJwcCk7CiAJCXZib3hf d3JpdGVfaW9wb3J0KFZCRV9ESVNQSV9JTkRFWF9FTkFCTEUsIFZCRV9ESVNQSV9FTkFCTEVEKTsK IAkJdmJveF93cml0ZV9pb3BvcnQoCiAJCQlWQkVfRElTUElfSU5ERVhfWF9PRkZTRVQsCkBAIC04 Myw4ICs4Myw3IEBAIHN0YXRpYyB2b2lkIHZib3hfZG9fbW9kZXNldChzdHJ1Y3QgZHJtX2NydGMg KmNydGMpCiAJfQogCiAJZmxhZ3MgPSBWQlZBX1NDUkVFTl9GX0FDVElWRTsKLQlmbGFncyB8PSAo Y3J0Yy0+ZW5hYmxlZCAmJiAhdmJveF9jcnRjLT5ibGFua2VkKSA/Ci0JCSAwIDogVkJWQV9TQ1JF RU5fRl9CTEFOSzsKKwlmbGFncyB8PSAoZmIgJiYgIXZib3hfY3J0Yy0+YmxhbmtlZCkgPyAwIDog VkJWQV9TQ1JFRU5fRl9CTEFOSzsKIAlmbGFncyB8PSB2Ym94X2NydGMtPmRpc2Nvbm5lY3RlZCA/ IFZCVkFfU0NSRUVOX0ZfRElTQUJMRUQgOiAwOwogCWhnc21pX3Byb2Nlc3NfZGlzcGxheV9pbmZv KHZib3gtPmd1ZXN0X3Bvb2wsIHZib3hfY3J0Yy0+Y3J0Y19pZCwKIAkJCQkgICB4X29mZnNldCwg eV9vZmZzZXQsCkBAIC0xNzYsNyArMTc1LDcgQEAgc3RhdGljIGJvb2wgdmJveF9zZXRfdXBfaW5w dXRfbWFwcGluZyhzdHJ1Y3QgdmJveF9wcml2YXRlICp2Ym94KQogCSAqIFNhbWUgZmFsbC1iYWNr IGlmIHRoaXMgaXMgdGhlIGZiZGV2IGZyYW1lLWJ1ZmZlci4KIAkgKi8KIAlsaXN0X2Zvcl9lYWNo X2VudHJ5KGNydGNpLCAmdmJveC0+ZGRldi5tb2RlX2NvbmZpZy5jcnRjX2xpc3QsIGhlYWQpIHsK LQkJZmIgPSBDUlRDX0ZCKGNydGNpKTsKKwkJZmIgPSBjcnRjaS0+cHJpbWFyeS0+c3RhdGUtPmZi OwogCQlpZiAoIWZiKQogCQkJY29udGludWU7CiAKLS0gCjIuMTkuMAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==