From: Imre Deak Subject: [PATCH v4 4/6] ALSA: hda: pass intel_hda to all i915 interface functions Date: Thu, 8 Jan 2015 17:54:16 +0200 Message-ID: <1420732458-11373-5-git-send-email-imre.deak@intel.com> References: <1420732458-11373-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1420732458-11373-1-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Takashi Iwai , intel-gfx@lists.freedesktop.org, alsa-devel@alsa-project.org Cc: Jani Nikula , Daniel Vetter List-Id: alsa-devel@alsa-project.org Y2hpcCBpcyBhbHJlYWR5IHBhc3NlZCB0byBtb3N0IG9mIHRoZSBpOTE1IGludGVyZmFjZSBmdW5j dGlvbnMuIFVuaWZ5CnRoZSBpbnRlcmZhY2UgYnkgcGFzc2luZyBpbnRlbF9oZGEgaW5zdGVhZCBv ZiBjaGlwIGFuZCBwYXNzaW5nIGl0IHRvIGFsbApmdW5jdGlvbnMuIFBhc3NpbmcgaW50ZWxfaGRh IGluc3RlYWQgb2YgY2hpcCBtYWtlcyBtb3JlIHNlbnNlIHNpbmNlIHRoaXMKaXMgYW4gaW50ZWwg c3BlY2lmaWMgaW50ZXJmYWNlLiBBbHNvIGluIGFuIHVwY29taW5nIHBhdGNoIHdlIHdpbGwgdXNl CmludGVsX2hkYSBpbiBhbGwgb2YgdGhlc2UgZnVuY3Rpb25zIHNvIGJ5IHBhc3NpbmcgaW50ZWxf aGRhIHdlIGNhbiBzYXZlCm9uIHNvbWUgcG9pbnRlciBjYXN0cyBmcm9tIGNoaXAgdG8gaW50ZWxf aGRhLgoKVGhpcyB3aWxsIGJlIG5lZWRlZCBieSBhbiB1cGNvbWluZyBwYXRjaCBhZGRpbmcgY29t cG9uZW50IHN1cHBvcnQuCgpObyBmdW5jdGlvbmFsIGNoYW5nZS4KCnYyLTM6IHVuY2hhbmdlZAp2 NDoKLSBwYXNzIGludGVsX2hkYSBpbnN0ZWFkIG9mIGNoaXAKClNpZ25lZC1vZmYtYnk6IEltcmUg RGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IFRha2FzaGkgSXdhaSA8dGl3 YWlAc3VzZS5kZT4KLS0tCiBzb3VuZC9wY2kvaGRhL2hkYV9pOTE1LmMgIHwgMTIgKysrKysrLS0t LS0tCiBzb3VuZC9wY2kvaGRhL2hkYV9pbnRlbC5jIHwgMjggKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLQogc291bmQvcGNpL2hkYS9oZGFfaW50ZWwuaCB8IDE5ICsrKysrKysrKysrLS0tLS0t LS0KIDMgZmlsZXMgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvc291bmQvcGNpL2hkYS9oZGFfaTkxNS5jIGIvc291bmQvcGNpL2hkYS9oZGFf aTkxNS5jCmluZGV4IDZhNzg1NGQuLjY2YWNkMDkgMTAwNjQ0Ci0tLSBhL3NvdW5kL3BjaS9oZGEv aGRhX2k5MTUuYworKysgYi9zb3VuZC9wY2kvaGRhL2hkYV9pOTE1LmMKQEAgLTM1LDcgKzM1LDcg QEAgc3RhdGljIGludCAoKmdldF9wb3dlcikodm9pZCk7CiBzdGF0aWMgaW50ICgqcHV0X3Bvd2Vy KSh2b2lkKTsKIHN0YXRpYyBpbnQgKCpnZXRfY2RjbGspKHZvaWQpOwogCi1pbnQgaGRhX2Rpc3Bs YXlfcG93ZXIoYm9vbCBlbmFibGUpCitpbnQgaGRhX2Rpc3BsYXlfcG93ZXIoc3RydWN0IGhkYV9p bnRlbCAqaGRhLCBib29sIGVuYWJsZSkKIHsKIAlpZiAoIWdldF9wb3dlciB8fCAhcHV0X3Bvd2Vy KQogCQlyZXR1cm4gLUVOT0RFVjsKQEAgLTQ4LDcgKzQ4LDcgQEAgaW50IGhkYV9kaXNwbGF5X3Bv d2VyKGJvb2wgZW5hYmxlKQogCQlyZXR1cm4gcHV0X3Bvd2VyKCk7CiB9CiAKLXZvaWQgaGFzd2Vs bF9zZXRfYmNsayhzdHJ1Y3QgYXp4ICpjaGlwKQordm9pZCBoYXN3ZWxsX3NldF9iY2xrKHN0cnVj dCBoZGFfaW50ZWwgKmhkYSkKIHsKIAlpbnQgY2RjbGtfZnJlcTsKIAl1bnNpZ25lZCBpbnQgYmNs a19tLCBiY2xrX247CkBAIC04MCwxMiArODAsMTIgQEAgdm9pZCBoYXN3ZWxsX3NldF9iY2xrKHN0 cnVjdCBhenggKmNoaXApCiAJCWJyZWFrOwogCX0KIAotCWF6eF93cml0ZXcoY2hpcCwgRU00LCBi Y2xrX20pOwotCWF6eF93cml0ZXcoY2hpcCwgRU01LCBiY2xrX24pOworCWF6eF93cml0ZXcoJmhk YS0+Y2hpcCwgRU00LCBiY2xrX20pOworCWF6eF93cml0ZXcoJmhkYS0+Y2hpcCwgRU01LCBiY2xr X24pOwogfQogCiAKLWludCBoZGFfaTkxNV9pbml0KHZvaWQpCitpbnQgaGRhX2k5MTVfaW5pdChz dHJ1Y3QgaGRhX2ludGVsICpoZGEpCiB7CiAJaW50IGVyciA9IDA7CiAKQEAgLTExMSw3ICsxMTEs NyBAQCBpbnQgaGRhX2k5MTVfaW5pdCh2b2lkKQogCXJldHVybiBlcnI7CiB9CiAKLWludCBoZGFf aTkxNV9leGl0KHZvaWQpCitpbnQgaGRhX2k5MTVfZXhpdChzdHJ1Y3QgaGRhX2ludGVsICpoZGEp CiB7CiAJaWYgKGdldF9wb3dlcikgewogCQlzeW1ib2xfcHV0KGk5MTVfcmVxdWVzdF9wb3dlcl93 ZWxsKTsKZGlmZiAtLWdpdCBhL3NvdW5kL3BjaS9oZGEvaGRhX2ludGVsLmMgYi9zb3VuZC9wY2kv aGRhL2hkYV9pbnRlbC5jCmluZGV4IGU0YmMwZGMuLjMyM2FiZjkgMTAwNjQ0Ci0tLSBhL3NvdW5k L3BjaS9oZGEvaGRhX2ludGVsLmMKKysrIGIvc291bmQvcGNpL2hkYS9oZGFfaW50ZWwuYwpAQCAt ODAzLDcgKzgwMyw3IEBAIHN0YXRpYyBpbnQgYXp4X3N1c3BlbmQoc3RydWN0IGRldmljZSAqZGV2 KQogCXBjaV9zYXZlX3N0YXRlKHBjaSk7CiAJcGNpX3NldF9wb3dlcl9zdGF0ZShwY2ksIFBDSV9E M2hvdCk7CiAJaWYgKGNoaXAtPmRyaXZlcl9jYXBzICYgQVpYX0RDQVBTX0k5MTVfUE9XRVJXRUxM KQotCQloZGFfZGlzcGxheV9wb3dlcihmYWxzZSk7CisJCWhkYV9kaXNwbGF5X3Bvd2VyKGhkYSwg ZmFsc2UpOwogCXJldHVybiAwOwogfQogCkBAIC04MjMsOCArODIzLDggQEAgc3RhdGljIGludCBh enhfcmVzdW1lKHN0cnVjdCBkZXZpY2UgKmRldikKIAkJcmV0dXJuIDA7CiAKIAlpZiAoY2hpcC0+ ZHJpdmVyX2NhcHMgJiBBWlhfRENBUFNfSTkxNV9QT1dFUldFTEwpIHsKLQkJaGRhX2Rpc3BsYXlf cG93ZXIodHJ1ZSk7Ci0JCWhhc3dlbGxfc2V0X2JjbGsoY2hpcCk7CisJCWhkYV9kaXNwbGF5X3Bv d2VyKGhkYSwgdHJ1ZSk7CisJCWhhc3dlbGxfc2V0X2JjbGsoaGRhKTsKIAl9CiAJcGNpX3NldF9w b3dlcl9zdGF0ZShwY2ksIFBDSV9EMCk7CiAJcGNpX3Jlc3RvcmVfc3RhdGUocGNpKTsKQEAgLTg3 Niw3ICs4NzYsNyBAQCBzdGF0aWMgaW50IGF6eF9ydW50aW1lX3N1c3BlbmQoc3RydWN0IGRldmlj ZSAqZGV2KQogCWF6eF9lbnRlcl9saW5rX3Jlc2V0KGNoaXApOwogCWF6eF9jbGVhcl9pcnFfcGVu ZGluZyhjaGlwKTsKIAlpZiAoY2hpcC0+ZHJpdmVyX2NhcHMgJiBBWlhfRENBUFNfSTkxNV9QT1dF UldFTEwpCi0JCWhkYV9kaXNwbGF5X3Bvd2VyKGZhbHNlKTsKKwkJaGRhX2Rpc3BsYXlfcG93ZXIo aGRhLCBmYWxzZSk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTkwMiw4ICs5MDIsOCBAQCBzdGF0aWMg aW50IGF6eF9ydW50aW1lX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJCXJldHVybiAwOwog CiAJaWYgKGNoaXAtPmRyaXZlcl9jYXBzICYgQVpYX0RDQVBTX0k5MTVfUE9XRVJXRUxMKSB7Ci0J CWhkYV9kaXNwbGF5X3Bvd2VyKHRydWUpOwotCQloYXN3ZWxsX3NldF9iY2xrKGNoaXApOworCQlo ZGFfZGlzcGxheV9wb3dlcihoZGEsIHRydWUpOworCQloYXN3ZWxsX3NldF9iY2xrKGhkYSk7CiAJ fQogCiAJLyogUmVhZCBTVEFURVNUUyBiZWZvcmUgY29udHJvbGxlciByZXNldCAqLwpAQCAtMTEy NSw4ICsxMTI1LDggQEAgc3RhdGljIGludCBhenhfZnJlZShzdHJ1Y3QgYXp4ICpjaGlwKQogCXJl bGVhc2VfZmlybXdhcmUoY2hpcC0+ZncpOwogI2VuZGlmCiAJaWYgKGNoaXAtPmRyaXZlcl9jYXBz ICYgQVpYX0RDQVBTX0k5MTVfUE9XRVJXRUxMKSB7Ci0JCWhkYV9kaXNwbGF5X3Bvd2VyKGZhbHNl KTsKLQkJaGRhX2k5MTVfZXhpdCgpOworCQloZGFfZGlzcGxheV9wb3dlcihoZGEsIGZhbHNlKTsK KwkJaGRhX2k5MTVfZXhpdChoZGEpOwogCX0KIAlrZnJlZShoZGEpOwogCkBAIC0xNjA0LDggKzE2 MDQsMTIgQEAgc3RhdGljIGludCBhenhfZmlyc3RfaW5pdChzdHJ1Y3QgYXp4ICpjaGlwKQogCS8q IGluaXRpYWxpemUgY2hpcCAqLwogCWF6eF9pbml0X3BjaShjaGlwKTsKIAotCWlmIChjaGlwLT5k cml2ZXJfY2FwcyAmIEFaWF9EQ0FQU19JOTE1X1BPV0VSV0VMTCkKLQkJaGFzd2VsbF9zZXRfYmNs ayhjaGlwKTsKKwlpZiAoY2hpcC0+ZHJpdmVyX2NhcHMgJiBBWlhfRENBUFNfSTkxNV9QT1dFUldF TEwpIHsKKwkJc3RydWN0IGhkYV9pbnRlbCAqaGRhOworCisJCWhkYSA9IGNvbnRhaW5lcl9vZihj aGlwLCBzdHJ1Y3QgaGRhX2ludGVsLCBjaGlwKTsKKwkJaGFzd2VsbF9zZXRfYmNsayhoZGEpOwor CX0KIAogCWF6eF9pbml0X2NoaXAoY2hpcCwgKHByb2JlX29ubHlbZGV2XSAmIDIpID09IDApOwog CkBAIC0xODg1LDEzICsxODg5LDEzIEBAIHN0YXRpYyBpbnQgYXp4X3Byb2JlX2NvbnRpbnVlKHN0 cnVjdCBhenggKmNoaXApCiAJLyogUmVxdWVzdCBwb3dlciB3ZWxsIGZvciBIYXN3ZWxsIEhEQSBj b250cm9sbGVyIGFuZCBjb2RlYyAqLwogCWlmIChjaGlwLT5kcml2ZXJfY2FwcyAmIEFaWF9EQ0FQ U19JOTE1X1BPV0VSV0VMTCkgewogI2lmZGVmIENPTkZJR19TTkRfSERBX0k5MTUKLQkJZXJyID0g aGRhX2k5MTVfaW5pdCgpOworCQllcnIgPSBoZGFfaTkxNV9pbml0KGhkYSk7CiAJCWlmIChlcnIg PCAwKSB7CiAJCQlkZXZfZXJyKGNoaXAtPmNhcmQtPmRldiwKIAkJCQkiRXJyb3IgcmVxdWVzdCBw b3dlci13ZWxsIGZyb20gaTkxNVxuIik7CiAJCQlnb3RvIG91dF9mcmVlOwogCQl9Ci0JCWVyciA9 IGhkYV9kaXNwbGF5X3Bvd2VyKHRydWUpOworCQllcnIgPSBoZGFfZGlzcGxheV9wb3dlcihoZGEs IHRydWUpOwogCQlpZiAoZXJyIDwgMCkgewogCQkJZGV2X2VycihjaGlwLT5jYXJkLT5kZXYsCiAJ CQkJIkNhbm5vdCB0dXJuIG9uIGRpc3BsYXkgcG93ZXIgb24gaTkxNVxuIik7CmRpZmYgLS1naXQg YS9zb3VuZC9wY2kvaGRhL2hkYV9pbnRlbC5oIGIvc291bmQvcGNpL2hkYS9oZGFfaW50ZWwuaApp bmRleCA0MzRmMjU0Li43MGI4MzA2IDEwMDY0NAotLS0gYS9zb3VuZC9wY2kvaGRhL2hkYV9pbnRl bC5oCisrKyBiL3NvdW5kL3BjaS9oZGEvaGRhX2ludGVsLmgKQEAgLTQ0LDE4ICs0NCwyMSBAQCBz dHJ1Y3QgaGRhX2ludGVsIHsKIH07CiAKICNpZmRlZiBDT05GSUdfU05EX0hEQV9JOTE1Ci1pbnQg aGRhX2Rpc3BsYXlfcG93ZXIoYm9vbCBlbmFibGUpOwotdm9pZCBoYXN3ZWxsX3NldF9iY2xrKHN0 cnVjdCBhenggKmNoaXApOwotaW50IGhkYV9pOTE1X2luaXQodm9pZCk7Ci1pbnQgaGRhX2k5MTVf ZXhpdCh2b2lkKTsKK2ludCBoZGFfZGlzcGxheV9wb3dlcihzdHJ1Y3QgaGRhX2ludGVsICpoZGEs IGJvb2wgZW5hYmxlKTsKK3ZvaWQgaGFzd2VsbF9zZXRfYmNsayhzdHJ1Y3QgaGRhX2ludGVsICpo ZGEpOworaW50IGhkYV9pOTE1X2luaXQoc3RydWN0IGhkYV9pbnRlbCAqaGRhKTsKK2ludCBoZGFf aTkxNV9leGl0KHN0cnVjdCBoZGFfaW50ZWwgKmhkYSk7CiAjZWxzZQotc3RhdGljIGlubGluZSBp bnQgaGRhX2Rpc3BsYXlfcG93ZXIoYm9vbCBlbmFibGUpIHsgcmV0dXJuIDA7IH0KLXN0YXRpYyBp bmxpbmUgdm9pZCBoYXN3ZWxsX3NldF9iY2xrKHN0cnVjdCBhenggKmNoaXApIHsgcmV0dXJuOyB9 Ci1zdGF0aWMgaW5saW5lIGludCBoZGFfaTkxNV9pbml0KHZvaWQpCitzdGF0aWMgaW5saW5lIGlu dCBoZGFfZGlzcGxheV9wb3dlcihzdHJ1Y3QgaGRhX2ludGVsICpoZGEsIGJvb2wgZW5hYmxlKQor eworCXJldHVybiAwOworfQorc3RhdGljIGlubGluZSB2b2lkIGhhc3dlbGxfc2V0X2JjbGsoc3Ry dWN0IGhkYV9pbnRlbCAqaGRhKSB7IHJldHVybjsgfQorc3RhdGljIGlubGluZSBpbnQgaGRhX2k5 MTVfaW5pdChzdHJ1Y3QgaGRhX2ludGVsICpoZGEpCiB7CiAJcmV0dXJuIC1FTk9ERVY7CiB9Ci1z dGF0aWMgaW5saW5lIGludCBoZGFfaTkxNV9leGl0KHZvaWQpCitzdGF0aWMgaW5saW5lIGludCBo ZGFfaTkxNV9leGl0KHN0cnVjdCBoZGFfaW50ZWwgKmhkYSkKIHsKIAlyZXR1cm4gMDsKIH0KLS0g CjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=