From: Jani Nikula Subject: [PATCH 2/2] drm/i915/audio: set proper N/M in modeset Date: Tue, 25 Oct 2016 17:54:18 +0300 Message-ID: <1477407258-30599-3-git-send-email-jani.nikula@intel.com> References: <1477407258-30599-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 66B9D6E3BF for ; Tue, 25 Oct 2016 14:54:27 +0000 (UTC) In-Reply-To: <1477407258-30599-1-git-send-email-jani.nikula@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 , "Zhang, Keqiao" , Libin Yang List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTGliaW4gWWFuZyA8bGliaW4ueWFuZ0BsaW51eC5pbnRlbC5jb20+CgpXaGVuIG1vZGVz ZXQgb2NjdXJzIGFuZCB0aGUgTFNfQ0xLIGlzIHNldCB0byBzb21lIHNwZWNpYWwgdmFsdWVzIGlu IERQCm1vZGUsIHRoZSBOL00gbmVlZCB0byBiZSBzZXQgbWFudWFsbHkgaWYgYXVkaW8gaXMgcGxh eWluZy4gT3RoZXJ3aXNlIHRoZQpmaXJzdCBzZXZlcmFsIHNlY29uZHMgbWF5IGJlIHNpbGVudCBp biBhdWRpbyBwbGF5YmFjay4KClRoZSByZWxhdGlvbnNoaXAgb2YgTWF1ZCBhbmQgTmF1ZCBpcyBl eHByZXNzZWQgaW4gdGhlIGZvbGxvd2luZwplcXVhdGlvbjoKCk1hdWQvTmF1ZCA9IDUxMiAqIGZz IC8gZl9MU19DbGsKClBsZWFzZSByZWZlciBWRVNBIERpc3BsYXlQb3J0IFN0YW5kYXJkIHNwZWMg Zm9yIGRldGFpbHMuCgp2MiBieSBKYW5pOgotIG9yZ2FuaXplIE1hdWQvTmF1ZCB0YWJsZSBhY2Nv cmRpbmcgdG8gRFAgMS40IHNwZWMKLSBhZGQgNjRrIGFuZCAxMjhrIGF1ZGlvIHJhdGVzCi0gdXBk YXRlIEhTV19BVURfTV9DVFNfRU5BQkxFIHJlZ2lzdGVyIHdoZW4gTWF1ZCBub3QgZm91bmQKLSBy ZW1vdmUgZXh0cmEgY2hlY2tzIGZvciBwb3J0IGNsb2NrCi0gc2ltcGxpZnkgTWF1ZC9OYXVkIGxv b2t1cAotIHJlc2V0IHBhdGNoIGF1dGhvciBiYWNrIHRvIExpYmluCgpDYzogIlpoYW5nLCBLZXFp YW8iIDxrZXFpYW8uemhhbmdAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5z eXJqYWxhQGxpbnV4LmludGVsLmNvbT4KQ2M6ICJMaW4sIE1lbmdkb25nIiA8bWVuZ2RvbmcubGlu QGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTGliaW4gWWFuZyA8bGliaW4ueWFuZ0BsaW51eC5p bnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgICB8ICA3ICsrKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyB8IDkzICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKystCiAyIGZpbGVzIGNoYW5nZWQsIDk5IGluc2VydGlvbnMoKyksIDEg ZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCBiZGM3YjM1OTFlMWMuLjU0 MmU1NzBiMzU3OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC03MzcwLDYgKzczNzAsMTMg QEAgZW51bSB7CiAjZGVmaW5lIF9IU1dfQVVEX01JU0NfQ1RSTF9CCQkweDY1MTEwCiAjZGVmaW5l IEhTV19BVURfTUlTQ19DVFJMKHBpcGUpCQlfTU1JT19QSVBFKHBpcGUsIF9IU1dfQVVEX01JU0Nf Q1RSTF9BLCBfSFNXX0FVRF9NSVNDX0NUUkxfQikKIAorI2RlZmluZSBfSFNXX0FVRF9NX0NUU19F TkFCTEVfQQkJMHg2NTAyOAorI2RlZmluZSBfSFNXX0FVRF9NX0NUU19FTkFCTEVfQgkJMHg2NTEy OAorI2RlZmluZSBIU1dfQVVEX01fQ1RTX0VOQUJMRShwaXBlKQlfTU1JT19QSVBFKHBpcGUsIF9I U1dfQVVEX01fQ1RTX0VOQUJMRV9BLCBfSFNXX0FVRF9NX0NUU19FTkFCTEVfQikKKyNkZWZpbmUg ICBBVURfTV9DVFNfTV9WQUxVRV9JTkRFWAkoMSA8PCAyMSkKKyNkZWZpbmUgICBBVURfTV9DVFNf TV9QUk9HX0VOQUJMRQkoMSA8PCAyMCkKKyNkZWZpbmUgICBBVURfQ09ORklHX01fTUFTSwkJMHhm ZmZmZgorCiAjZGVmaW5lIF9IU1dfQVVEX0RJUF9FTERfQ1RSTF9TVF9BCTB4NjUwYjQKICNkZWZp bmUgX0hTV19BVURfRElQX0VMRF9DVFJMX1NUX0IJMHg2NTFiNAogI2RlZmluZSBIU1dfQVVEX0RJ UF9FTERfQ1RSTChwaXBlKQlfTU1JT19QSVBFKHBpcGUsIF9IU1dfQVVEX0RJUF9FTERfQ1RSTF9T VF9BLCBfSFNXX0FVRF9ESVBfRUxEX0NUUkxfU1RfQikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRp by5jCmluZGV4IDFhNWMyMTIwOTQ0Ni4uODEzZmQ3NGQ5YzhkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2F1ZGlvLmMKQEAgLTU3LDYgKzU3LDYzIEBACiAgKiBzdHJ1Y3QgJmk5MTVfYXVkaW9fY29t cG9uZW50X2F1ZGlvX29wcyBAYXVkaW9fb3BzIGlzIGNhbGxlZCBmcm9tIGk5MTUgZHJpdmVyLgog ICovCiAKKy8qIERQIE4vTSB0YWJsZSAqLworI2RlZmluZSBMQ181NDBNCTU0MDAwMAorI2RlZmlu ZSBMQ18yNzBNCTI3MDAwMAorI2RlZmluZSBMQ18xNjJNCTE2MjAwMAorCitzdHJ1Y3QgZHBfYXVk X25fbSB7CisJaW50IHNhbXBsZV9yYXRlOworCWludCBjbG9jazsKKwl1MTYgbTsKKwl1MTYgbjsK K307CisKKy8qIFZhbHVlcyBhY2NvcmRpbmcgdG8gRFAgMS40IFRhYmxlIDItMTA0ICovCitzdGF0 aWMgY29uc3Qgc3RydWN0IGRwX2F1ZF9uX20gZHBfYXVkX25fbVtdID0geworCXsgMzIwMDAsIExD XzE2Mk0sIDEwMjQsIDEwMTI1IH0sCisJeyA0NDEwMCwgTENfMTYyTSwgNzg0LCA1NjI1IH0sCisJ eyA0ODAwMCwgTENfMTYyTSwgNTEyLCAzMzc1IH0sCisJeyA2NDAwMCwgTENfMTYyTSwgMjA0OCwg MTAxMjUgfSwKKwl7IDg4MjAwLCBMQ18xNjJNLCAxNTY4LCA1NjI1IH0sCisJeyA5NjAwMCwgTENf MTYyTSwgMTAyNCwgMzM3NSB9LAorCXsgMTI4MDAwLCBMQ18xNjJNLCA0MDk2LCAxMDEyNSB9LAor CXsgMTc2NDAwLCBMQ18xNjJNLCAzMTM2LCA1NjI1IH0sCisJeyAxOTIwMDAsIExDXzE2Mk0sIDIw NDgsIDMzNzUgfSwKKwl7IDMyMDAwLCBMQ18yNzBNLCAxMDI0LCAxNjg3NSB9LAorCXsgNDQxMDAs IExDXzI3ME0sIDc4NCwgOTM3NSB9LAorCXsgNDgwMDAsIExDXzI3ME0sIDUxMiwgNTYyNSB9LAor CXsgNjQwMDAsIExDXzI3ME0sIDIwNDgsIDE2ODc1IH0sCisJeyA4ODIwMCwgTENfMjcwTSwgMTU2 OCwgOTM3NSB9LAorCXsgOTYwMDAsIExDXzI3ME0sIDEwMjQsIDU2MjUgfSwKKwl7IDEyODAwMCwg TENfMjcwTSwgNDA5NiwgMTY4NzUgfSwKKwl7IDE3NjQwMCwgTENfMjcwTSwgMzEzNiwgOTM3NSB9 LAorCXsgMTkyMDAwLCBMQ18yNzBNLCAyMDQ4LCA1NjI1IH0sCisJeyAzMjAwMCwgTENfNTQwTSwg MTAyNCwgMzM3NTAgfSwKKwl7IDQ0MTAwLCBMQ181NDBNLCA3ODQsIDE4NzUwIH0sCisJeyA0ODAw MCwgTENfNTQwTSwgNTEyLCAxMTI1MCB9LAorCXsgNjQwMDAsIExDXzU0ME0sIDIwNDgsIDMzNzUw IH0sCisJeyA4ODIwMCwgTENfNTQwTSwgMTU2OCwgMTg3NTAgfSwKKwl7IDk2MDAwLCBMQ181NDBN LCAxMDI0LCAxMTI1MCB9LAorCXsgMTI4MDAwLCBMQ181NDBNLCA0MDk2LCAzMzc1MCB9LAorCXsg MTc2NDAwLCBMQ181NDBNLCAzMTM2LCAxODc1MCB9LAorCXsgMTkyMDAwLCBMQ181NDBNLCAyMDQ4 LCAxMTI1MCB9LAorfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBkcF9hdWRfbl9tICoKK2F1ZGlv X2NvbmZpZ19kcF9nZXRfbl9tKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLCBpbnQgcmF0 ZSkKK3sKKwlpbnQgaTsKKworCWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGRwX2F1ZF9uX20p OyBpKyspIHsKKwkJaWYgKHJhdGUgPT0gZHBfYXVkX25fbVtpXS5zYW1wbGVfcmF0ZSAmJgorCQkg ICAgaW50ZWxfY3J0Yy0+Y29uZmlnLT5wb3J0X2Nsb2NrID09IGRwX2F1ZF9uX21baV0uY2xvY2sp CisJCQlyZXR1cm4gJmRwX2F1ZF9uX21baV07CisJfQorCisJcmV0dXJuIE5VTEw7Cit9CisKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgewogCWludCBjbG9jazsKIAl1MzIgY29uZmlnOwpAQCAtMjI1LDE2 ICsyODIsNDMgQEAgaHN3X2RwX2F1ZGlvX2NvbmZpZ191cGRhdGUoc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMsIGVudW0gcG9ydCBwb3J0LAogCQkJICAgY29uc3Qgc3RydWN0IGRybV9kaXNw bGF5X21vZGUgKmFkanVzdGVkX21vZGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShpbnRlbF9jcnRjLT5iYXNlLmRldik7CisJc3RydWN0IGk5MTVfYXVk aW9fY29tcG9uZW50ICphY29tcCA9IGRldl9wcml2LT5hdWRpb19jb21wb25lbnQ7CisJaW50IHJh dGUgPSBhY29tcCA/IGFjb21wLT5hdWRfc2FtcGxlX3JhdGVbcG9ydF0gOiAwOworCWNvbnN0IHN0 cnVjdCBkcF9hdWRfbl9tICpubSA9IGF1ZGlvX2NvbmZpZ19kcF9nZXRfbl9tKGludGVsX2NydGMs IHJhdGUpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAl1MzIgdG1wOwog CisJaWYgKG5tKQorCQlEUk1fREVCVUdfS01TKCJ1c2luZyBNYXVkICV1LCBOYXVkICV1XG4iLCBu bS0+bSwgbm0tPm4pOworCWVsc2UKKwkJRFJNX0RFQlVHX0tNUygidXNpbmcgYXV0b21hdGljIE1h dWQsIE5hdWRcbiIpOworCiAJdG1wID0gSTkxNV9SRUFEKEhTV19BVURfQ0ZHKHBpcGUpKTsKIAl0 bXAgJj0gfkFVRF9DT05GSUdfTl9WQUxVRV9JTkRFWDsKIAl0bXAgJj0gfkFVRF9DT05GSUdfUElY RUxfQ0xPQ0tfSERNSV9NQVNLOwogCXRtcCAmPSB+QVVEX0NPTkZJR19OX1BST0dfRU5BQkxFOwog CXRtcCB8PSBBVURfQ09ORklHX05fVkFMVUVfSU5ERVg7CiAKKwlpZiAobm0pIHsKKwkJdG1wICY9 IH5BVURfQ09ORklHX05fTUFTSzsKKwkJdG1wIHw9IEFVRF9DT05GSUdfTihubS0+bik7CisJCXRt cCB8PSBBVURfQ09ORklHX05fUFJPR19FTkFCTEU7CisJfQorCiAJSTkxNV9XUklURShIU1dfQVVE X0NGRyhwaXBlKSwgdG1wKTsKKworCXRtcCA9IEk5MTVfUkVBRChIU1dfQVVEX01fQ1RTX0VOQUJM RShwaXBlKSk7CisJdG1wICY9IH5BVURfQ09ORklHX01fTUFTSzsKKwl0bXAgJj0gfkFVRF9NX0NU U19NX1ZBTFVFX0lOREVYOworCXRtcCAmPSB+QVVEX01fQ1RTX01fUFJPR19FTkFCTEU7CisKKwlp ZiAobm0pIHsKKwkJdG1wIHw9IG5tLT5tOworCQl0bXAgfD0gQVVEX01fQ1RTX01fVkFMVUVfSU5E RVg7CisJCXRtcCB8PSBBVURfTV9DVFNfTV9QUk9HX0VOQUJMRTsKKwl9CisKKwlJOTE1X1dSSVRF KEhTV19BVURfTV9DVFNfRU5BQkxFKHBpcGUpLCB0bXApOwogfQogCiBzdGF0aWMgdm9pZApAQCAt MjY2LDYgKzM1MCwxMiBAQCBoc3dfaGRtaV9hdWRpb19jb25maWdfdXBkYXRlKHN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjLCBlbnVtIHBvcnQgcG9ydCwKIAl9CiAKIAlJOTE1X1dSSVRFKEhT V19BVURfQ0ZHKHBpcGUpLCB0bXApOworCisJdG1wID0gSTkxNV9SRUFEKEhTV19BVURfTV9DVFNf RU5BQkxFKHBpcGUpKTsKKwl0bXAgJj0gfkFVRF9DT05GSUdfTV9NQVNLOworCXRtcCAmPSB+QVVE X01fQ1RTX01fVkFMVUVfSU5ERVg7CisJdG1wIHw9IEFVRF9NX0NUU19NX1BST0dfRU5BQkxFOwor CUk5MTVfV1JJVEUoSFNXX0FVRF9NX0NUU19FTkFCTEUocGlwZSksIHRtcCk7CiB9CiAKIHN0YXRp YyB2b2lkCkBAIC02ODYsNyArNzc2LDggQEAgc3RhdGljIGludCBpOTE1X2F1ZGlvX2NvbXBvbmVu dF9zeW5jX2F1ZGlvX3JhdGUoc3RydWN0IGRldmljZSAqa2RldiwgaW50IHBvcnQsCiAJLyogMS4g Z2V0IHRoZSBwaXBlICovCiAJaW50ZWxfZW5jb2RlciA9IGdldF9zYXZlZF9lbmMoZGV2X3ByaXYs IHBvcnQsIHBpcGUpOwogCWlmICghaW50ZWxfZW5jb2RlciB8fCAhaW50ZWxfZW5jb2Rlci0+YmFz ZS5jcnRjIHx8Ci0JICAgIGludGVsX2VuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0hETUkp IHsKKwkgICAgKGludGVsX2VuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0hETUkgJiYKKwkg ICAgIGludGVsX2VuY29kZXItPnR5cGUgIT0gSU5URUxfT1VUUFVUX0RQKSkgewogCQlEUk1fREVC VUdfS01TKCJOb3QgdmFsaWQgZm9yIHBvcnQgJWNcbiIsIHBvcnRfbmFtZShwb3J0KSk7CiAJCWVy ciA9IC1FTk9ERVY7CiAJCWdvdG8gdW5sb2NrOwotLSAKMi4xLjQKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=