From: Ville Syrjala Subject: [PATCH 2/2] drm/i915: Configure SKL+ scaler initial phase correctly Date: Mon, 21 May 2018 21:56:13 +0300 Message-ID: <20180521185613.5097-2-ville.syrjala@linux.intel.com> References: <20180521185613.5097-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 9F0716EDA0 for ; Mon, 21 May 2018 18:56:20 +0000 (UTC) In-Reply-To: <20180521185613.5097-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNl dCB1cCB0aGUgU0tMKyBzY2FsZXIgaW5pdGlhbCBwaGFzZSByZWdpc3RlcnMgY29ycmVjdGx5LiBP dGhlcndpc2UKd2Ugc3RhcnQgZmV0Y2hpbmcgdGhlIGRhdGEgZnJvbSB0aGUgY2VudGVyIG9mIHRo ZSBmaXJzdCBwaXhlbCBpbnN0ZWFkCm9mIHRoZSB0b3AtbGVmdCBjb3JuZXIsIHdoaWNoIG9idmlv dXNseSB0aGVuIGxlYWRzIHRvIHJpZ2h0L2JvdHRvbSBlZGdlcwpyZXBsaWNhdGluZyBkYXRhIGV4 Y2Vzc2l2ZWx5IGFzIHRoZSBkYXRhIHJ1bnMgb3V0IGhhbGYgYSBwaXhlbCB0b28gc29vbi4KCkNj OiBWaWR5YSBTcmluaXZhcyA8dmlkeWEuc3Jpbml2YXNAaW50ZWwuY29tPgpDYzogTWFhcnRlbiBM YW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgfCAgNCArKysrCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA0MSArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICAxICsK IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICB8IDI2ICsrKysrKysrKysrKysr KysrKysrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDcwIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMTk2YTBlYjc5MjcyLi4wOTQ1Mjc0MDNl ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNjc3NCw2ICs2Nzc0LDEwIEBAIGVudW0g ewogI2RlZmluZSBfUFNfVlBIQVNFXzFCICAgICAgIDB4Njg5ODgKICNkZWZpbmUgX1BTX1ZQSEFT RV8yQiAgICAgICAweDY4QTg4CiAjZGVmaW5lIF9QU19WUEhBU0VfMUMgICAgICAgMHg2OTE4OAor I2RlZmluZSAgUFNfWV9QSEFTRSh4KQkJKCh4KSA8PCAxNikKKyNkZWZpbmUgIFBTX1VWX1JHQl9Q SEFTRSh4KQkoKHgpIDw8IDApCisjZGVmaW5lICAgUFNfUEhBU0VfTUFTSwkoMHg3ZmZmIDw8IDEp IC8qIHUyLjEzICovCisjZGVmaW5lICAgUFNfUEhBU0VfVFJJUAkoMSA8PCAwKQogCiAjZGVmaW5l IF9QU19IUEhBU0VfMUEgICAgICAgMHg2ODE5NAogI2RlZmluZSBfUFNfSFBIQVNFXzJBICAgICAg IDB4NjgyOTQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA0MmMxZjRhNTY1 NTYuLjA3MTg1NjQ0YTg4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAt NDcyOSw2ICs0NzI5LDM5IEBAIHN0YXRpYyB2b2lkIGNwdF92ZXJpZnlfbW9kZXNldChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSkKIAl9CiB9CiAKKy8qCisgKiBUaGUgaGFyZHdhcmUg cGhhc2UgMC4wIHJlZmVycyB0byB0aGUgY2VudGVyIG9mIHRoZSBwaXhlbC4KKyAqIFdlIHdhbnQg dG8gc3RhcnQgZnJvbSB0aGUgdG9wL2xlZnQgZWRnZSB3aGljaCBpcyBwaGFzZQorICogLTAuNS4g VGhhdCBtYXRjaGVzIGhvdyB0aGUgaGFyZHdhcmUgY2FsY3VsYXRlcyB0aGUgc2NhbGluZworICog ZmFjdG9ycyAoZnJvbSB0b3AtbGVmdCBvZiB0aGUgZmlyc3QgcGl4ZWwgdG8gYm90dG9tLXJpZ2h0 CisgKiBvZiB0aGUgbGFzdCBwaXhlbCwgYXMgb3Bwb3NlZCB0byB0aGUgcGl4ZWwgY2VudGVycyku CisgKgorICogRm9yIDQ6MjowIHN1YnNhbXBsZWQgY2hyb21hIHBsYW5lcyB3ZSBvYnZpb3VzbHkg aGF2ZSB0bworICogYWRqdXN0IHRoYXQgc28gdGhhdCB0aGUgY2hyb21hIHNhbXBsZSBwb3NpdGlv biBsYW5kcyBpbgorICogdGhlIHJpZ2h0IHNwb3QuCisgKgorICogTm90ZSB0aGF0IGZvciBwYWNr ZWQgWUNiQ3IgNDoyOjIgZm9ybWF0cyB0aGVyZSBpcyBubyB3YXkgdG8KKyAqIGNvbnRyb2wgY2hy b21hIHNpdGluZy4gVGhlIGhhcmR3YXJlIHNpbXBseSByZXBsaWNhdGVzIHRoZQorICogY2hyb21h IHNhbXBsZXMgZm9yIGJvdGggb2YgdGhlIGx1bWEgc2FtcGxlcywgYW5kIHRodXMgd2UgZG9uJ3QK KyAqIGFjdHVhbGx5IGdldCB0aGUgZXhwZWN0ZWQgTVBFRzIgY2hyb21hIHNpdGluZyBjb252ZW50 aW9uIDooCisgKiBUaGUgc2FtZSBiZWhhdmlvdXIgaXMgb2JzZXJ2ZWQgb24gcHJlLVNLTCBwbGF0 Zm9ybXMgYXMgd2VsbC4KKyAqLwordTE2IHNrbF9zY2FsZXJfY2FsY19waGFzZShpbnQgc3ViLCBi b29sIGNocm9tYV9jb3NpdGVkKQoreworCWludCBwaGFzZSA9IC0weDgwMDA7CisJdTE2IHRyaXAg PSAwOworCisJaWYgKGNocm9tYV9jb3NpdGVkKQorCQlwaGFzZSArPSAoc3ViIC0gMSkgKiAweDgw MDAgLyBzdWI7CisKKwlpZiAocGhhc2UgPCAwKQorCQlwaGFzZSA9IDB4MTAwMDAgKyBwaGFzZTsK KwllbHNlCisJCXRyaXAgPSBQU19QSEFTRV9UUklQOworCisJcmV0dXJuICgocGhhc2UgPj4gMikg JiBQU19QSEFTRV9NQVNLKSB8IHRyaXA7Cit9CisKIHN0YXRpYyBpbnQKIHNrbF91cGRhdGVfc2Nh bGVyKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLCBib29sIGZvcmNlX2RldGFj aCwKIAkJICB1bnNpZ25lZCBpbnQgc2NhbGVyX3VzZXIsIGludCAqc2NhbGVyX2lkLApAQCAtNDky OCwxNCArNDk2MSwyMiBAQCBzdGF0aWMgdm9pZCBza3lsYWtlX3BmaXRfZW5hYmxlKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjKQogCQkmY3J0Yy0+Y29uZmlnLT5zY2FsZXJfc3RhdGU7CiAKIAlpZiAo Y3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5lbmFibGVkKSB7CisJCXUxNiB1dl9yZ2JfaHBoYXNlLCB1 dl9yZ2JfdnBoYXNlOwogCQlpbnQgaWQ7CiAKIAkJaWYgKFdBUk5fT04oY3J0Yy0+Y29uZmlnLT5z Y2FsZXJfc3RhdGUuc2NhbGVyX2lkIDwgMCkpCiAJCQlyZXR1cm47CiAKKwkJdXZfcmdiX2hwaGFz ZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgxLCBmYWxzZSk7CisJCXV2X3JnYl92cGhhc2UgPSBz a2xfc2NhbGVyX2NhbGNfcGhhc2UoMSwgZmFsc2UpOworCiAJCWlkID0gc2NhbGVyX3N0YXRlLT5z Y2FsZXJfaWQ7CiAJCUk5MTVfV1JJVEUoU0tMX1BTX0NUUkwocGlwZSwgaWQpLCBQU19TQ0FMRVJf RU4gfAogCQkJUFNfRklMVEVSX01FRElVTSB8IHNjYWxlcl9zdGF0ZS0+c2NhbGVyc1tpZF0ubW9k ZSk7CisJCUk5MTVfV1JJVEVfRlcoU0tMX1BTX1ZQSEFTRShwaXBlLCBpZCksCisJCQkgICAgICBQ U19ZX1BIQVNFKDApIHwgUFNfVVZfUkdCX1BIQVNFKHV2X3JnYl92cGhhc2UpKTsKKwkJSTkxNV9X UklURV9GVyhTS0xfUFNfSFBIQVNFKHBpcGUsIGlkKSwKKwkJCSAgICAgIFBTX1lfUEhBU0UoMCkg fCBQU19VVl9SR0JfUEhBU0UodXZfcmdiX2hwaGFzZSkpOwogCQlJOTE1X1dSSVRFKFNLTF9QU19X SU5fUE9TKHBpcGUsIGlkKSwgY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5wb3MpOwogCQlJOTE1X1dS SVRFKFNLTF9QU19XSU5fU1oocGlwZSwgaWQpLCBjcnRjLT5jb25maWctPnBjaF9wZml0LnNpemUp OwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNDJhNTliN2ZkNzM2Li4wZjFkYmZj Zjg1MzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xNjIxLDYgKzE2MjEsNyBAQCB2 b2lkIGludGVsX21vZGVfZnJvbV9waXBlX2NvbmZpZyhzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq bW9kZSwKIHZvaWQgaW50ZWxfY3J0Y19hcm1fZmlmb191bmRlcnJ1bihzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YywKIAkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKTsKIAor dTE2IHNrbF9zY2FsZXJfY2FsY19waGFzZShpbnQgc3ViLCBib29sIGNocm9tYV9jZW50ZXIpOwog aW50IHNrbF91cGRhdGVfc2NhbGVyX2NydGMoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpOwogaW50IHNrbF9tYXhfc2NhbGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsIHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgIHVpbnQzMl90IHBpeGVsX2Zvcm1h dCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDIxNGNjNzMwNjQyYy4uNTg1 MjI0NDEyNTNkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjg0LDEzICsy ODQsMzUgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCS8q IHByb2dyYW0gcGxhbmUgc2NhbGVyICovCiAJaWYgKHBsYW5lX3N0YXRlLT5zY2FsZXJfaWQgPj0g MCkgewogCQlpbnQgc2NhbGVyX2lkID0gcGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKLQkJY29uc3Qg c3RydWN0IGludGVsX3NjYWxlciAqc2NhbGVyOworCQljb25zdCBzdHJ1Y3QgaW50ZWxfc2NhbGVy ICpzY2FsZXIgPQorCQkJJmNydGNfc3RhdGUtPnNjYWxlcl9zdGF0ZS5zY2FsZXJzW3NjYWxlcl9p ZF07CisJCXUxNiB5X2hwaGFzZSwgdXZfcmdiX2hwaGFzZTsKKwkJdTE2IHlfdnBoYXNlLCB1dl9y Z2JfdnBoYXNlOworCisJCS8qIFRPRE86IGhhbmRsZSBzdWItcGl4ZWwgY29vcmRpbmF0ZXMgKi8K KwkJaWYgKGZiLT5mb3JtYXQtPmZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKKwkJCXlfaHBo YXNlID0gc2tsX3NjYWxlcl9jYWxjX3BoYXNlKDEsIGZhbHNlKTsKKwkJCXlfdnBoYXNlID0gc2ts X3NjYWxlcl9jYWxjX3BoYXNlKDEsIGZhbHNlKTsKKworCQkJLyogTVBFRzIgY2hyb21hIHNpdGlu ZyBjb252ZW50aW9uICovCisJCQl1dl9yZ2JfaHBoYXNlID0gc2tsX3NjYWxlcl9jYWxjX3BoYXNl KDIsIHRydWUpOworCQkJdXZfcmdiX3ZwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgyLCBm YWxzZSk7CisJCX0gZWxzZSB7CisJCQkvKiBub3QgdXNlZCAqLworCQkJeV9ocGhhc2UgPSAwOwor CQkJeV92cGhhc2UgPSAwOwogCi0JCXNjYWxlciA9ICZjcnRjX3N0YXRlLT5zY2FsZXJfc3RhdGUu c2NhbGVyc1tzY2FsZXJfaWRdOworCQkJdXZfcmdiX2hwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19w aGFzZSgxLCBmYWxzZSk7CisJCQl1dl9yZ2JfdnBoYXNlID0gc2tsX3NjYWxlcl9jYWxjX3BoYXNl KDEsIGZhbHNlKTsKKwkJfQogCiAJCUk5MTVfV1JJVEVfRlcoU0tMX1BTX0NUUkwocGlwZSwgc2Nh bGVyX2lkKSwKIAkJCSAgICAgIFBTX1NDQUxFUl9FTiB8IFBTX1BMQU5FX1NFTChwbGFuZV9pZCkg fCBzY2FsZXItPm1vZGUpOwogCQlJOTE1X1dSSVRFX0ZXKFNLTF9QU19QV1JfR0FURShwaXBlLCBz Y2FsZXJfaWQpLCAwKTsKKwkJSTkxNV9XUklURV9GVyhTS0xfUFNfVlBIQVNFKHBpcGUsIHNjYWxl cl9pZCksCisJCQkgICAgICBQU19ZX1BIQVNFKHlfdnBoYXNlKSB8IFBTX1VWX1JHQl9QSEFTRSh1 dl9yZ2JfdnBoYXNlKSk7CisJCUk5MTVfV1JJVEVfRlcoU0tMX1BTX0hQSEFTRShwaXBlLCBzY2Fs ZXJfaWQpLAorCQkJICAgICAgUFNfWV9QSEFTRSh5X2hwaGFzZSkgfCBQU19VVl9SR0JfUEhBU0Uo dXZfcmdiX2hwaGFzZSkpOwogCQlJOTE1X1dSSVRFX0ZXKFNLTF9QU19XSU5fUE9TKHBpcGUsIHNj YWxlcl9pZCksIChjcnRjX3ggPDwgMTYpIHwgY3J0Y195KTsKIAkJSTkxNV9XUklURV9GVyhTS0xf UFNfV0lOX1NaKHBpcGUsIHNjYWxlcl9pZCksCiAJCQkgICAgICAoKGNydGNfdyArIDEpIDw8IDE2 KXwoY3J0Y19oICsgMSkpOwotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK