From: Thomas Hellstrom Subject: [PATCH] drm/vmwgfx: Turn off support for multisample count != 0 v2 Date: Mon, 26 Oct 2015 10:48:51 -0700 Message-ID: <1445881731-37366-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id A8E96892A4 for ; Mon, 26 Oct 2015 10:49:48 -0700 (PDT) Received: from sc9-mailhost3.vmware.com (sc9-mailhost3.vmware.com [10.113.161.73]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id DA0BA28B81 for ; Mon, 26 Oct 2015 10:49:48 -0700 (PDT) Received: from EX13-CAS-008.vmware.com (ex13-cas-008.vmware.com [10.113.191.58]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 4E76540467 for ; Mon, 26 Oct 2015 10:49:46 -0700 (PDT) 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 Cc: Thomas Hellstrom List-Id: dri-devel@lists.freedesktop.org RG8gdGhpcyB1bnRpbCB3ZSBrbm93IGhvdyBtdWNoIE1PQiBtZW1vcnkgdG8gYWxsb2NhdGUgZm9y IHRoZXNlIHN1cmZhY2VzLgp2MjogTWFzayBhbHNvIG5vbi1EWCBtdWx0aXNhbXBsZS4KClNpZ25l ZC1vZmYtYnk6IFRob21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KUmV2aWV3 ZWQtYnk6IEJyaWFuIFBhdWwgPGJyaWFucEB2bXdhcmUuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X2lvY3RsLmMgICB8IDIyICsrKysrKysrKysrKysrKysrKysrLS0KIGRy aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3N1cmZhY2UuYyB8ICAyICsrCiAyIGZpbGVzIGNo YW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfaW9jdGwuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdn Zngvdm13Z2Z4X2lvY3RsLmMKaW5kZXggMGE5NzBhZi4uYTNlM2M4MyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfaW9jdGwuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9pb2N0bC5jCkBAIC0xMjIsNiArMTIyLDIyIEBAIGludCB2bXdfZ2V0cGFy YW1faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlyZXR1cm4gMDsK IH0KIAorc3RhdGljIHUzMiB2bXdfbWFza19tdWx0aXNhbXBsZSh1bnNpZ25lZCBpbnQgY2FwLCB1 MzIgZm10X3ZhbHVlKQoreworCS8qIElmIHRoZSBoZWFkZXIgaXMgdXBkYXRlZCwgdXBkYXRlIHRo ZSBmb3JtYXQgdGVzdCBhcyB3ZWxsISAqLworCUJVSUxEX0JVR19PTihTVkdBM0RfREVWQ0FQX0RY Rk1UX0JDNV9VTk9STSArIDEgIT0gU1ZHQTNEX0RFVkNBUF9NQVgpOworCisJaWYgKGNhcCA+PSBT VkdBM0RfREVWQ0FQX0RYRk1UX1g4UjhHOEI4ICYmCisJICAgIGNhcCA8PSBTVkdBM0RfREVWQ0FQ X0RYRk1UX0JDNV9VTk9STSkKKwkJZm10X3ZhbHVlICY9IH4oU1ZHQURYX0RYRk1UX01VTFRJU0FN UExFXzIgfAorCQkJICAgICAgIFNWR0FEWF9EWEZNVF9NVUxUSVNBTVBMRV80IHwKKwkJCSAgICAg ICBTVkdBRFhfRFhGTVRfTVVMVElTQU1QTEVfOCk7CisJZWxzZSBpZiAoY2FwID09IFNWR0EzRF9E RVZDQVBfTVVMVElTQU1QTEVfTUFTS0FCTEVTQU1QTEVTKQorCQlyZXR1cm4gMDsKKworCXJldHVy biBmbXRfdmFsdWU7Cit9CisKIHN0YXRpYyBpbnQgdm13X2ZpbGxfY29tcGF0X2NhcChzdHJ1Y3Qg dm13X3ByaXZhdGUgKmRldl9wcml2LCB2b2lkICpib3VuY2UsCiAJCQkgICAgICAgc2l6ZV90IHNp emUpCiB7CkBAIC0xNDcsNyArMTYzLDggQEAgc3RhdGljIGludCB2bXdfZmlsbF9jb21wYXRfY2Fw KHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYsIHZvaWQgKmJvdW5jZSwKIAlmb3IgKGkgPSAw OyBpIDwgbWF4X3NpemU7ICsraSkgewogCQl2bXdfd3JpdGUoZGV2X3ByaXYsIFNWR0FfUkVHX0RF Vl9DQVAsIGkpOwogCQljb21wYXRfY2FwLT5wYWlyc1tpXVswXSA9IGk7Ci0JCWNvbXBhdF9jYXAt PnBhaXJzW2ldWzFdID0gdm13X3JlYWQoZGV2X3ByaXYsIFNWR0FfUkVHX0RFVl9DQVApOworCQlj b21wYXRfY2FwLT5wYWlyc1tpXVsxXSA9IHZtd19tYXNrX211bHRpc2FtcGxlCisJCQkoaSwgdm13 X3JlYWQoZGV2X3ByaXYsIFNWR0FfUkVHX0RFVl9DQVApKTsKIAl9CiAJc3Bpbl91bmxvY2soJmRl dl9wcml2LT5jYXBfbG9jayk7CiAKQEAgLTIwMiw3ICsyMTksOCBAQCBpbnQgdm13X2dldF9jYXBf M2RfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJc3Bpbl9sb2Nr KCZkZXZfcHJpdi0+Y2FwX2xvY2spOwogCQlmb3IgKGkgPSAwOyBpIDwgbnVtOyArK2kpIHsKIAkJ CXZtd193cml0ZShkZXZfcHJpdiwgU1ZHQV9SRUdfREVWX0NBUCwgaSk7Ci0JCQkqYm91bmNlMzIr KyA9IHZtd19yZWFkKGRldl9wcml2LCBTVkdBX1JFR19ERVZfQ0FQKTsKKwkJCSpib3VuY2UzMisr ID0gdm13X21hc2tfbXVsdGlzYW1wbGUKKwkJCQkoaSwgdm13X3JlYWQoZGV2X3ByaXYsIFNWR0Ff UkVHX0RFVl9DQVApKTsKIAkJfQogCQlzcGluX3VubG9jaygmZGV2X3ByaXYtPmNhcF9sb2NrKTsK IAl9IGVsc2UgaWYgKGdiX29iamVjdHMpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92 bXdnZngvdm13Z2Z4X3N1cmZhY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3N1 cmZhY2UuYwppbmRleCAwM2Y2M2M3Li43ZDYyMGU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vdm13Z2Z4L3Ztd2dmeF9zdXJmYWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfc3VyZmFjZS5jCkBAIC0xMjkxLDYgKzEyOTEsOCBAQCBpbnQgdm13X2diX3N1cmZhY2Vf ZGVmaW5lX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJdWludDMy X3Qgc2l6ZTsKIAl1aW50MzJfdCBiYWNrdXBfaGFuZGxlOwogCisJaWYgKHJlcS0+bXVsdGlzYW1w bGVfY291bnQgIT0gMCkKKwkJcmV0dXJuIC1FSU5WQUw7CiAKIAlpZiAodW5saWtlbHkodm13X3Vz ZXJfc3VyZmFjZV9zaXplID09IDApKQogCQl2bXdfdXNlcl9zdXJmYWNlX3NpemUgPSB0dG1fcm91 bmRfcG90KHNpemVvZigqdXNlcl9zcmYpKSArCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK