From: ville.syrjala@linux.intel.com Subject: [PATCH fixes 2/2] drm/i915: Fix SKL+ watermarks for 90/270 rotation Date: Thu, 8 Jun 2017 17:40:02 +0300 Message-ID: <20170608144002.1605-2-ville.syrjala@linux.intel.com> References: <87d1afhpy4.fsf@intel.com> <20170608144002.1605-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 BBF226E3F7 for ; Thu, 8 Jun 2017 14:40:10 +0000 (UTC) In-Reply-To: <20170608144002.1605-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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCnNr bF9jaGVja19wbGFuZV9zdXJmYWNlKCkgYWxyZWFkeSByb3RhdGVzIHRoZSBjbGlwcGVkIHBsYW5l IHNvdXJjZQpjb29yZGluYXRlcyB0byBtYXRjaCB0aGUgc2Nhbm91dCBkaXJlY3Rpb24gYmVjYXVz ZSB0aGF0J3MgdGhlIHdheQp0aGUgR1RUIG1hcHBpbmcgaXMgc2V0IHVwLiBUaHVzIHdlIG5vIGxv bmdlciBuZWVkIHRvIHJvdGF0ZSB0aGUKY29vcmRpbmF0ZXMgaW4gdGhlIHdhdGVybWFyayBjb2Rl LgoKRm9yIGN1cnNvcnMgd2UgdXNlIHRoZSBub24tY2xpcHBlZCBjb29yZGluYXRlcyB3aGljaCBh cmUgbm90IHJvdGF0ZWQKYXBwcm9wcmlhdGVseSwgYnV0IHRoYXQgZG9lc24ndCBhY3R1YWxseSBt YXR0ZXIgc2luY2UgY3Vyc29ycyBkb24ndApldmVuIHN1cHBvcnQgOTAvMjcwIGRlZ3JlZSByb3Rh dGlvbi4KCnYyOiBSZXNvbHZlIGNvbmZsaWN0cyBmcm9tIFNLTCsgd20gcmV3b3JrCgpDYzogc3Rh YmxlQHZnZXIua2VybmVsLm9yZwpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGlu dGVsLmNvbT4KRml4ZXM6IGI2M2ExNmY2Y2Q4OSAoImRybS9pOTE1OiBDb21wdXRlIGRpc3BsYXkg c3VyZmFjZSBvZmZzZXQgaW4gdGhlIHBsYW5lIGNoZWNrIGhvb2sgZm9yIFNLTCsiKQpTaWduZWQt b2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgpM aW5rOiBodHRwOi8vcGF0Y2h3b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE3MDMz MTE4MDA1Ni4xNDA4Ni0zLXZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tClRlc3RlZC1ieTog VHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IE1h YXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CihjaGVy cnkgcGlja2VkIGZyb20gY29tbWl0IGZjZTVhZGY1NjhhYmIxZTgyNjRkNjc3MTU2ZTJlMGRlYjUy OTE5NGQpCi0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDM2ICsrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlv bnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDU3MGJk NjAzZjQwMS4uNmIxY2FmOWVkM2NhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTMzNzMs MjAgKzMzNzMsMjYgQEAgc2tsX3BsYW5lX2Rvd25zY2FsZV9hbW91bnQoY29uc3Qgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAogCS8qIG4uYi4sIHNyYyBpcyAxNi4xNiBmaXhlZCBw b2ludCwgZHN0IGlzIHdob2xlIGludGVnZXIgKi8KIAlpZiAocGxhbmUtPmlkID09IFBMQU5FX0NV UlNPUikgeworCQkvKgorCQkgKiBDdXJzb3JzIG9ubHkgc3VwcG9ydCAwLzE4MCBkZWdyZWUgcm90 YXRpb24sCisJCSAqIGhlbmNlIG5vIG5lZWQgdG8gYWNjb3VudCBmb3Igcm90YXRpb24gaGVyZS4K KwkJICovCiAJCXNyY193ID0gcHN0YXRlLT5iYXNlLnNyY193OwogCQlzcmNfaCA9IHBzdGF0ZS0+ YmFzZS5zcmNfaDsKIAkJZHN0X3cgPSBwc3RhdGUtPmJhc2UuY3J0Y193OwogCQlkc3RfaCA9IHBz dGF0ZS0+YmFzZS5jcnRjX2g7CiAJfSBlbHNlIHsKKwkJLyoKKwkJICogU3JjIGNvb3JkaW5hdGVz IGFyZSBhbHJlYWR5IHJvdGF0ZWQgYnkgMjcwIGRlZ3JlZXMgZm9yCisJCSAqIHRoZSA5MC8yNzAg ZGVncmVlIHBsYW5lIHJvdGF0aW9uIGNhc2VzICh0byBtYXRjaCB0aGUKKwkJICogR1RUIG1hcHBp bmcpLCBoZW5jZSBubyBuZWVkIHRvIGFjY291bnQgZm9yIHJvdGF0aW9uIGhlcmUuCisJCSAqLwog CQlzcmNfdyA9IGRybV9yZWN0X3dpZHRoKCZwc3RhdGUtPmJhc2Uuc3JjKTsKIAkJc3JjX2ggPSBk cm1fcmVjdF9oZWlnaHQoJnBzdGF0ZS0+YmFzZS5zcmMpOwogCQlkc3RfdyA9IGRybV9yZWN0X3dp ZHRoKCZwc3RhdGUtPmJhc2UuZHN0KTsKIAkJZHN0X2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBzdGF0 ZS0+YmFzZS5kc3QpOwogCX0KIAotCWlmIChkcm1fcm90YXRpb25fOTBfb3JfMjcwKHBzdGF0ZS0+ YmFzZS5yb3RhdGlvbikpCi0JCXN3YXAoZHN0X3csIGRzdF9oKTsKLQogCWRvd25zY2FsZV9oID0g bWF4KHNyY19oIC8gZHN0X2gsICh1aW50MzJfdClEUk1fUExBTkVfSEVMUEVSX05PX1NDQUxJTkcp OwogCWRvd25zY2FsZV93ID0gbWF4KHNyY193IC8gZHN0X3csICh1aW50MzJfdClEUk1fUExBTkVf SEVMUEVSX05PX1NDQUxJTkcpOwogCkBAIC0zNDE3LDEyICszNDIzLDE0IEBAIHNrbF9wbGFuZV9y ZWxhdGl2ZV9kYXRhX3JhdGUoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwK IAlpZiAoeSAmJiBmb3JtYXQgIT0gRFJNX0ZPUk1BVF9OVjEyKQogCQlyZXR1cm4gMDsKIAorCS8q CisJICogU3JjIGNvb3JkaW5hdGVzIGFyZSBhbHJlYWR5IHJvdGF0ZWQgYnkgMjcwIGRlZ3JlZXMg Zm9yCisJICogdGhlIDkwLzI3MCBkZWdyZWUgcGxhbmUgcm90YXRpb24gY2FzZXMgKHRvIG1hdGNo IHRoZQorCSAqIEdUVCBtYXBwaW5nKSwgaGVuY2Ugbm8gbmVlZCB0byBhY2NvdW50IGZvciByb3Rh dGlvbiBoZXJlLgorCSAqLwogCXdpZHRoID0gZHJtX3JlY3Rfd2lkdGgoJmludGVsX3BzdGF0ZS0+ YmFzZS5zcmMpID4+IDE2OwogCWhlaWdodCA9IGRybV9yZWN0X2hlaWdodCgmaW50ZWxfcHN0YXRl LT5iYXNlLnNyYykgPj4gMTY7CiAKLQlpZiAoZHJtX3JvdGF0aW9uXzkwX29yXzI3MChwc3RhdGUt PnJvdGF0aW9uKSkKLQkJc3dhcCh3aWR0aCwgaGVpZ2h0KTsKLQogCS8qIGZvciBwbGFuYXIgZm9y bWF0ICovCiAJaWYgKGZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKIAkJaWYgKHkpICAvKiB5 LXBsYW5lIGRhdGEgcmF0ZSAqLwpAQCAtMzUwNSwxMiArMzUxMywxNCBAQCBza2xfZGRiX21pbl9h bGxvYyhjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUsCiAJICAgIGZiLT5tb2Rp ZmllciAhPSBJOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQpCiAJCXJldHVybiA4OwogCisJLyoKKwkg KiBTcmMgY29vcmRpbmF0ZXMgYXJlIGFscmVhZHkgcm90YXRlZCBieSAyNzAgZGVncmVlcyBmb3IK KwkgKiB0aGUgOTAvMjcwIGRlZ3JlZSBwbGFuZSByb3RhdGlvbiBjYXNlcyAodG8gbWF0Y2ggdGhl CisJICogR1RUIG1hcHBpbmcpLCBoZW5jZSBubyBuZWVkIHRvIGFjY291bnQgZm9yIHJvdGF0aW9u IGhlcmUuCisJICovCiAJc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmaW50ZWxfcHN0YXRlLT5iYXNl LnNyYykgPj4gMTY7CiAJc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJmludGVsX3BzdGF0ZS0+YmFz ZS5zcmMpID4+IDE2OwogCi0JaWYgKGRybV9yb3RhdGlvbl85MF9vcl8yNzAocHN0YXRlLT5yb3Rh dGlvbikpCi0JCXN3YXAoc3JjX3csIHNyY19oKTsKLQogCS8qIEhhbHZlIFVWIHBsYW5lIHdpZHRo IGFuZCBoZWlnaHQgZm9yIE5WMTIgKi8KIAlpZiAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9G T1JNQVRfTlYxMiAmJiAheSkgewogCQlzcmNfdyAvPSAyOwpAQCAtMzc5NCwxMyArMzgwNCwxNSBA QCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAkJd2lkdGggPSBpbnRlbF9wc3RhdGUtPmJhc2UuY3J0Y193Owog CQloZWlnaHQgPSBpbnRlbF9wc3RhdGUtPmJhc2UuY3J0Y19oOwogCX0gZWxzZSB7CisJCS8qCisJ CSAqIFNyYyBjb29yZGluYXRlcyBhcmUgYWxyZWFkeSByb3RhdGVkIGJ5IDI3MCBkZWdyZWVzIGZv cgorCQkgKiB0aGUgOTAvMjcwIGRlZ3JlZSBwbGFuZSByb3RhdGlvbiBjYXNlcyAodG8gbWF0Y2gg dGhlCisJCSAqIEdUVCBtYXBwaW5nKSwgaGVuY2Ugbm8gbmVlZCB0byBhY2NvdW50IGZvciByb3Rh dGlvbiBoZXJlLgorCQkgKi8KIAkJd2lkdGggPSBkcm1fcmVjdF93aWR0aCgmaW50ZWxfcHN0YXRl LT5iYXNlLnNyYykgPj4gMTY7CiAJCWhlaWdodCA9IGRybV9yZWN0X2hlaWdodCgmaW50ZWxfcHN0 YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJfQogCi0JaWYgKGRybV9yb3RhdGlvbl85MF9vcl8yNzAo cHN0YXRlLT5yb3RhdGlvbikpCi0JCXN3YXAod2lkdGgsIGhlaWdodCk7Ci0KIAljcHAgPSBmYi0+ Zm9ybWF0LT5jcHBbMF07CiAJcGxhbmVfcGl4ZWxfcmF0ZSA9IHNrbF9hZGp1c3RlZF9wbGFuZV9w aXhlbF9yYXRlKGNzdGF0ZSwgaW50ZWxfcHN0YXRlKTsKIAotLSAKMi4xMy4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK