From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3 15/23] drm/qxl: use qxl_num_crtc directly Date: Fri, 18 Jan 2019 13:20:12 +0100 Message-ID: <20190118122020.27596-16-kraxel@redhat.com> References: <20190118122020.27596-1-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190118122020.27596-1-kraxel@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spice-devel-bounces@lists.freedesktop.org Sender: "Spice-devel" To: dri-devel@lists.freedesktop.org Cc: David Airlie , open list , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , Gerd Hoffmann , Daniel Vetter , "open list:DRM DRIVER FOR QXL VIRTUAL GPU" , Dave Airlie List-Id: dri-devel@lists.freedesktop.org cWRldi0+bW9uaXRvcnNfY29uZmlnLT5tYXhfYWxsb3dlZCBpcyBlZmZlY3RpdmVseSBzZXQgYnkg dGhlCnF4bC5udW1faGVhZHMgbW9kdWxlIHBhcmFtZXRlciwgc3RvcmVkIGluIHRoZSBxeGxfbnVt X2NydGMgdmFyaWFibGUuCkxldHMgZ2V0IHJpZCBvZiB0aGUgaW5kaXJlY3Rpb24gYW5kIHVzZSB0 aGUgdmFyaWFibGUgcXhsX251bV9jcnRjCmRpcmVjdGx5LiAgVGhlIGtlcm5lbCBkb2Vzbid0IG5l ZWQgdG8gZGVyZWZlcmVuY2UgcG9pbnRlcnMgZWFjaCB0aW1lIGl0Cm5lZWRzIHRoZSB2YWx1ZSwg YW5kIHdoZW4gcmVhZGluZyB0aGUgY29kZSB5b3UgZG9uJ3QgaGF2ZSB0byB0cmFjZSB3aGVyZQph bmQgd2h5IHFkZXYtPm1vbml0b3JzX2NvbmZpZy0+bWF4X2FsbG93ZWQgaXMgc2V0LgoKU2lnbmVk LW9mZi1ieTogR2VyZCBIb2ZmbWFubiA8a3JheGVsQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL3F4bC9xeGxfZGlzcGxheS5jIHwgMjUgKysrKysrKysrKystLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9xeGwvcXhsX2Rpc3BsYXkuYwppbmRleCBkOWRlNDNlNWZkLi5lZjgzMmY5OGFiIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL3F4bC9xeGxfZGlzcGxheS5jCkBAIC04MCwxMCArODAsMTAgQEAgc3RhdGljIGludCBxeGxf ZGlzcGxheV9jb3B5X3JvbV9jbGllbnRfbW9uaXRvcnNfY29uZmlnKHN0cnVjdCBxeGxfZGV2aWNl ICpxZGV2KQogCQlEUk1fREVCVUdfS01TKCJubyBjbGllbnQgbW9uaXRvcnMgY29uZmlndXJlZFxu Iik7CiAJCXJldHVybiBzdGF0dXM7CiAJfQotCWlmIChudW1fbW9uaXRvcnMgPiBxZGV2LT5tb25p dG9yc19jb25maWctPm1heF9hbGxvd2VkKSB7CisJaWYgKG51bV9tb25pdG9ycyA+IHF4bF9udW1f Y3J0YykgewogCQlEUk1fREVCVUdfS01TKCJjbGllbnQgbW9uaXRvcnMgbGlzdCB3aWxsIGJlIHRy dW5jYXRlZDogJWQgPCAlZFxuIiwKLQkJCSAgICAgIHFkZXYtPm1vbml0b3JzX2NvbmZpZy0+bWF4 X2FsbG93ZWQsIG51bV9tb25pdG9ycyk7Ci0JCW51bV9tb25pdG9ycyA9IHFkZXYtPm1vbml0b3Jz X2NvbmZpZy0+bWF4X2FsbG93ZWQ7CisJCQkgICAgICBxeGxfbnVtX2NydGMsIG51bV9tb25pdG9y cyk7CisJCW51bV9tb25pdG9ycyA9IHF4bF9udW1fY3J0YzsKIAl9IGVsc2UgewogCQludW1fbW9u aXRvcnMgPSBxZGV2LT5yb20tPmNsaWVudF9tb25pdG9yc19jb25maWcuY291bnQ7CiAJfQpAQCAt OTYsOCArOTYsNyBAQCBzdGF0aWMgaW50IHF4bF9kaXNwbGF5X2NvcHlfcm9tX2NsaWVudF9tb25p dG9yc19jb25maWcoc3RydWN0IHF4bF9kZXZpY2UgKnFkZXYpCiAJCXJldHVybiBzdGF0dXM7CiAJ fQogCS8qIHdlIGNvcHkgbWF4IGZyb20gdGhlIGNsaWVudCBidXQgaXQgaXNuJ3QgdXNlZCAqLwot CXFkZXYtPmNsaWVudF9tb25pdG9yc19jb25maWctPm1heF9hbGxvd2VkID0KLQkJCQlxZGV2LT5t b25pdG9yc19jb25maWctPm1heF9hbGxvd2VkOworCXFkZXYtPmNsaWVudF9tb25pdG9yc19jb25m aWctPm1heF9hbGxvd2VkID0gcXhsX251bV9jcnRjOwogCWZvciAoaSA9IDAgOyBpIDwgcWRldi0+ Y2xpZW50X21vbml0b3JzX2NvbmZpZy0+Y291bnQgOyArK2kpIHsKIAkJc3RydWN0IHF4bF91cmVj dCAqY19yZWN0ID0KIAkJCSZxZGV2LT5yb20tPmNsaWVudF9tb25pdG9yc19jb25maWcuaGVhZHNb aV07CkBAIC0yMDQsNyArMjAzLDcgQEAgc3RhdGljIGludCBxeGxfYWRkX21vbml0b3JzX2NvbmZp Z19tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCiAJaWYgKCFxZGV2LT5t b25pdG9yc19jb25maWcpCiAJCXJldHVybiAwOwotCWlmIChoID49IHFkZXYtPm1vbml0b3JzX2Nv bmZpZy0+bWF4X2FsbG93ZWQpCisJaWYgKGggPj0gcXhsX251bV9jcnRjKQogCQlyZXR1cm4gMDsK IAlpZiAoIXFkZXYtPmNsaWVudF9tb25pdG9yc19jb25maWcpCiAJCXJldHVybiAwOwpAQCAtMzA3 LDggKzMwNiw3IEBAIHN0YXRpYyB2b2lkIHF4bF9jcnRjX3VwZGF0ZV9tb25pdG9yc19jb25maWco c3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlyZXR1cm47CiAJfQogCi0JaWYgKCFxZGV2LT5tb25p dG9yc19jb25maWcgfHwKLQkgICAgcWRldi0+bW9uaXRvcnNfY29uZmlnLT5tYXhfYWxsb3dlZCA8 PSBpKQorCWlmICghcWRldi0+bW9uaXRvcnNfY29uZmlnIHx8IHF4bF9udW1fY3J0YyA8PSBpKQog CQlyZXR1cm47CiAKIAloZWFkLmlkID0gaTsKQEAgLTM1MCw5ICszNDgsMTAgQEAgc3RhdGljIHZv aWQgcXhsX2NydGNfdXBkYXRlX21vbml0b3JzX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMs CiAJaWYgKG9sZGNvdW50ICE9IHFkZXYtPm1vbml0b3JzX2NvbmZpZy0+Y291bnQpCiAJCURSTV9E RUJVR19LTVMoImFjdGl2ZSBoZWFkcyAlZCAtPiAlZCAoJWQgdG90YWwpXG4iLAogCQkJICAgICAg b2xkY291bnQsIHFkZXYtPm1vbml0b3JzX2NvbmZpZy0+Y291bnQsCi0JCQkgICAgICBxZGV2LT5t b25pdG9yc19jb25maWctPm1heF9hbGxvd2VkKTsKKwkJCSAgICAgIHF4bF9udW1fY3J0Yyk7CiAK IAlxZGV2LT5tb25pdG9yc19jb25maWctPmhlYWRzW2ldID0gaGVhZDsKKwlxZGV2LT5tb25pdG9y c19jb25maWctPm1heF9hbGxvd2VkID0gcXhsX251bV9jcnRjOwogCXF4bF9zZW5kX21vbml0b3Jz X2NvbmZpZyhxZGV2KTsKIH0KIApAQCAtMTE0Niw5ICsxMTQ1LDggQEAgaW50IHF4bF9jcmVhdGVf bW9uaXRvcnNfb2JqZWN0KHN0cnVjdCBxeGxfZGV2aWNlICpxZGV2KQogewogCWludCByZXQ7CiAJ c3RydWN0IGRybV9nZW1fb2JqZWN0ICpnb2JqOwotCWludCBtYXhfYWxsb3dlZCA9IHF4bF9udW1f Y3J0YzsKIAlpbnQgbW9uaXRvcnNfY29uZmlnX3NpemUgPSBzaXplb2Yoc3RydWN0IHF4bF9tb25p dG9yc19jb25maWcpICsKLQkJbWF4X2FsbG93ZWQgKiBzaXplb2Yoc3RydWN0IHF4bF9oZWFkKTsK KwkJcXhsX251bV9jcnRjICogc2l6ZW9mKHN0cnVjdCBxeGxfaGVhZCk7CiAKIAlyZXQgPSBxeGxf Z2VtX29iamVjdF9jcmVhdGUocWRldiwgbW9uaXRvcnNfY29uZmlnX3NpemUsIDAsCiAJCQkJICAg IFFYTF9HRU1fRE9NQUlOX1ZSQU0sCkBAIC0xMTcwLDkgKzExNjgsOCBAQCBpbnQgcXhsX2NyZWF0 ZV9tb25pdG9yc19vYmplY3Qoc3RydWN0IHF4bF9kZXZpY2UgKnFkZXYpCiAJCXF4bF9ib19waHlz aWNhbF9hZGRyZXNzKHFkZXYsIHFkZXYtPm1vbml0b3JzX2NvbmZpZ19ibywgMCk7CiAKIAltZW1z ZXQocWRldi0+bW9uaXRvcnNfY29uZmlnLCAwLCBtb25pdG9yc19jb25maWdfc2l6ZSk7Ci0JcWRl di0+bW9uaXRvcnNfY29uZmlnLT5tYXhfYWxsb3dlZCA9IG1heF9hbGxvd2VkOwotCi0JcWRldi0+ ZHVtYl9oZWFkcyA9IGtjYWxsb2MobWF4X2FsbG93ZWQsIHNpemVvZihxZGV2LT5kdW1iX2hlYWRz WzBdKSwgR0ZQX0tFUk5FTCk7CisJcWRldi0+ZHVtYl9oZWFkcyA9IGtjYWxsb2MocXhsX251bV9j cnRjLCBzaXplb2YocWRldi0+ZHVtYl9oZWFkc1swXSksCisJCQkJICAgR0ZQX0tFUk5FTCk7CiAJ cmV0dXJuIDA7CiB9CiAKLS0gCjIuOS4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpTcGljZS1kZXZlbCBtYWlsaW5nIGxpc3QKU3BpY2UtZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vc3BpY2UtZGV2ZWwK