From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3 05/15] drm/bochs: atomic: switch planes to atomic, wire up helpers. Date: Thu, 10 Jan 2019 09:28:35 +0100 Message-ID: <20190110082845.3453-6-kraxel@redhat.com> References: <20190110082845.3453-1-kraxel@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 66A8E6ED52 for ; Thu, 10 Jan 2019 08:28:54 +0000 (UTC) In-Reply-To: <20190110082845.3453-1-kraxel@redhat.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, David Airlie Cc: andr2000@gmail.com, David Airlie , Gerd Hoffmann , open list , "open list:DRM DRIVER FOR BOCHS VIRTUAL GPU" List-Id: dri-devel@lists.freedesktop.org Q29udmVyc2lvbiB0byBhdG9taWMgbW9kZXNldHRpbmcsIHN0ZXAgdGhyZWUuCldpcmUgdXAgYXRv bWljIGhlbHBlcnMuICBTd2l0Y2ggcGxhbmVzIHRvIGF0b21pYy4KCldlIGFyZSBsYXRlIHRvIHRo ZSBwYXJ0eSwgdGhlIHRyYW5zaXRpb25hbCBoZWxwZXJzIGFyZSBnb25lLApzbyB0aGlzIGNhbid0 IGJlIHNwbGl0dGVkIGludG8gc21hbGxlciBzdGVwcyBhbnkgbW9yZS4KClNpZ25lZC1vZmYtYnk6 IEdlcmQgSG9mZm1hbm4gPGtyYXhlbEByZWRoYXQuY29tPgpSZXZpZXdlZC1ieTogT2xla3NhbmRy IEFuZHJ1c2hjaGVua28gPG9sZWtzYW5kcl9hbmRydXNoY2hlbmtvQGVwYW0uY29tPgpBY2tlZC1i eTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vYm9jaHMvYm9jaHNfZmJkZXYuYyB8ICAzICsrCiBkcml2ZXJzL2dwdS9kcm0vYm9jaHMv Ym9jaHNfa21zLmMgICB8IDgyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0K IDIgZmlsZXMgY2hhbmdlZCwgODIgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfZmJkZXYuYyBiL2RyaXZlcnMvZ3B1 L2RybS9ib2Nocy9ib2Noc19mYmRldi5jCmluZGV4IGRkM2M3ZGYyNjcuLmQ5ZjNkNDI5OTkgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19mYmRldi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9ib2Nocy9ib2Noc19mYmRldi5jCkBAIC02LDYgKzYsNyBAQAogICovCiAKICNp bmNsdWRlICJib2Nocy5oIgorI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBlci5oPgogI2lu Y2x1ZGUgPGRybS9kcm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5oPgogCiAvKiAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tICovCkBAIC0xNDksNiArMTUwLDggQEAgYm9jaHNfZ2VtX2ZiX2NyZWF0ZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAKIGNvbnN0IHN0cnVjdCBkcm1f bW9kZV9jb25maWdfZnVuY3MgYm9jaHNfbW9kZV9mdW5jcyA9IHsKIAkuZmJfY3JlYXRlID0gYm9j aHNfZ2VtX2ZiX2NyZWF0ZSwKKwkuYXRvbWljX2NoZWNrID0gZHJtX2F0b21pY19oZWxwZXJfY2hl Y2ssCisJLmF0b21pY19jb21taXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jb21taXQsCiB9OwogCiBp bnQgYm9jaHNfZmJkZXZfaW5pdChzdHJ1Y3QgYm9jaHNfZGV2aWNlICpib2NocykKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9ib2Nocy9ib2Noc19rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9i b2Nocy9ib2Noc19rbXMuYwppbmRleCA1NmZkN2JlOTMzLi5jNjk5M2MyZDU5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYm9jaHMvYm9jaHNfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2JvY2hzL2JvY2hzX2ttcy5jCkBAIC02LDcgKzYsOSBAQAogICovCiAKICNpbmNsdWRlICJib2No cy5oIgorI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9k cm1fcGxhbmVfaGVscGVyLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9hdG9taWNfdWFwaS5oPgogCiBz dGF0aWMgaW50IGRlZnggPSAxMDI0Owogc3RhdGljIGludCBkZWZ5ID0gNzY4OwpAQCAtMTEzLDcg KzExNSw3IEBAIHN0YXRpYyBpbnQgYm9jaHNfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRj ICpjcnRjLAogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IGNydGMtPnByaW1hcnkt PmZiOwogCXVuc2lnbmVkIGxvbmcgaXJxZmxhZ3M7CiAKLQljcnRjLT5wcmltYXJ5LT5mYiA9IGZi OworCWRybV9hdG9taWNfc2V0X2ZiX2Zvcl9wbGFuZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSwgZmIp OwogCWJvY2hzX2NydGNfbW9kZV9zZXRfYmFzZShjcnRjLCAwLCAwLCBvbGRfZmIpOwogCWlmIChl dmVudCkgewogCQlzcGluX2xvY2tfaXJxc2F2ZSgmYm9jaHMtPmRldi0+ZXZlbnRfbG9jaywgaXJx ZmxhZ3MpOwpAQCAtMTUxLDYgKzE1Myw5IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNf ZnVuY3MgYm9jaHNfY3J0Y19mdW5jcyA9IHsKIAkuc2V0X2NvbmZpZyA9IGRybV9jcnRjX2hlbHBl cl9zZXRfY29uZmlnLAogCS5kZXN0cm95ID0gZHJtX2NydGNfY2xlYW51cCwKIAkucGFnZV9mbGlw ID0gYm9jaHNfY3J0Y19wYWdlX2ZsaXAsCisJLnJlc2V0ID0gZHJtX2F0b21pY19oZWxwZXJfY3J0 Y19yZXNldCwKKwkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2Ny dGNfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZGVzdHJveV9zdGF0ZSA9IGRybV9hdG9taWNf aGVscGVyX2NydGNfZGVzdHJveV9zdGF0ZSwKIH07CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJt X2NydGNfaGVscGVyX2Z1bmNzIGJvY2hzX2hlbHBlcl9mdW5jcyA9IHsKQEAgLTE2OSw2ICsxNzQs NzEgQEAgc3RhdGljIGNvbnN0IHVpbnQzMl90IGJvY2hzX2Zvcm1hdHNbXSA9IHsKIAlEUk1fRk9S TUFUX0JHUlg4ODg4LAogfTsKIAorc3RhdGljIHZvaWQgYm9jaHNfcGxhbmVfYXRvbWljX3VwZGF0 ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKKwkJCQkgICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0 YXRlICpvbGRfc3RhdGUpCit7CisJc3RydWN0IGJvY2hzX2RldmljZSAqYm9jaHMgPSBwbGFuZS0+ ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgYm9jaHNfYm8gKmJvOworCisJaWYgKCFwbGFuZS0+ c3RhdGUtPmZiKQorCQlyZXR1cm47CisJYm8gPSBnZW1fdG9fYm9jaHNfYm8ocGxhbmUtPnN0YXRl LT5mYi0+b2JqWzBdKTsKKwlib2Noc19od19zZXRiYXNlKGJvY2hzLAorCQkJIHBsYW5lLT5zdGF0 ZS0+Y3J0Y194LAorCQkJIHBsYW5lLT5zdGF0ZS0+Y3J0Y195LAorCQkJIGJvLT5iby5vZmZzZXQp OworCWJvY2hzX2h3X3NldGZvcm1hdChib2NocywgcGxhbmUtPnN0YXRlLT5mYi0+Zm9ybWF0KTsK K30KKworc3RhdGljIGludCBib2Noc19wbGFuZV9wcmVwYXJlX2ZiKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLAorCQkJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm5ld19zdGF0ZSkKK3sKKwlzdHJ1 Y3QgYm9jaHNfYm8gKmJvOworCWludCByZXQ7CisKKwlpZiAoIW5ld19zdGF0ZS0+ZmIpCisJCXJl dHVybiAwOworCWJvID0gZ2VtX3RvX2JvY2hzX2JvKG5ld19zdGF0ZS0+ZmItPm9ialswXSk7CisK KwlyZXQgPSB0dG1fYm9fcmVzZXJ2ZSgmYm8tPmJvLCB0cnVlLCBmYWxzZSwgTlVMTCk7CisJaWYg KHJldCkKKwkJcmV0dXJuIHJldDsKKwlyZXQgPSBib2Noc19ib19waW4oYm8sIFRUTV9QTF9GTEFH X1ZSQU0sIE5VTEwpOworCXR0bV9ib191bnJlc2VydmUoJmJvLT5ibyk7CisJcmV0dXJuIHJldDsK K30KKworc3RhdGljIHZvaWQgYm9jaHNfcGxhbmVfY2xlYW51cF9mYihzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKKwkJCQkgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUpCit7CisJ c3RydWN0IGJvY2hzX2JvICpibzsKKwlpbnQgcmV0OworCisJaWYgKCFvbGRfc3RhdGUtPmZiKQor CQlyZXR1cm47CisJYm8gPSBnZW1fdG9fYm9jaHNfYm8ob2xkX3N0YXRlLT5mYi0+b2JqWzBdKTsK KwlyZXQgPSB0dG1fYm9fcmVzZXJ2ZSgmYm8tPmJvLCB0cnVlLCBmYWxzZSwgTlVMTCk7CisJaWYg KHJldCkKKwkJcmV0dXJuOworCWJvY2hzX2JvX3VucGluKGJvKTsKKwl0dG1fYm9fdW5yZXNlcnZl KCZiby0+Ym8pOworfQorCitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVu Y3MgYm9jaHNfcGxhbmVfaGVscGVyX2Z1bmNzID0geworCS5hdG9taWNfdXBkYXRlID0gYm9jaHNf cGxhbmVfYXRvbWljX3VwZGF0ZSwKKwkucHJlcGFyZV9mYiA9IGJvY2hzX3BsYW5lX3ByZXBhcmVf ZmIsCisJLmNsZWFudXBfZmIgPSBib2Noc19wbGFuZV9jbGVhbnVwX2ZiLAorfTsKKworc3RhdGlj IGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfZnVuY3MgYm9jaHNfcGxhbmVfZnVuY3MgPSB7CisgICAg ICAgLnVwZGF0ZV9wbGFuZSAgID0gZHJtX2F0b21pY19oZWxwZXJfdXBkYXRlX3BsYW5lLAorICAg ICAgIC5kaXNhYmxlX3BsYW5lICA9IGRybV9hdG9taWNfaGVscGVyX2Rpc2FibGVfcGxhbmUsCisg ICAgICAgLmRlc3Ryb3kgICAgICAgID0gZHJtX3ByaW1hcnlfaGVscGVyX2Rlc3Ryb3ksCisgICAg ICAgLnJlc2V0ICAgICAgICAgID0gZHJtX2F0b21pY19oZWxwZXJfcGxhbmVfcmVzZXQsCisgICAg ICAgLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kdXBs aWNhdGVfc3RhdGUsCisgICAgICAgLmF0b21pY19kZXN0cm95X3N0YXRlID0gZHJtX2F0b21pY19o ZWxwZXJfcGxhbmVfZGVzdHJveV9zdGF0ZSwKK307CisKIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5l ICpib2Noc19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9wbGFuZSAqcHJpbWFyeTsKQEAgLTE4MSwxNiArMjUxLDE3IEBAIHN0YXRpYyBzdHJ1Y3Qg ZHJtX3BsYW5lICpib2Noc19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ fQogCiAJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgcHJpbWFyeSwgMCwKLQkJ CQkgICAgICAgJmRybV9wcmltYXJ5X2hlbHBlcl9mdW5jcywKKwkJCQkgICAgICAgJmJvY2hzX3Bs YW5lX2Z1bmNzLAogCQkJCSAgICAgICBib2Noc19mb3JtYXRzLAogCQkJCSAgICAgICBBUlJBWV9T SVpFKGJvY2hzX2Zvcm1hdHMpLAogCQkJCSAgICAgICBOVUxMLAogCQkJCSAgICAgICBEUk1fUExB TkVfVFlQRV9QUklNQVJZLCBOVUxMKTsKIAlpZiAocmV0KSB7CiAJCWtmcmVlKHByaW1hcnkpOwot CQlwcmltYXJ5ID0gTlVMTDsKKwkJcmV0dXJuIE5VTEw7CiAJfQogCisJZHJtX3BsYW5lX2hlbHBl cl9hZGQocHJpbWFyeSwgJmJvY2hzX3BsYW5lX2hlbHBlcl9mdW5jcyk7CiAJcmV0dXJuIHByaW1h cnk7CiB9CiAKQEAgLTI3NSw2ICszNDYsOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25u ZWN0b3JfZnVuY3MgYm9jaHNfY29ubmVjdG9yX2Nvbm5lY3Rvcl9mdW5jcyA9IHsKIAkuZHBtcyA9 IGRybV9oZWxwZXJfY29ubmVjdG9yX2RwbXMsCiAJLmZpbGxfbW9kZXMgPSBkcm1faGVscGVyX3By b2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMsCiAJLmRlc3Ryb3kgPSBkcm1fY29ubmVjdG9yX2Ns ZWFudXAsCisJLnJlc2V0ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3Jlc2V0LAorCS5h dG9taWNfZHVwbGljYXRlX3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2R1cGxp Y2F0ZV9zdGF0ZSwKKwkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9j b25uZWN0b3JfZGVzdHJveV9zdGF0ZSwKIH07CiAKIHN0YXRpYyB2b2lkIGJvY2hzX2Nvbm5lY3Rv cl9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCkBAIC0zMTgsNiArMzkyLDggQEAgaW50IGJv Y2hzX2ttc19pbml0KHN0cnVjdCBib2Noc19kZXZpY2UgKmJvY2hzKQogCWRybV9jb25uZWN0b3Jf YXR0YWNoX2VuY29kZXIoJmJvY2hzLT5jb25uZWN0b3IsCiAJCQkJCSAgJmJvY2hzLT5lbmNvZGVy KTsKIAorCWRybV9tb2RlX2NvbmZpZ19yZXNldChib2Nocy0+ZGV2KTsKKwogCXJldHVybiAwOwog fQogCi0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==