From: Matt Roper Subject: [RFC 12/15] drm/i915: Actually use pre-computer watermark values (!!SQUASHME) Date: Wed, 20 May 2015 19:12:24 -0700 Message-ID: <1432174347-19138-13-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-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 5D06B6E80E for ; Wed, 20 May 2015 19:12:30 -0700 (PDT) In-Reply-To: <1432174347-19138-1-git-send-email-matthew.d.roper@intel.com> 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 UmF0aGVyIHRoYXQganVzdCBjb21wYXJpbmcgYW5kIHRoZW4gdGhyb3dpbmcgYXdheSB0aGUgcGlw ZSB3YXRlcm1hcmsKdmFsdWVzIHdlIHByZWNvbXB1dGVkIGF0IGF0b21pYyBjaGVjayB0aW1lLCBh Y3R1YWxseSB1c2UgdGhvc2UgdmFsdWVzCndoZW4gd2UgcHJvZ3JhbSB3YXRlcm1hcmtzLgoKRklY TUU6ICBUaGlzIHNob3VsZCBiZSBzcXVhc2hlZCBpbnRvIHRoZSBwcmV2aW91cyBwYXRjaCBldmVu dHVhbGx5LCBvbmNlCndlJ3JlIGNvbnZpbmNlZCB0aGF0IHByZS1jb21wdXRlZCB3YXRlcm1hcmtz IGdldCB0aGUgcHJvcGVyIHZhbHVlcyBpbgphbGwgY2FzZXMuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0 IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggICAgIHwgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0 b21pYy5jIHwgIDQgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgIHwgIDMg LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgIHwgNzcgKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25z KCspLCA2MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyMTRjZTc2 Li5kNTc3ZWJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTU2Myw4ICs1NjMsNyBAQCBz dHJ1Y3QgZHJtX2k5MTVfZGlzcGxheV9mdW5jcyB7CiAJCQkgIHN0cnVjdCBkcGxsICptYXRjaF9j bG9jaywKIAkJCSAgc3RydWN0IGRwbGwgKmJlc3RfY2xvY2spOwogCWludCAoKmNvbXB1dGVfcGlw ZV93bSkoc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWlj X3N0YXRlICpzdGF0ZSwKLQkJCSAgICAgICB2b2lkICp0YXJnZXQpOworCQkJICAgICAgIHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7CiAJdm9pZCAoKnVwZGF0ZV93bSkoc3RydWN0IGRy bV9jcnRjICpjcnRjKTsKIAl2b2lkICgqdXBkYXRlX3Nwcml0ZV93bSkoc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCiAJCQkJIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfYXRvbWljLmMKaW5kZXggZGIzNDlkZC4uNTI5NDg0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfYXRvbWljLmMKQEAgLTQzNSwxNCArNDM1LDEyIEBAIGludGVsX2NoZWNrX2NydGMoc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCQkgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmRldik7Ci0J c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0 ZShzdGF0ZSk7CiAJaW50IHJldDsKIAogCWlmICghZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9w aXBlX3dtKQogCQlyZXR1cm4gMDsKIAotCXJldCA9IGRldl9wcml2LT5kaXNwbGF5LmNvbXB1dGVf cGlwZV93bShjcnRjLCBzdGF0ZS0+c3RhdGUsCi0JCQkJCQkmaW50ZWxfc3RhdGUtPndtLnRtcCk7 CisJcmV0ID0gZGV2X3ByaXYtPmRpc3BsYXkuY29tcHV0ZV9waXBlX3dtKGNydGMsIHN0YXRlLT5z dGF0ZSk7CiAKIAlyZXR1cm4gcmV0OwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA2 Y2EzYzA2Li42Mjc3NDFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDY0LDkgKzQ2 NCw2IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zY2Fs ZXJfc3RhdGUgc2NhbGVyX3N0YXRlOwogCiAJc3RydWN0IHsKLQkJLyogdG1wIHdtICovCi0JCXN0 cnVjdCBpbnRlbF9waXBlX3dtIHRtcDsKLQogCQkvKiBmaW5hbCwgdGFyZ2V0IHdhdGVybWFya3Mg Zm9yIHN0YXRlICovCiAJCXVuaW9uIHsKIAkJCXN0cnVjdCBpbnRlbF9waXBlX3dtIGlsazsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDAxN2IxODQuLjI3MzM3ZmUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYwpAQCAtMjA3MywxMCArMjA3Myw5IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRl X3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAvKiBDb21wdXRlIG5ldyB3YXRl cm1hcmtzIGZvciB0aGUgcGlwZSAqLwogc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCSAgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUsCi0JCQkgICAgICAgdm9pZCAqdGFyZ2V0KQorCQkJICAgICAgIHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bSA9IHRh cmdldDsKKwlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqcGlwZV93bTsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCWNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMg PSB0b19pbnRlbF9jcnRjKGNydGMpOwpAQCAtMjA5NCw0NyArMjA5MywyNiBAQCBzdGF0aWMgaW50 IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRjICpjcnRjLAogCX07CiAJc3RydWN0 IGlsa193bV9tYXhpbXVtcyBtYXg7CiAKLQkvKgotCSAqIEZJWE1FOiBJbiBhbiB1cGNvbWluZyBw YXRjaCwgd2UnbGwgKm9ubHkqIGJlIGNhbGxpbmcgdGhpcyBmcm9tIHRoZQotCSAqIGF0b21pYyAn Y2hlY2snIGNvZGVwYXRoIGFuZCB0aHVzIHdpbGwgYWx3YXlzIGhhdmUgYSB0b3AtbGV2ZWwgYXRv bWljCi0JICogdHJhbnNhY3Rpb24uICBIb3dldmVyIGF0IHRoZSBtb21lbnQgd2Ugc3RpbGwgY2Fs bCB0aGlzIGluIHRoZSBsZWdhY3kKLQkgKiAnaWxrX3VwZGF0ZV93bScgZnVuY3Rpb24sIHdoaWNo IG1lYW5zIHdlIG5lZWQgdG8gYmUgYWJsZSB0byBhbHNvCi0JICogb3BlcmF0ZSBvbiBhbHJlYWR5 LWNvbW1pdHRlZCBzdGF0ZSB3aGljaCBoYXMgYmVlbiBkZXRhY2hlZCBmcm9tIGFueQotCSAqIHRv cC1sZXZlbCB0cmFuc2FjdGlvbi4KLQkgKgotCSAqIERyb3AgdGhlICdlbHNlJyBibG9jayBoZXJl IG9uY2Ugd2Ugb25seSBkbyBhdG9taWMtc3R5bGUgd2F0ZXJtYXJrcy4KLQkgKi8KLQlpZiAoc3Rh dGUpIHsKLQkJY3MgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQkJ aWYgKElTX0VSUihjcykpCi0JCQlyZXR1cm4gUFRSX0VSUihjcyk7Ci0JCWVsc2UKLQkJCWNzdGF0 ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3MpOwotCi0JCWZvcl9lYWNoX2ludGVsX3BsYW5lX29m X2NydGMoaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKLQkJCXBzID0gZHJtX2F0b21pY19nZXRf cGxhbmVfc3RhdGUoc3RhdGUsCi0JCQkJCQkJJmludGVsX3BsYW5lLT5iYXNlKTsKLQkJCWlmIChJ U19FUlIocHMpKQotCQkJCXJldHVybiBQVFJfRVJSKHBzKTsKLQotCQkJaWYgKGludGVsX3BsYW5l LT5iYXNlLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKLQkJCQlwcmlzdGF0ZSA9IHRv X2ludGVsX3BsYW5lX3N0YXRlKHBzKTsKLQkJCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5 cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSkKLQkJCQlzcHJzdGF0ZSA9IHRvX2ludGVsX3Bs YW5lX3N0YXRlKHBzKTsKLQkJCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUgPT0gRFJN X1BMQU5FX1RZUEVfQ1VSU09SKQotCQkJCWN1cnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUo cHMpOwotCQl9Ci0JfSBlbHNlIHsKLQkJLyogVXNlIGFscmVhZHktY29tbWl0dGVkIHN0YXRlICov Ci0JCWNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwotCQlmb3JfZWFj aF9pbnRlbF9wbGFuZV9vZl9jcnRjKGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7Ci0JCQlpZiAo aW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZKSB7Ci0JCQkJ c3Byc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZSk7 Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0JCX0KLQkJcHJpc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0 ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSk7Ci0JCWN1cnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3Rh dGUoY3J0Yy0+Y3Vyc29yLT5zdGF0ZSk7CisJY3MgPSBkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRl KHN0YXRlLCBjcnRjKTsKKwlpZiAoSVNfRVJSKGNzKSkKKwkJcmV0dXJuIFBUUl9FUlIoY3MpOwor CWVsc2UKKwkJY3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcyk7CisKKwlwaXBlX3dtID0g JmNzdGF0ZS0+d20udGFyZ2V0LmlsazsKKworCWZvcl9lYWNoX2ludGVsX3BsYW5lX29mX2NydGMo aW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKKwkJcHMgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9z dGF0ZShzdGF0ZSwKKwkJCQkJCSZpbnRlbF9wbGFuZS0+YmFzZSk7CisJCWlmIChJU19FUlIocHMp KQorCQkJcmV0dXJuIFBUUl9FUlIocHMpOworCisJCWlmIChpbnRlbF9wbGFuZS0+YmFzZS50eXBl ID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCisJCQlwcmlzdGF0ZSA9IHRvX2ludGVsX3BsYW5l X3N0YXRlKHBzKTsKKwkJZWxzZSBpZiAoaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1fUExB TkVfVFlQRV9PVkVSTEFZKQorCQkJc3Byc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcyk7 CisJCWVsc2UgaWYgKGludGVsX3BsYW5lLT5iYXNlLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VS U09SKQorCQkJY3Vyc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcyk7CiAJfQogCiAJY29u ZmlnLnNwcml0ZXNfZW5hYmxlZCA9IHNwcnN0YXRlLT52aXNpYmxlOwpAQCAtMzUxMSwxNyArMzQ4 OSw2IEBAIHN0YXRpYyB2b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogc3RhdGljIHZvaWQgaWxrX3VwZGF0ZV93bShzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShjcnRjLT5kZXYpOwotCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19p bnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBwaXBl X3dtID0ge307Ci0KLQlpbGtfY29tcHV0ZV9waXBlX3dtKGNydGMsIE5VTEwsICZwaXBlX3dtKTsK LQlXQVJOKG1lbWNtcCgmY3N0YXRlLT53bS50bXAsICZwaXBlX3dtLCBzaXplb2YocGlwZV93bSkp ICE9IDAsCi0JICAgICAiUHJlLWNvbXB1dGVkIGF0b21pYyB3YXRlcm1hcmsgdmFsdWVzIGRvIG5v dCBtYXRjaCBmaW5hbCB2YWx1ZXMhIik7Ci0KLQlpZiAoIW1lbWNtcCgmY3N0YXRlLT53bS50YXJn ZXQuaWxrLCAmcGlwZV93bSwgc2l6ZW9mKHBpcGVfd20pKSkKLQkJcmV0dXJuOwotCi0JY3N0YXRl LT53bS50YXJnZXQuaWxrID0gcGlwZV93bTsKIAogCWlsa19wcm9ncmFtX3dhdGVybWFya3MoZGV2 X3ByaXYpOwogfQotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK