From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 05/10] vmwgfx: Print error diagnostics if depth doesn't match the host expectation Date: Wed, 31 Aug 2011 09:42:50 +0200 Message-ID: <1314776575-9197-4-git-send-email-thellstrom@vmware.com> References: <1314776575-9197-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-2.vmware.com (smtp-outbound-2.vmware.com [65.115.85.73]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FBFC9E8DD for ; Wed, 31 Aug 2011 00:43:24 -0700 (PDT) In-Reply-To: <1314776575-9197-1-git-send-email-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: airlied@gmail.com, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWljaGVsIETDpG56ZXIgPGRhZW56ZXJAdm13YXJlLmNvbT4KClNpZ25lZC1vZmYtYnk6 IE1pY2hlbCBEw6RuemVyIDxkYWVuemVyQHZtd2FyZS5jb20+ClNpZ25lZC1vZmYtYnk6IFRob21h cyBIZWxsc3Ryb20gPHRoZWxsc3Ryb21Adm13YXJlLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9kcnYuaCB8ICAgIDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9mYi5jICB8ICAgMTAgKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfa21zLmMgfCAgIDEwICsrKysrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13 Z2Z4X2xkdS5jIHwgICAxNCArKysrLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAyMyBpbnNl cnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5o CmluZGV4IDBjMjQzNDcuLmZjMzNmM2YgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdn Zngvdm13Z2Z4X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5o CkBAIC01MDMsOSArNTAzLDkgQEAgdm9pZCB2bXdfa21zX2N1cnNvcl9zbm9vcChzdHJ1Y3Qgdm13 X3N1cmZhY2UgKnNyZiwKIAkJCSAgc3RydWN0IHR0bV9vYmplY3RfZmlsZSAqdGZpbGUsCiAJCQkg IHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAqYm8sCiAJCQkgIFNWR0EzZENtZEhlYWRlciAqaGVh ZGVyKTsKLXZvaWQgdm13X2ttc193cml0ZV9zdmdhKHN0cnVjdCB2bXdfcHJpdmF0ZSAqdm13X3By aXYsCi0JCQl1bnNpZ25lZCB3aWR0aCwgdW5zaWduZWQgaGVpZ2h0LCB1bnNpZ25lZCBwaXRjaCwK LQkJCXVuc2lnbmVkIGJwcCwgdW5zaWduZWQgZGVwdGgpOworaW50IHZtd19rbXNfd3JpdGVfc3Zn YShzdHJ1Y3Qgdm13X3ByaXZhdGUgKnZtd19wcml2LAorCQkgICAgICAgdW5zaWduZWQgd2lkdGgs IHVuc2lnbmVkIGhlaWdodCwgdW5zaWduZWQgcGl0Y2gsCisJCSAgICAgICB1bnNpZ25lZCBicHAs IHVuc2lnbmVkIGRlcHRoKTsKIGludCB2bXdfa21zX3VwZGF0ZV9sYXlvdXRfaW9jdGwoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVf cHJpdik7CiB2b2lkIHZtd19rbXNfaWRsZV93b3JrcXVldWVzKHN0cnVjdCB2bXdfbWFzdGVyICp2 bWFzdGVyKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZiLmMg Yi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9mYi5jCmluZGV4IDVmYjgwYjEuLmIxODg4 ZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZiLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmIuYwpAQCAtMTU4LDEwICsxNTgsMTQgQEAg c3RhdGljIGludCB2bXdfZmJfc2V0X3BhcihzdHJ1Y3QgZmJfaW5mbyAqaW5mbykKIHsKIAlzdHJ1 Y3Qgdm13X2ZiX3BhciAqcGFyID0gaW5mby0+cGFyOwogCXN0cnVjdCB2bXdfcHJpdmF0ZSAqdm13 X3ByaXYgPSBwYXItPnZtd19wcml2OworCWludCByZXQ7CisKKwlyZXQgPSB2bXdfa21zX3dyaXRl X3N2Z2Eodm13X3ByaXYsIGluZm8tPnZhci54cmVzLCBpbmZvLT52YXIueXJlcywKKwkJCQkgaW5m by0+Zml4LmxpbmVfbGVuZ3RoLAorCQkJCSBwYXItPmJwcCwgcGFyLT5kZXB0aCk7CisJaWYgKHJl dCkKKwkJcmV0dXJuIHJldDsKIAotCXZtd19rbXNfd3JpdGVfc3ZnYSh2bXdfcHJpdiwgaW5mby0+ dmFyLnhyZXMsIGluZm8tPnZhci55cmVzLAotCQkJICAgaW5mby0+Zml4LmxpbmVfbGVuZ3RoLAot CQkJICAgcGFyLT5icHAsIHBhci0+ZGVwdGgpOwogCWlmICh2bXdfcHJpdi0+Y2FwYWJpbGl0aWVz ICYgU1ZHQV9DQVBfRElTUExBWV9UT1BPTE9HWSkgewogCQkvKiBUT0RPIGNoZWNrIGlmIHBpdGNo IGFuZCBvZmZzZXQgY2hhbmdlcyAqLwogCQl2bXdfd3JpdGUodm13X3ByaXYsIFNWR0FfUkVHX05V TV9HVUVTVF9ESVNQTEFZUywgMSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ttcy5jCmluZGV4 IGJlODE2M2IuLjllYTJmMDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13 Z2Z4X2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ttcy5jCkBAIC05 OTAsNyArOTkwLDcgQEAgb3V0OgogCXJldHVybiByZXQ7CiB9CiAKLXZvaWQgdm13X2ttc193cml0 ZV9zdmdhKHN0cnVjdCB2bXdfcHJpdmF0ZSAqdm13X3ByaXYsCitpbnQgdm13X2ttc193cml0ZV9z dmdhKHN0cnVjdCB2bXdfcHJpdmF0ZSAqdm13X3ByaXYsCiAJCQl1bnNpZ25lZCB3aWR0aCwgdW5z aWduZWQgaGVpZ2h0LCB1bnNpZ25lZCBwaXRjaCwKIAkJCXVuc2lnbmVkIGJwcCwgdW5zaWduZWQg ZGVwdGgpCiB7CkBAIC0xMDAxLDYgKzEwMDEsMTQgQEAgdm9pZCB2bXdfa21zX3dyaXRlX3N2Z2Eo c3RydWN0IHZtd19wcml2YXRlICp2bXdfcHJpdiwKIAl2bXdfd3JpdGUodm13X3ByaXYsIFNWR0Ff UkVHX1dJRFRILCB3aWR0aCk7CiAJdm13X3dyaXRlKHZtd19wcml2LCBTVkdBX1JFR19IRUlHSFQs IGhlaWdodCk7CiAJdm13X3dyaXRlKHZtd19wcml2LCBTVkdBX1JFR19CSVRTX1BFUl9QSVhFTCwg YnBwKTsKKworCWlmICh2bXdfcmVhZCh2bXdfcHJpdiwgU1ZHQV9SRUdfREVQVEgpICE9IGRlcHRo KSB7CisJCURSTV9FUlJPUigiSW52YWxpZCBkZXB0aCAldSBmb3IgJXUgYnBwLCBob3N0IGV4cGVj dHMgJXVcbiIsCisJCQkgIGRlcHRoLCBicHAsIHZtd19yZWFkKHZtd19wcml2LCBTVkdBX1JFR19E RVBUSCkpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9CisKKwlyZXR1cm4gMDsKIH0KIAogaW50IHZt d19rbXNfc2F2ZV92Z2Eoc3RydWN0IHZtd19wcml2YXRlICp2bXdfcHJpdikKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2xkdS5jIGIvZHJpdmVycy9ncHUvZHJtL3Zt d2dmeC92bXdnZnhfbGR1LmMKaW5kZXggYzZkMDlhNi4uN2UxOTAxYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfbGR1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Zt d2dmeC92bXdnZnhfbGR1LmMKQEAgLTEyMywxMCArMTIzLDggQEAgc3RhdGljIGludCB2bXdfbGR1 X2NvbW1pdF9saXN0KHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQlyZXR1cm4gMDsK IAkJZmIgPSBlbnRyeS0+YmFzZS5jcnRjLmZiOwogCi0JCXZtd19rbXNfd3JpdGVfc3ZnYShkZXZf cHJpdiwgdywgaCwgZmItPnBpdGNoLAotCQkJCSAgIGZiLT5iaXRzX3Blcl9waXhlbCwgZmItPmRl cHRoKTsKLQotCQlyZXR1cm4gMDsKKwkJcmV0dXJuIHZtd19rbXNfd3JpdGVfc3ZnYShkZXZfcHJp diwgdywgaCwgZmItPnBpdGNoLAorCQkJCQkgIGZiLT5iaXRzX3Blcl9waXhlbCwgZmItPmRlcHRo KTsKIAl9CiAKIAlpZiAoIWxpc3RfZW1wdHkoJmxkcy0+YWN0aXZlKSkgewpAQCAtMjc0LDkgKzI3 Miw3IEBAIHN0YXRpYyBpbnQgdm13X2xkdV9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2Rl X3NldCAqc2V0KQogCiAJCXZtd19sZHVfZGVsX2FjdGl2ZShkZXZfcHJpdiwgbGR1KTsKIAotCQl2 bXdfbGR1X2NvbW1pdF9saXN0KGRldl9wcml2KTsKLQotCQlyZXR1cm4gMDsKKwkJcmV0dXJuIHZt d19sZHVfY29tbWl0X2xpc3QoZGV2X3ByaXYpOwogCX0KIAogCkBAIC0zMDEsOSArMjk3LDcgQEAg c3RhdGljIGludCB2bXdfbGR1X2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpz ZXQpCiAKIAl2bXdfbGR1X2FkZF9hY3RpdmUoZGV2X3ByaXYsIGxkdSwgdmZiKTsKIAotCXZtd19s ZHVfY29tbWl0X2xpc3QoZGV2X3ByaXYpOwotCi0JcmV0dXJuIDA7CisJcmV0dXJuIHZtd19sZHVf Y29tbWl0X2xpc3QoZGV2X3ByaXYpOwogfQogCiBzdGF0aWMgc3RydWN0IGRybV9jcnRjX2Z1bmNz IHZtd19sZWdhY3lfY3J0Y19mdW5jcyA9IHsKLS0gCjEuNy40LjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==