From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH RESEND FOR CI] drm/i915/skl+: Use plane size for relative data rate calculation Date: Wed, 6 Apr 2016 08:26:39 -0700 Message-ID: <1459956399-1296-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id AB9516E21D for ; Wed, 6 Apr 2016 15:26:46 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KClVzZSBwbGFu ZSBzaXplIGZvciByZWxhdGl2ZSBkYXRhIHJhdGUgY2FsY3VsYXRpb24uIGRvbid0IGFsd2F5cyB1 c2UKcGlwZSBzb3VyY2Ugd2lkdGggJiBoZWlnaHQuCmFkanVzdCBoZWlnaHQgJiB3aWR0aCBhY2Nv cmRpbmcgdG8gcm90YXRpb24uCnVzZSBwbGFuZSBzaXplIGZvciB3YXRlcm1hcmsgY2FsY3VsYXRp b25zIGFsc28uCgp2MjogQWRkcmVzcyBNYXR0J3MgY29tbWVudHMuCiAgICBVc2UgaW50ZWxfcGxh bmVfc3RhdGUtPnZpc2libGUgdG8gYXZvaWQgZGl2aWRlLWJ5LXplcm8gZXJyb3IuCiAgICBXaGVy ZSBGQiB3YXMgcHJlc2VudCBidXQgbm90IHZpc2libGUgc28gY2F1c2luZyB0b3RhbCBkYXRhIHJh dGUgdG8KICAgIGJlIHplcm8sIGhlbmNlIGRpdmlkZS1ieS16ZXJvLgoKQnVnemlsbGE6IGh0dHBz Oi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkzOTE3CkJ1Z3ppbGxhOiBo dHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD05NDA0NApTaWduZWQt b2ZmLWJ5OiBLdW1hciwgTWFoZXNoIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KUmV2aWV3ZWQt Ynk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQpUaGlzIHBhdGNoIGlz IGluY2x1ZGVkIGFzIHBhcnQgb2YgYSBjb3VwbGUgcGVuZGluZyB3YXRlcm1hcmsgc2VyaWVzIHRo YXQgYXJlCnN0aWxsIHVuZGVyIHJldmlldywgYnV0IGl0J3MgYW4gaW1wb3J0YW50IGZpeCBvbiBp dHMgb3duLCBzbyB3ZSdkIGxpa2UgdG8gbWVyZ2UKaXQgZWFybHkuICBJIHJldmlld2VkIHRoZSBv cmlnaW5hbCBwYXRjaCBmcm9tIE1haGVzaCBhIHdoaWxlIGJhY2sgYW5kIGhhdmUgYmVlbgprZWVw aW5nIGl0IHJlYmFzZWQgc2luY2UgdGhhdCB0aW1lLgoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgfCA0MiArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCmluZGV4IDdmY2NmM2IuLjUyMWVlZDQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYwpAQCAtMjkzNywyNSArMjkzNywyOCBAQCBza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9y YXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkgICAgIGNvbnN0 IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAkJCSAgICAgaW50IHkpCiB7Ci0Jc3Ry dWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5j cnRjKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9IHRvX2ludGVs X3BsYW5lX3N0YXRlKHBzdGF0ZSk7CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwc3Rh dGUtPmZiOworCXVpbnQzMl90IHdpZHRoID0gMCwgaGVpZ2h0ID0gMDsKKworCXdpZHRoID0gZHJt X3JlY3Rfd2lkdGgoJmludGVsX3BzdGF0ZS0+c3JjKSA+PiAxNjsKKwloZWlnaHQgPSBkcm1fcmVj dF9oZWlnaHQoJmludGVsX3BzdGF0ZS0+c3JjKSA+PiAxNjsKKworCWlmIChpbnRlbF9yb3RhdGlv bl85MF9vcl8yNzAocHN0YXRlLT5yb3RhdGlvbikpCisJCXN3YXAod2lkdGgsIGhlaWdodCk7CiAK IAkvKiBmb3IgcGxhbmFyIGZvcm1hdCAqLwogCWlmIChmYi0+cGl4ZWxfZm9ybWF0ID09IERSTV9G T1JNQVRfTlYxMikgewogCQlpZiAoeSkgIC8qIHktcGxhbmUgZGF0YSByYXRlICovCi0JCQlyZXR1 cm4gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193ICoKLQkJCQlpbnRlbF9jcnRjLT5jb25m aWctPnBpcGVfc3JjX2ggKgorCQkJcmV0dXJuIHdpZHRoICogaGVpZ2h0ICoKIAkJCQlkcm1fZm9y bWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKIAkJZWxzZSAgICAvKiB1di1wbGFu ZSBkYXRhIHJhdGUgKi8KLQkJCXJldHVybiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193 LzIpICoKLQkJCQkoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oLzIpICoKKwkJCXJldHVy biAod2lkdGggLyAyKSAqIChoZWlnaHQgLyAyKSAqCiAJCQkJZHJtX2Zvcm1hdF9wbGFuZV9jcHAo ZmItPnBpeGVsX2Zvcm1hdCwgMSk7CiAJfQogCiAJLyogZm9yIHBhY2tlZCBmb3JtYXRzICovCi0J cmV0dXJuIGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfdyAqCi0JCWludGVsX2NydGMtPmNv bmZpZy0+cGlwZV9zcmNfaCAqCi0JCWRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5waXhlbF9mb3Jt YXQsIDApOworCXJldHVybiB3aWR0aCAqIGhlaWdodCAqIGRybV9mb3JtYXRfcGxhbmVfY3BwKGZi LT5waXhlbF9mb3JtYXQsIDApOwogfQogCiAvKgpAQCAtMzAzNCw4ICszMDM3LDkgQEAgc2tsX2Fs bG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmUtPnN0YXRlLT5mYjsKIAkJaW50IGlkID0gc2ts X3dtX3BsYW5lX2lkKGludGVsX3BsYW5lKTsKIAotCQlpZiAoZmIgPT0gTlVMTCkKKwkJaWYgKCF0 b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpLT52aXNpYmxlKQogCQkJY29udGludWU7 CisKIAkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCWNvbnRp bnVlOwogCkBAIC0zMDYxLDcgKzMwNjUsNyBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJdWludDE2X3QgcGxhbmVfYmxvY2tzLCB5X3Bs YW5lX2Jsb2NrcyA9IDA7CiAJCWludCBpZCA9IHNrbF93bV9wbGFuZV9pZChpbnRlbF9wbGFuZSk7 CiAKLQkJaWYgKHBzdGF0ZS0+ZmIgPT0gTlVMTCkKKwkJaWYgKCF0b19pbnRlbF9wbGFuZV9zdGF0 ZShwc3RhdGUpLT52aXNpYmxlKQogCQkJY29udGludWU7CiAJCWlmIChwbGFuZS0+dHlwZSA9PSBE Uk1fUExBTkVfVFlQRV9DVVJTT1IpCiAJCQljb250aW51ZTsKQEAgLTMxODQsMjYgKzMxODgsMzYg QEAgc3RhdGljIGJvb2wgc2tsX2NvbXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogewogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lID0gJmludGVs X3BsYW5lLT5iYXNlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmUtPnN0YXRl LT5mYjsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9CisJCQkJCXRv X2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7CiAJdWludDMyX3QgbGF0ZW5jeSA9IGRl dl9wcml2LT53bS5za2xfbGF0ZW5jeVtsZXZlbF07CiAJdWludDMyX3QgbWV0aG9kMSwgbWV0aG9k MjsKIAl1aW50MzJfdCBwbGFuZV9ieXRlc19wZXJfbGluZSwgcGxhbmVfYmxvY2tzX3Blcl9saW5l OwogCXVpbnQzMl90IHJlc19ibG9ja3MsIHJlc19saW5lczsKIAl1aW50MzJfdCBzZWxlY3RlZF9y ZXN1bHQ7CiAJdWludDhfdCBjcHA7CisJdWludDMyX3Qgd2lkdGggPSAwLCBoZWlnaHQgPSAwOwog Ci0JaWYgKGxhdGVuY3kgPT0gMCB8fCAhY3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCAhZmIpCisJaWYg KGxhdGVuY3kgPT0gMCB8fCAhY3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCAhaW50ZWxfcHN0YXRlLT52 aXNpYmxlKQogCQlyZXR1cm4gZmFsc2U7CiAKKwl3aWR0aCA9IGRybV9yZWN0X3dpZHRoKCZpbnRl bF9wc3RhdGUtPnNyYykgPj4gMTY7CisJaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZpbnRlbF9w c3RhdGUtPnNyYykgPj4gMTY7CisKKwlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHBsYW5l LT5zdGF0ZS0+cm90YXRpb24pKQorCQlzd2FwKHdpZHRoLCBoZWlnaHQpOworCiAJY3BwID0gZHJt X2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7CiAJbWV0aG9kMSA9IHNrbF93 bV9tZXRob2QxKHNrbF9waXBlX3BpeGVsX3JhdGUoY3N0YXRlKSwKIAkJCQkgY3BwLCBsYXRlbmN5 KTsKIAltZXRob2QyID0gc2tsX3dtX21ldGhvZDIoc2tsX3BpcGVfcGl4ZWxfcmF0ZShjc3RhdGUp LAogCQkJCSBjc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2h0b3RhbCwKLQkJCQkgY3N0 YXRlLT5waXBlX3NyY193LAotCQkJCSBjcHAsIGZiLT5tb2RpZmllclswXSwKKwkJCQkgd2lkdGgs CisJCQkJIGNwcCwKKwkJCQkgZmItPm1vZGlmaWVyWzBdLAogCQkJCSBsYXRlbmN5KTsKIAotCXBs YW5lX2J5dGVzX3Blcl9saW5lID0gY3N0YXRlLT5waXBlX3NyY193ICogY3BwOworCXBsYW5lX2J5 dGVzX3Blcl9saW5lID0gd2lkdGggKiBjcHA7CiAJcGxhbmVfYmxvY2tzX3Blcl9saW5lID0gRElW X1JPVU5EX1VQKHBsYW5lX2J5dGVzX3Blcl9saW5lLCA1MTIpOwogCiAJaWYgKGZiLT5tb2RpZmll clswXSA9PSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAotLSAKMi4xLjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=