From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 08/18] drm/i915: Skip useless watermark/FIFO related work on VLV/CHV when not needed Date: Thu, 16 Feb 2017 20:07:41 +0200 Message-ID: <20170216180751.3097-9-ville.syrjala@linux.intel.com> References: <20170216180751.3097-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C13516EC04 for ; Thu, 16 Feb 2017 18:08:19 +0000 (UTC) In-Reply-To: <20170216180751.3097-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 cyBvbgp0aGUgcGlwZSBhcyB3ZWxsLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2 aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9hdG9taWMuYyB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAg IHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgfCA3MyArKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYwIGluc2Vy dGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMK aW5kZXggYWE5MTYwZTdmMWQ4Li5jNWQ2MmFhMjRkNGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pYy5jCkBAIC05OSw2ICs5OSw3IEBAIGludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIAljcnRjX3N0YXRlLT51cGRhdGVfd21fcHJlID0gZmFsc2U7 CiAJY3J0Y19zdGF0ZS0+dXBkYXRlX3dtX3Bvc3QgPSBmYWxzZTsKIAljcnRjX3N0YXRlLT5mYl9j aGFuZ2VkID0gZmFsc2U7CisJY3J0Y19zdGF0ZS0+Zmlmb19jaGFuZ2VkID0gZmFsc2U7CiAJY3J0 Y19zdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IGZhbHNlOwogCWNydGNfc3RhdGUtPmZi X2JpdHMgPSAwOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDlkYjI1NDhjY2Y2Yy4u ZDdiOWRkZjIyYjNlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTY4LDYgKzU2OCw3 IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAlib29sIGRpc2FibGVfY3hzcjsKIAlib29s IHVwZGF0ZV93bV9wcmUsIHVwZGF0ZV93bV9wb3N0OyAvKiB3YXRlcm1hcmtzIGFyZSB1cGRhdGVk ICovCiAJYm9vbCBmYl9jaGFuZ2VkOyAvKiBmYiBvbiBhbnkgb2YgdGhlIHBsYW5lcyBpcyBjaGFu Z2VkICovCisJYm9vbCBmaWZvX2NoYW5nZWQ7IC8qIEZJRk8gc3BsaXQgaXMgY2hhbmdlZCAqLwog CiAJLyogUGlwZSBzb3VyY2Ugc2l6ZSAoaWUuIHBhbmVsIGZpdHRlciBpbnB1dCBzaXplKQogCSAq IEFsbCBwbGFuZXMgd2lsbCBiZSBwb3NpdGlvbmVkIGluc2lkZSB0aGlzIHNwYWNlLApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKaW5kZXggY2I0MGU1ODI2YTcxLi42ZWNhZDlmOTQ5YzcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwpAQCAtMTExNSwzMSArMTExNSwzNiBAQCBzdGF0aWMgdTE2IHZsdl9p bnZlcnRfd21fdmFsdWUodTE2IHdtLCB1MTYgZmlmb19zaXplKQogfQogCiAvKiBzdGFydGluZyBm cm9tICdsZXZlbCcgc2V0IGFsbCBoaWdoZXIgbGV2ZWxzIHRvICd2YWx1ZScgKi8KLXN0YXRpYyB2 b2lkIHZsdl9wbGFuZV93bV9zZXQoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs CitzdGF0aWMgYm9vbCB2bHZfcGxhbmVfd21fc2V0KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlLAogCQkJICAgICBpbnQgbGV2ZWwsIGVudW0gcGxhbmVfaWQgcGxhbmVfaWQsIHUx NiB2YWx1ZSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGNydGNfc3RhdGUtPmJhc2UuY3J0Yy0+ZGV2KTsKIAlpbnQgbnVtX2xldmVscyA9IHZsdl9udW1f d21fbGV2ZWxzKGRldl9wcml2KTsKKwlib29sIGRpcnR5ID0gZmFsc2U7CiAKIAlmb3IgKDsgbGV2 ZWwgPCBudW1fbGV2ZWxzOyBsZXZlbCsrKSB7CiAJCXN0cnVjdCB2bHZfcGlwZV93bSAqbm9uaW52 ZXJ0ZWQgPQogCQkJJmNydGNfc3RhdGUtPndtLnZsdi5ub25pbnZlcnRlZFtsZXZlbF07CiAKKwkJ ZGlydHkgfD0gbm9uaW52ZXJ0ZWQtPnBsYW5lW3BsYW5lX2lkXSAhPSB2YWx1ZTsKIAkJbm9uaW52 ZXJ0ZWQtPnBsYW5lW3BsYW5lX2lkXSA9IHZhbHVlOwogCX0KKworCXJldHVybiBkaXJ0eTsKIH0K IAotc3RhdGljIHZvaWQgdmx2X3BsYW5lX3dtX2NvbXB1dGUoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmNydGNfc3RhdGUsCitzdGF0aWMgYm9vbCB2bHZfcGxhbmVfd21fY29tcHV0ZShzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkgY29uc3Qgc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0g dG9faW50ZWxfcGxhbmUocGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOwogCWVudW0gcGxhbmVfaWQg cGxhbmVfaWQgPSBwbGFuZS0+aWQ7CiAJaW50IG51bV9sZXZlbHMgPSB2bHZfbnVtX3dtX2xldmVs cyh0b19pOTE1KHBsYW5lLT5iYXNlLmRldikpOwogCWludCBsZXZlbDsKKwlib29sIGRpcnR5ID0g ZmFsc2U7CiAKIAlpZiAoIXBsYW5lX3N0YXRlLT5iYXNlLnZpc2libGUpIHsKLQkJdmx2X3BsYW5l X3dtX3NldChjcnRjX3N0YXRlLCAwLCBwbGFuZV9pZCwgMCk7Ci0JCXJldHVybjsKKwkJZGlydHkg fD0gdmx2X3BsYW5lX3dtX3NldChjcnRjX3N0YXRlLCAwLCBwbGFuZV9pZCwgMCk7CisJCWdvdG8g b3V0OwogCX0KIAogCWZvciAobGV2ZWwgPSAwOyBsZXZlbCA8IG51bV9sZXZlbHM7IGxldmVsKysp IHsKQEAgLTExNTUsMTcgKzExNjAsMjIgQEAgc3RhdGljIHZvaWQgdmx2X3BsYW5lX3dtX2NvbXB1 dGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCWlmICh3bSA+IG1heF93 bSkKIAkJCWJyZWFrOwogCisJCWRpcnR5IHw9IG5vbmludmVydGVkLT5wbGFuZVtwbGFuZV9pZF0g IT0gd207CiAJCW5vbmludmVydGVkLT5wbGFuZVtwbGFuZV9pZF0gPSB3bTsKIAl9CiAKIAkvKiBt YXJrIGFsbCBoaWdoZXIgbGV2ZWxzIGFzIGludmFsaWQgKi8KLQl2bHZfcGxhbmVfd21fc2V0KGNy dGNfc3RhdGUsIGxldmVsLCBwbGFuZV9pZCwgVVNIUlRfTUFYKTsKKwlkaXJ0eSB8PSB2bHZfcGxh bmVfd21fc2V0KGNydGNfc3RhdGUsIGxldmVsLCBwbGFuZV9pZCwgVVNIUlRfTUFYKTsKIAotCURS TV9ERUJVR19LTVMoIiVzIHdtczogWzBdPSVkLFsxXT0lZCxbMl09JWRcbiIsCi0JCSAgICAgIHBs YW5lLT5iYXNlLm5hbWUsCi0JCSAgICAgIGNydGNfc3RhdGUtPndtLnZsdi5ub25pbnZlcnRlZFtW TFZfV01fTEVWRUxfUE0yXS5wbGFuZVtwbGFuZV9pZF0sCi0JCSAgICAgIGNydGNfc3RhdGUtPndt LnZsdi5ub25pbnZlcnRlZFtWTFZfV01fTEVWRUxfUE01XS5wbGFuZVtwbGFuZV9pZF0sCi0JCSAg ICAgIGNydGNfc3RhdGUtPndtLnZsdi5ub25pbnZlcnRlZFtWTFZfV01fTEVWRUxfRERSX0RWRlNd LnBsYW5lW3BsYW5lX2lkXSk7CitvdXQ6CisJaWYgKGRpcnR5KQorCQlEUk1fREVCVUdfS01TKCIl cyB3bXM6IFswXT0lZCxbMV09JWQsWzJdPSVkXG4iLAorCQkJICAgICAgcGxhbmUtPmJhc2UubmFt ZSwKKwkJCSAgICAgIGNydGNfc3RhdGUtPndtLnZsdi5ub25pbnZlcnRlZFtWTFZfV01fTEVWRUxf UE0yXS5wbGFuZVtwbGFuZV9pZF0sCisJCQkgICAgICBjcnRjX3N0YXRlLT53bS52bHYubm9uaW52 ZXJ0ZWRbVkxWX1dNX0xFVkVMX1BNNV0ucGxhbmVbcGxhbmVfaWRdLAorCQkJICAgICAgY3J0Y19z dGF0ZS0+d20udmx2Lm5vbmludmVydGVkW1ZMVl9XTV9MRVZFTF9ERFJfRFZGU10ucGxhbmVbcGxh bmVfaWRdKTsKKworCXJldHVybiBkaXJ0eTsKIH0KIAogc3RhdGljIGJvb2wgdmx2X3BsYW5lX3dt X2lzX3ZhbGlkKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLApAQCAt MTE5OCwxMCArMTIwOCwxMiBAQCBzdGF0aWMgaW50IHZsdl9jb21wdXRlX3BpcGVfd20oc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCSZjcnRjX3N0YXRlLT53bS52bHYuZmlm b19zdGF0ZTsKIAlpbnQgbnVtX2FjdGl2ZV9wbGFuZXMgPSBod2VpZ2h0MzIoY3J0Y19zdGF0ZS0+ YWN0aXZlX3BsYW5lcyAmCiAJCQkJCSAgfkJJVChQTEFORV9DVVJTT1IpKTsKKwlib29sIG5lZWRz X21vZGVzZXQgPSBkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldCgmY3J0Y19zdGF0ZS0+YmFz ZSk7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKIAlzdHJ1Y3QgaW50 ZWxfcGxhbmUgKnBsYW5lOwogCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQ7CiAJaW50IGxldmVsLCBy ZXQsIGk7CisJdW5zaWduZWQgaW50IGRpcnR5ID0gMDsKIAogCWZvcl9lYWNoX2ludGVsX3BsYW5l X2luX3N0YXRlKHN0YXRlLCBwbGFuZSwgcGxhbmVfc3RhdGUsIGkpIHsKIAkJY29uc3Qgc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGUgPQpAQCAtMTIxMSw3ICsxMjIzLDM3 IEBAIHN0YXRpYyBpbnQgdmx2X2NvbXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqY3J0Y19zdGF0ZSkKIAkJICAgIG9sZF9wbGFuZV9zdGF0ZS0+YmFzZS5jcnRjICE9ICZjcnRj LT5iYXNlKQogCQkJY29udGludWU7CiAKLQkJdmx2X3BsYW5lX3dtX2NvbXB1dGUoY3J0Y19zdGF0 ZSwgcGxhbmVfc3RhdGUpOworCQlpZiAodmx2X3BsYW5lX3dtX2NvbXB1dGUoY3J0Y19zdGF0ZSwg cGxhbmVfc3RhdGUpKQorCQkJZGlydHkgfD0gQklUKHBsYW5lLT5pZCk7CisJfQorCisJLyoKKwkg KiBEU1BBUkIgcmVnaXN0ZXJzIG1heSBoYXZlIGJlZW4gcmVzZXQgZHVlIHRvIHRoZQorCSAqIHBv d2VyIHdlbGwgYmVpbmcgdHVybmVkIG9mZi4gTWFrZSBzdXJlIHdlIHJlc3RvcmUKKwkgKiB0aGVt IHRvIGEgY29uc2lzdGVudCBzdGF0ZSBldmVuIGlmIG5vIHByaW1hcnkvc3ByaXRlCisJICogcGxh bmVzIGFyZSBpbml0aWFsbHkgYWN0aXZlLgorCSAqLworCWlmIChuZWVkc19tb2Rlc2V0KQorCQlj cnRjX3N0YXRlLT5maWZvX2NoYW5nZWQgPSB0cnVlOworCisJaWYgKCFkaXJ0eSkKKwkJcmV0dXJu IDA7CisKKwkvKiBjdXJzb3IgY2hhbmdlcyBkb24ndCB3YXJyYW50IGEgRklGTyByZWNvbXB1dGUg Ki8KKwlpZiAoZGlydHkgJiB+QklUKFBMQU5FX0NVUlNPUikpIHsKKwkJY29uc3Qgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlID0KKwkJCXRvX2ludGVsX2NydGNfc3RhdGUo Y3J0Yy0+YmFzZS5zdGF0ZSk7CisJCWNvbnN0IHN0cnVjdCB2bHZfZmlmb19zdGF0ZSAqb2xkX2Zp Zm9fc3RhdGUgPQorCQkJJm9sZF9jcnRjX3N0YXRlLT53bS52bHYuZmlmb19zdGF0ZTsKKworCQly ZXQgPSB2bHZfY29tcHV0ZV9maWZvKGNydGNfc3RhdGUpOworCQlpZiAocmV0KQorCQkJcmV0dXJu IHJldDsKKworCQlpZiAobmVlZHNfbW9kZXNldCB8fAorCQkgICAgbWVtY21wKG9sZF9maWZvX3N0 YXRlLCBmaWZvX3N0YXRlLAorCQkJICAgc2l6ZW9mKCpmaWZvX3N0YXRlKSkgIT0gMCkKKwkJCWNy dGNfc3RhdGUtPmZpZm9fY2hhbmdlZCA9IHRydWU7CiAJfQogCiAJLyogaW5pdGlhbGx5IGFsbG93 IGFsbCBsZXZlbHMgKi8KQEAgLTEyMjQsMTAgKzEyNjYsNiBAQCBzdGF0aWMgaW50IHZsdl9jb21w dXRlX3BpcGVfd20oc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJd21fc3Rh dGUtPmN4c3IgPSBjcnRjLT5waXBlICE9IFBJUEVfQyAmJgogCQljcnRjLT53bS5jeHNyX2FsbG93 ZWQgJiYgbnVtX2FjdGl2ZV9wbGFuZXMgPT0gMTsKIAotCXJldCA9IHZsdl9jb21wdXRlX2ZpZm8o Y3J0Y19zdGF0ZSk7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKLQogCWZvciAobGV2ZWwgPSAw OyBsZXZlbCA8IHdtX3N0YXRlLT5udW1fbGV2ZWxzOyBsZXZlbCsrKSB7CiAJCWNvbnN0IHN0cnVj dCB2bHZfcGlwZV93bSAqbm9uaW52ZXJ0ZWQgPQogCQkJJmNydGNfc3RhdGUtPndtLnZsdi5ub25p bnZlcnRlZFtsZXZlbF07CkBAIC0xMjc3LDYgKzEzMTUsOSBAQCBzdGF0aWMgdm9pZCB2bHZfYXRv bWljX3VwZGF0ZV9maWZvKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQkmY3J0 Y19zdGF0ZS0+d20udmx2LmZpZm9fc3RhdGU7CiAJaW50IHNwcml0ZTBfc3RhcnQsIHNwcml0ZTFf c3RhcnQsIGZpZm9fc2l6ZTsKIAorCWlmICghY3J0Y19zdGF0ZS0+Zmlmb19jaGFuZ2VkKQorCQly ZXR1cm47CisKIAlzcHJpdGUwX3N0YXJ0ID0gZmlmb19zdGF0ZS0+cGxhbmVbUExBTkVfUFJJTUFS WV07CiAJc3ByaXRlMV9zdGFydCA9IGZpZm9fc3RhdGUtPnBsYW5lW1BMQU5FX1NQUklURTBdICsg c3ByaXRlMF9zdGFydDsKIAlmaWZvX3NpemUgPSBmaWZvX3N0YXRlLT5wbGFuZVtQTEFORV9TUFJJ VEUxXSArIHNwcml0ZTFfc3RhcnQ7CkBAIC00NjE2LDYgKzQ2NTcsOCBAQCB2b2lkIHZsdl93bV9n ZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJYWN0aXZlLT5udW1fbGV2ZWxz ID0gd20tPmxldmVsICsgMTsKIAkJYWN0aXZlLT5jeHNyID0gd20tPmN4c3I7CiAKKwkJdmx2X2dl dF9maWZvX3NpemUoY3J0Y19zdGF0ZSk7CisKIAkJLyogRklYTUUgc2FuaXRpemUgdGhpbmdzIG1v cmUgKi8KIAkJZm9yIChsZXZlbCA9IDA7IGxldmVsIDwgYWN0aXZlLT5udW1fbGV2ZWxzOyBsZXZl bCsrKSB7CiAJCQlzdHJ1Y3Qgdmx2X3BpcGVfd20gKm5vbmludmVydGVkID0KLS0gCjIuMTAuMgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==