From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 08/18] drm/i915: Skip useless watermark/FIFO related work on VLV/CHV when not needed Date: Thu, 2 Mar 2017 19:14:58 +0200 Message-ID: <20170302171508.1666-9-ville.syrjala@linux.intel.com> References: <20170302171508.1666-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03F8D6EC0E for ; Thu, 2 Mar 2017 17:15:57 +0000 (UTC) In-Reply-To: <20170302171508.1666-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkNo ZWNrIHdoZXRoZXIgYW55dGhpbmcgcmVsZXZhbnQgaGFzIGFjdHVhbGx5IGNoYW5nZSB3aGVuIHdl IGNvbXB1dGUgbmV3CndhdGVybWFya3MgZm9yIGVhY2ggcGxhbmUgaW4gdGhlIHN0YXRlLiBJZiB0 aGUgd2F0ZXJtYXJrcyBmb3Igbm8KcHJpbWFyeS9zcHJpdGUgcGxhbmVzIGNoYW5nZWQgd2UgZG9u J3QgaGF2ZSB0byByZWNvbXB1dGUgdGhlIEZJRk8gc3BsaXQKb3IgcmVwcm9ncmFtIHRoZSBEU0JB UkIgcmVnaXN0ZXJzLiBBbmQgZXZlbiB0aGUgY3Vyc29yIHdhdGVybWFya3MgZGlkbid0CmNoYW5n ZSB3ZSBjYW4gc2tpcCB0aGUgbWVyZ2UraW52ZXJ0IHN0ZXAgYmV0d2VlbiBhbGwgdGhlIHBsYW5l cyBvbgp0aGUgcGlwZSBhcyB3ZWxsLgoKdjI6IHMvbm9uaW52ZXJ0ZWQvcmF3LyBmb3IgY29uc2lz dGVuY3kgd2l0aCBvdGhlciBwbGF0Zm9ybXMKClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzD pCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYWFydGVuIExh bmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggICAgfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAg ICB8IDczICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0KIDMgZmlsZXMgY2hh bmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYwppbmRleCBlNjU4MThlNWQyYWIuLjUwZmIxZjc2Y2M1ZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKQEAgLTk5LDYgKzk5LDcgQEAgaW50ZWxfY3J0Y19kdXBs aWNhdGVfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWNydGNfc3RhdGUtPnVwZGF0ZV93 bV9wcmUgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT51cGRhdGVfd21fcG9zdCA9IGZhbHNlOwogCWNy dGNfc3RhdGUtPmZiX2NoYW5nZWQgPSBmYWxzZTsKKwljcnRjX3N0YXRlLT5maWZvX2NoYW5nZWQg PSBmYWxzZTsKIAljcnRjX3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gZmFsc2U7CiAJ Y3J0Y19zdGF0ZS0+ZmJfYml0cyA9IDA7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg MzUxYTE0Yzk4MjA1Li4wNDk0MzczMjI1NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBA IC01NzMsNiArNTczLDcgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogCWJvb2wgZGlzYWJs ZV9jeHNyOwogCWJvb2wgdXBkYXRlX3dtX3ByZSwgdXBkYXRlX3dtX3Bvc3Q7IC8qIHdhdGVybWFy a3MgYXJlIHVwZGF0ZWQgKi8KIAlib29sIGZiX2NoYW5nZWQ7IC8qIGZiIG9uIGFueSBvZiB0aGUg cGxhbmVzIGlzIGNoYW5nZWQgKi8KKwlib29sIGZpZm9fY2hhbmdlZDsgLyogRklGTyBzcGxpdCBp cyBjaGFuZ2VkICovCiAKIAkvKiBQaXBlIHNvdXJjZSBzaXplIChpZS4gcGFuZWwgZml0dGVyIGlu cHV0IHNpemUpCiAJICogQWxsIHBsYW5lcyB3aWxsIGJlIHBvc2l0aW9uZWQgaW5zaWRlIHRoaXMg c3BhY2UsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBmN2NjMDEzYjNhNzguLjI1NjZjODhk OGM4OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0xMTI4LDMwICsxMTI4LDM1IEBAIHN0 YXRpYyB1MTYgdmx2X2ludmVydF93bV92YWx1ZSh1MTYgd20sIHUxNiBmaWZvX3NpemUpCiAgKiBT dGFydGluZyBmcm9tICdsZXZlbCcgc2V0IGFsbCBoaWdoZXIKICAqIGxldmVscyB0byAndmFsdWUn IGluIHRoZSAicmF3IiB3YXRlcm1hcmtzLgogICovCi1zdGF0aWMgdm9pZCB2bHZfcmF3X3BsYW5l X3dtX3NldChzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKK3N0YXRpYyBib29s IHZsdl9yYXdfcGxhbmVfd21fc2V0KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl LAogCQkJCSBpbnQgbGV2ZWwsIGVudW0gcGxhbmVfaWQgcGxhbmVfaWQsIHUxNiB2YWx1ZSkKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGNfc3RhdGUt PmJhc2UuY3J0Yy0+ZGV2KTsKIAlpbnQgbnVtX2xldmVscyA9IHZsdl9udW1fd21fbGV2ZWxzKGRl dl9wcml2KTsKKwlib29sIGRpcnR5ID0gZmFsc2U7CiAKIAlmb3IgKDsgbGV2ZWwgPCBudW1fbGV2 ZWxzOyBsZXZlbCsrKSB7CiAJCXN0cnVjdCB2bHZfcGlwZV93bSAqcmF3ID0gJmNydGNfc3RhdGUt PndtLnZsdi5yYXdbbGV2ZWxdOwogCisJCWRpcnR5IHw9IHJhdy0+cGxhbmVbcGxhbmVfaWRdICE9 IHZhbHVlOwogCQlyYXctPnBsYW5lW3BsYW5lX2lkXSA9IHZhbHVlOwogCX0KKworCXJldHVybiBk aXJ0eTsKIH0KIAotc3RhdGljIHZvaWQgdmx2X3BsYW5lX3dtX2NvbXB1dGUoc3RydWN0IGludGVs X2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCitzdGF0aWMgYm9vbCB2bHZfcGxhbmVfd21fY29tcHV0 ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgY29uc3Qgc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUg KnBsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOwogCWVudW0g cGxhbmVfaWQgcGxhbmVfaWQgPSBwbGFuZS0+aWQ7CiAJaW50IG51bV9sZXZlbHMgPSB2bHZfbnVt X3dtX2xldmVscyh0b19pOTE1KHBsYW5lLT5iYXNlLmRldikpOwogCWludCBsZXZlbDsKKwlib29s IGRpcnR5ID0gZmFsc2U7CiAKIAlpZiAoIXBsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpIHsKLQkJ dmx2X3Jhd19wbGFuZV93bV9zZXQoY3J0Y19zdGF0ZSwgMCwgcGxhbmVfaWQsIDApOwotCQlyZXR1 cm47CisJCWRpcnR5IHw9IHZsdl9yYXdfcGxhbmVfd21fc2V0KGNydGNfc3RhdGUsIDAsIHBsYW5l X2lkLCAwKTsKKwkJZ290byBvdXQ7CiAJfQogCiAJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgbnVt X2xldmVsczsgbGV2ZWwrKykgewpAQCAtMTE2NiwxNyArMTE3MSwyMiBAQCBzdGF0aWMgdm9pZCB2 bHZfcGxhbmVfd21fY29tcHV0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwK IAkJaWYgKHdtID4gbWF4X3dtKQogCQkJYnJlYWs7CiAKKwkJZGlydHkgfD0gcmF3LT5wbGFuZVtw bGFuZV9pZF0gIT0gd207CiAJCXJhdy0+cGxhbmVbcGxhbmVfaWRdID0gd207CiAJfQogCiAJLyog bWFyayBhbGwgaGlnaGVyIGxldmVscyBhcyBpbnZhbGlkICovCi0Jdmx2X3Jhd19wbGFuZV93bV9z ZXQoY3J0Y19zdGF0ZSwgbGV2ZWwsIHBsYW5lX2lkLCBVU0hSVF9NQVgpOworCWRpcnR5IHw9IHZs dl9yYXdfcGxhbmVfd21fc2V0KGNydGNfc3RhdGUsIGxldmVsLCBwbGFuZV9pZCwgVVNIUlRfTUFY KTsKIAotCURSTV9ERUJVR19LTVMoIiVzIHdtczogWzBdPSVkLFsxXT0lZCxbMl09JWRcbiIsCi0J CSAgICAgIHBsYW5lLT5iYXNlLm5hbWUsCi0JCSAgICAgIGNydGNfc3RhdGUtPndtLnZsdi5yYXdb VkxWX1dNX0xFVkVMX1BNMl0ucGxhbmVbcGxhbmVfaWRdLAotCQkgICAgICBjcnRjX3N0YXRlLT53 bS52bHYucmF3W1ZMVl9XTV9MRVZFTF9QTTVdLnBsYW5lW3BsYW5lX2lkXSwKLQkJICAgICAgY3J0 Y19zdGF0ZS0+d20udmx2LnJhd1tWTFZfV01fTEVWRUxfRERSX0RWRlNdLnBsYW5lW3BsYW5lX2lk XSk7CitvdXQ6CisJaWYgKGRpcnR5KQorCQlEUk1fREVCVUdfS01TKCIlcyB3bXM6IFswXT0lZCxb MV09JWQsWzJdPSVkXG4iLAorCQkJICAgICAgcGxhbmUtPmJhc2UubmFtZSwKKwkJCSAgICAgIGNy dGNfc3RhdGUtPndtLnZsdi5yYXdbVkxWX1dNX0xFVkVMX1BNMl0ucGxhbmVbcGxhbmVfaWRdLAor CQkJICAgICAgY3J0Y19zdGF0ZS0+d20udmx2LnJhd1tWTFZfV01fTEVWRUxfUE01XS5wbGFuZVtw bGFuZV9pZF0sCisJCQkgICAgICBjcnRjX3N0YXRlLT53bS52bHYucmF3W1ZMVl9XTV9MRVZFTF9E RFJfRFZGU10ucGxhbmVbcGxhbmVfaWRdKTsKKworCXJldHVybiBkaXJ0eTsKIH0KIAogc3RhdGlj IGJvb2wgdmx2X3BsYW5lX3dtX2lzX3ZhbGlkKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjcnRjX3N0YXRlLApAQCAtMTIwOSwxMCArMTIxOSwxMiBAQCBzdGF0aWMgaW50IHZsdl9jb21w dXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCSZjcnRj X3N0YXRlLT53bS52bHYuZmlmb19zdGF0ZTsKIAlpbnQgbnVtX2FjdGl2ZV9wbGFuZXMgPSBod2Vp Z2h0MzIoY3J0Y19zdGF0ZS0+YWN0aXZlX3BsYW5lcyAmCiAJCQkJCSAgfkJJVChQTEFORV9DVVJT T1IpKTsKKwlib29sIG5lZWRzX21vZGVzZXQgPSBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNl dCgmY3J0Y19zdGF0ZS0+YmFzZSk7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9z dGF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lOwogCWVudW0gcGxhbmVfaWQgcGxhbmVf aWQ7CiAJaW50IGxldmVsLCByZXQsIGk7CisJdW5zaWduZWQgaW50IGRpcnR5ID0gMDsKIAogCWZv cl9lYWNoX2ludGVsX3BsYW5lX2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkp IHsKIAkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPQpA QCAtMTIyMiw3ICsxMjM0LDM3IEBAIHN0YXRpYyBpbnQgdmx2X2NvbXB1dGVfcGlwZV93bShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAkJICAgIG9sZF9wbGFuZV9zdGF0ZS0+ YmFzZS5jcnRjICE9ICZjcnRjLT5iYXNlKQogCQkJY29udGludWU7CiAKLQkJdmx2X3BsYW5lX3dt X2NvbXB1dGUoY3J0Y19zdGF0ZSwgcGxhbmVfc3RhdGUpOworCQlpZiAodmx2X3BsYW5lX3dtX2Nv bXB1dGUoY3J0Y19zdGF0ZSwgcGxhbmVfc3RhdGUpKQorCQkJZGlydHkgfD0gQklUKHBsYW5lLT5p ZCk7CisJfQorCisJLyoKKwkgKiBEU1BBUkIgcmVnaXN0ZXJzIG1heSBoYXZlIGJlZW4gcmVzZXQg ZHVlIHRvIHRoZQorCSAqIHBvd2VyIHdlbGwgYmVpbmcgdHVybmVkIG9mZi4gTWFrZSBzdXJlIHdl IHJlc3RvcmUKKwkgKiB0aGVtIHRvIGEgY29uc2lzdGVudCBzdGF0ZSBldmVuIGlmIG5vIHByaW1h cnkvc3ByaXRlCisJICogcGxhbmVzIGFyZSBpbml0aWFsbHkgYWN0aXZlLgorCSAqLworCWlmIChu ZWVkc19tb2Rlc2V0KQorCQljcnRjX3N0YXRlLT5maWZvX2NoYW5nZWQgPSB0cnVlOworCisJaWYg KCFkaXJ0eSkKKwkJcmV0dXJuIDA7CisKKwkvKiBjdXJzb3IgY2hhbmdlcyBkb24ndCB3YXJyYW50 IGEgRklGTyByZWNvbXB1dGUgKi8KKwlpZiAoZGlydHkgJiB+QklUKFBMQU5FX0NVUlNPUikpIHsK KwkJY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlID0KKwkJCXRv X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CisJCWNvbnN0IHN0cnVjdCB2bHZf Zmlmb19zdGF0ZSAqb2xkX2ZpZm9fc3RhdGUgPQorCQkJJm9sZF9jcnRjX3N0YXRlLT53bS52bHYu Zmlmb19zdGF0ZTsKKworCQlyZXQgPSB2bHZfY29tcHV0ZV9maWZvKGNydGNfc3RhdGUpOworCQlp ZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKworCQlpZiAobmVlZHNfbW9kZXNldCB8fAorCQkgICAg bWVtY21wKG9sZF9maWZvX3N0YXRlLCBmaWZvX3N0YXRlLAorCQkJICAgc2l6ZW9mKCpmaWZvX3N0 YXRlKSkgIT0gMCkKKwkJCWNydGNfc3RhdGUtPmZpZm9fY2hhbmdlZCA9IHRydWU7CiAJfQogCiAJ LyogaW5pdGlhbGx5IGFsbG93IGFsbCBsZXZlbHMgKi8KQEAgLTEyMzUsMTAgKzEyNzcsNiBAQCBz dGF0aWMgaW50IHZsdl9jb21wdXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNy dGNfc3RhdGUpCiAJd21fc3RhdGUtPmN4c3IgPSBjcnRjLT5waXBlICE9IFBJUEVfQyAmJgogCQlj cnRjLT53bS5jeHNyX2FsbG93ZWQgJiYgbnVtX2FjdGl2ZV9wbGFuZXMgPT0gMTsKIAotCXJldCA9 IHZsdl9jb21wdXRlX2ZpZm8oY3J0Y19zdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsK LQogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IHdtX3N0YXRlLT5udW1fbGV2ZWxzOyBsZXZlbCsr KSB7CiAJCWNvbnN0IHN0cnVjdCB2bHZfcGlwZV93bSAqcmF3ID0gJmNydGNfc3RhdGUtPndtLnZs di5yYXdbbGV2ZWxdOwogCQljb25zdCBpbnQgc3JfZmlmb19zaXplID0gSU5URUxfSU5GTyhkZXZf cHJpdiktPm51bV9waXBlcyAqIDUxMiAtIDE7CkBAIC0xMjg3LDYgKzEzMjUsOSBAQCBzdGF0aWMg dm9pZCB2bHZfYXRvbWljX3VwZGF0ZV9maWZvKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0 YXRlLAogCQkmY3J0Y19zdGF0ZS0+d20udmx2LmZpZm9fc3RhdGU7CiAJaW50IHNwcml0ZTBfc3Rh cnQsIHNwcml0ZTFfc3RhcnQsIGZpZm9fc2l6ZTsKIAorCWlmICghY3J0Y19zdGF0ZS0+Zmlmb19j aGFuZ2VkKQorCQlyZXR1cm47CisKIAlzcHJpdGUwX3N0YXJ0ID0gZmlmb19zdGF0ZS0+cGxhbmVb UExBTkVfUFJJTUFSWV07CiAJc3ByaXRlMV9zdGFydCA9IGZpZm9fc3RhdGUtPnBsYW5lW1BMQU5F X1NQUklURTBdICsgc3ByaXRlMF9zdGFydDsKIAlmaWZvX3NpemUgPSBmaWZvX3N0YXRlLT5wbGFu ZVtQTEFORV9TUFJJVEUxXSArIHNwcml0ZTFfc3RhcnQ7CkBAIC00NjMwLDYgKzQ2NzEsOCBAQCB2 b2lkIHZsdl93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJYWN0aXZl LT5udW1fbGV2ZWxzID0gd20tPmxldmVsICsgMTsKIAkJYWN0aXZlLT5jeHNyID0gd20tPmN4c3I7 CiAKKwkJdmx2X2dldF9maWZvX3NpemUoY3J0Y19zdGF0ZSk7CisKIAkJLyogRklYTUUgc2FuaXRp emUgdGhpbmdzIG1vcmUgKi8KIAkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgYWN0aXZlLT5udW1f bGV2ZWxzOyBsZXZlbCsrKSB7CiAJCQlzdHJ1Y3Qgdmx2X3BpcGVfd20gKnJhdyA9Ci0tIAoyLjEw LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=