From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 2/2] drm/vmwgfx: Filter out modes those cannot be supported by the current VRAM size. Date: Fri, 31 Oct 2014 10:53:50 +0100 Message-ID: <1414749230-2988-2-git-send-email-thellstrom@vmware.com> References: <1414749230-2988-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 [208.91.2.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E32C6E755 for ; Fri, 31 Oct 2014 02:54:33 -0700 (PDT) In-Reply-To: <1414749230-2988-1-git-send-email-thellstrom@vmware.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 Cc: stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogU2luY2xhaXIgWWVoIDxzeWVoQHZtd2FyZS5jb20+CgpXaGVuIHNjcmVlbiBvYmplY3Rz IGFyZSBlbmFibGVkLCB0aGUgYnBwIGlzIGFzc3VtZWQgdG8gYmUgMzIsIG90aGVyd2lzZQppdCBp cyBzZXQgdG8gMTYuCgp2MjoKKiBVc2UgdTMyIGluc3RlYWQgb2YgdTY0IGZvciBhc3N1bWVkX2Jw cC4KKiBGaXhlZCBtZWNoYW5pc20gdG8gY2hlY2sgZm9yIHNjcmVlbiBvYmplY3RzCiogTGltaXQg dGhlIGJhY2sgYnVmZmVyIHNpemUgdG8gVlJBTS4KClNpZ25lZC1vZmYtYnk6IFNpbmNsYWlyIFll aCA8c3llaEB2bXdhcmUuY29tPgpSZXZpZXdlZC1ieTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxz dHJvbUB2bXdhcmUuY29tPgpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMgfCAgNiArKysrKy0KIGRyaXZlcnMvZ3B1L2Ry bS92bXdnZngvdm13Z2Z4X2ttcy5jIHwgMTYgKysrKysrKysrKysrKy0tLQogMiBmaWxlcyBjaGFu Z2VkLCAxOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfZHJ2LmMKaW5kZXggNzE5N2FmMS4uMjVmM2MyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfZHJ2LmMKQEAgLTY4OCw3ICs2ODgsMTEgQEAgc3RhdGljIGludCB2bXdfZHJpdmVyX2xv YWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBjaGlwc2V0KQogCQlnb3Rv IG91dF9lcnIwOwogCX0KIAotCWlmICh1bmxpa2VseShkZXZfcHJpdi0+cHJpbV9iYl9tZW0gPCBk ZXZfcHJpdi0+dnJhbV9zaXplKSkKKwkvKgorCSAqIExpbWl0IGJhY2sgYnVmZmVyIHNpemUgdG8g VlJBTSBzaXplLiAgUmVtb3ZlIHRoaXMgb25jZQorCSAqIHNjcmVlbiB0YXJnZXRzIGFyZSBpbXBs ZW1lbnRlZC4KKwkgKi8KKwlpZiAoZGV2X3ByaXYtPnByaW1fYmJfbWVtID4gZGV2X3ByaXYtPnZy YW1fc2l6ZSkKIAkJZGV2X3ByaXYtPnByaW1fYmJfbWVtID0gZGV2X3ByaXYtPnZyYW1fc2l6ZTsK IAogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmh3X211dGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfa21zLmMKaW5kZXggOGZjMWUzOC4uOTQxYTdiYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3Ztd2dmeC92bXdnZnhfa21zLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92 bXdnZnhfa21zLmMKQEAgLTE5NTAsNiArMTk1MCwxNCBAQCBpbnQgdm13X2R1X2Nvbm5lY3Rvcl9m aWxsX21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCURSTV9NT0RFX0ZM QUdfTkhTWU5DIHwgRFJNX01PREVfRkxBR19QVlNZTkMpCiAJfTsKIAlpbnQgaTsKKwl1MzIgYXNz dW1lZF9icHAgPSAyOworCisJLyoKKwkgKiBJZiB1c2luZyBzY3JlZW4gb2JqZWN0cywgdGhlbiBh c3N1bWUgMzItYnBwIGJlY2F1c2UgdGhhdCdzIHdoYXQgdGhlCisJICogU1ZHQSBkZXZpY2UgaXMg YXNzdW1pbmcKKwkgKi8KKwlpZiAoZGV2X3ByaXYtPnNvdV9wcml2KQorCQlhc3N1bWVkX2JwcCA9 IDQ7CiAKIAkvKiBBZGQgcHJlZmVycmVkIG1vZGUgKi8KIAl7CkBAIC0xOTYwLDggKzE5NjgsOSBA QCBpbnQgdm13X2R1X2Nvbm5lY3Rvcl9maWxsX21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IsCiAJCW1vZGUtPnZkaXNwbGF5ID0gZHUtPnByZWZfaGVpZ2h0OwogCQl2bXdfZ3Vl c3NfbW9kZV90aW1pbmcobW9kZSk7CiAKLQkJaWYgKHZtd19rbXNfdmFsaWRhdGVfbW9kZV92cmFt KGRldl9wcml2LCBtb2RlLT5oZGlzcGxheSAqIDIsCi0JCQkJCSAgICAgICBtb2RlLT52ZGlzcGxh eSkpIHsKKwkJaWYgKHZtd19rbXNfdmFsaWRhdGVfbW9kZV92cmFtKGRldl9wcml2LAorCQkJCQkJ bW9kZS0+aGRpc3BsYXkgKiBhc3N1bWVkX2JwcCwKKwkJCQkJCW1vZGUtPnZkaXNwbGF5KSkgewog CQkJZHJtX21vZGVfcHJvYmVkX2FkZChjb25uZWN0b3IsIG1vZGUpOwogCQl9IGVsc2UgewogCQkJ ZHJtX21vZGVfZGVzdHJveShkZXYsIG1vZGUpOwpAQCAtMTk4Myw3ICsxOTkyLDggQEAgaW50IHZt d19kdV9jb25uZWN0b3JfZmlsbF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCQkgICAgYm1vZGUtPnZkaXNwbGF5ID4gbWF4X2hlaWdodCkKIAkJCWNvbnRpbnVlOwogCi0J CWlmICghdm13X2ttc192YWxpZGF0ZV9tb2RlX3ZyYW0oZGV2X3ByaXYsIGJtb2RlLT5oZGlzcGxh eSAqIDIsCisJCWlmICghdm13X2ttc192YWxpZGF0ZV9tb2RlX3ZyYW0oZGV2X3ByaXYsCisJCQkJ CQlibW9kZS0+aGRpc3BsYXkgKiBhc3N1bWVkX2JwcCwKIAkJCQkJCWJtb2RlLT52ZGlzcGxheSkp CiAJCQljb250aW51ZTsKIAotLSAKMS44LjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK