From: Maarten Lankhorst Subject: [RESEND PATCH 2/6] drm/i915: Pass atomic state to intel_audio_codec_enable Date: Wed, 19 Oct 2016 15:55:35 +0200 Message-ID: <1476885339-2265-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1476885339-2265-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0989E6E91B for ; Wed, 19 Oct 2016 13:55:54 +0000 (UTC) In-Reply-To: <1476885339-2265-1-git-send-email-maarten.lankhorst@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 ZHJtX3NlbGVjdF9lbGQgcmVxdWlyZXMgbW9kZV9jb25maWcubXV0ZXggYW5kIGNvbm5lY3Rpb25f bXV0ZXgKYmVjYXVzZSBpdCBsb29rcyBhdCB0aGUgY29ubmVjdG9yIGxpc3QgYW5kIGF0IHRoZSBs ZWdhY3kgZW5jb2RlcnMuCgpUaGlzIGlzIG5vdCByZXF1aXJlZCwgYmVjYXVzZSB3aGVuIHdlIGNh bGwgYXVkaW9fY29kZWNfZW5hYmxlIHdlIGtub3cKd2hpY2ggY29ubmVjdG9yIGl0IHdhcyBjYWxs ZWQgZm9yLCBzbyBwYXNzIHRoZSBzdGF0ZS4KClRoaXMgYWxzbyByZW1vdmVzIGhhdmluZyB0byBs b29rIGF0IGNydGMtPmNvbmZpZy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxt YWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfYXVkaW8uYyB8IDE3ICsrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMgICAgfCAxMSArKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg ICB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgfCAgMiArLQog NSBmaWxlcyBjaGFuZ2VkLCAyMSBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwppbmRleCA3MDkzY2ZiYjYyYjEuLjYzZWYyNTg5M2M3ZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCkBAIC00ODUsMjMgKzQ4NSwyNiBAQCBzdGF0 aWMgdm9pZCBpbGtfYXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3IsCiAvKioKICAqIGludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZSAtIEVuYWJsZSB0aGUgYXVk aW8gY29kZWMgZm9yIEhEIGF1ZGlvCiAgKiBAaW50ZWxfZW5jb2RlcjogZW5jb2RlciBvbiB3aGlj aCB0byBlbmFibGUgYXVkaW8KKyAqIEBjcnRjX3N0YXRlOiBwb2ludGVyIHRvIHRoZSBjdXJyZW50 IGNydGMgc3RhdGUuCisgKiBAY29ubl9zdGF0ZTogcG9pbnRlciB0byB0aGUgY3VycmVudCBjb25u ZWN0b3Igc3RhdGUuCiAgKgogICogVGhlIGVuYWJsZSBzZXF1ZW5jZXMgbWF5IG9ubHkgYmUgcGVy Zm9ybWVkIGFmdGVyIGVuYWJsaW5nIHRoZSB0cmFuc2NvZGVyIGFuZAogICogcG9ydCwgYW5kIGFm dGVyIGNvbXBsZXRlZCBsaW5rIHRyYWluaW5nLgogICovCi12b2lkIGludGVsX2F1ZGlvX2NvZGVj X2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqaW50ZWxfZW5jb2RlcikKK3ZvaWQgaW50ZWxf YXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAor CQkJICAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkg ICAgICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKIAlz dHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIgPSAmaW50ZWxfZW5jb2Rlci0+YmFzZTsKLQlzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoZW5jb2Rlci0+Y3J0Yyk7Ci0JY29u c3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFkanVzdGVkX21vZGUgPSAmY3J0Yy0+Y29uZmln LT5iYXNlLmFkanVzdGVkX21vZGU7CisJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKmFk anVzdGVkX21vZGUgPSAmY3J0Y19zdGF0ZS0+YmFzZS5hZGp1c3RlZF9tb2RlOwogCXN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3I7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShlbmNvZGVyLT5kZXYpOwogCXN0cnVjdCBpOTE1X2F1ZGlvX2NvbXBvbmVu dCAqYWNvbXAgPSBkZXZfcHJpdi0+YXVkaW9fY29tcG9uZW50OwogCWVudW0gcG9ydCBwb3J0ID0g aW50ZWxfZW5jb2Rlci0+cG9ydDsKLQllbnVtIHBpcGUgcGlwZSA9IGNydGMtPnBpcGU7CisJZW51 bSBwaXBlIHBpcGUgPSBkcm1fY3J0Y19pbmRleChjcnRjX3N0YXRlLT5iYXNlLmNydGMpOwogCi0J Y29ubmVjdG9yID0gZHJtX3NlbGVjdF9lbGQoZW5jb2Rlcik7Ci0JaWYgKCFjb25uZWN0b3IpCisJ Y29ubmVjdG9yID0gY29ubl9zdGF0ZS0+Y29ubmVjdG9yOworCWlmICghY29ubmVjdG9yIHx8ICFj b25uZWN0b3ItPmVsZFswXSkKIAkJcmV0dXJuOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiRUxEIG9u IFtDT05ORUNUT1I6JWQ6JXNdLCBbRU5DT0RFUjolZDolc11cbiIsCkBAIC01MTIsNyArNTE1LDcg QEAgdm9pZCBpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmlu dGVsX2VuY29kZXIpCiAKIAkvKiBFTEQgQ29ubl9UeXBlICovCiAJY29ubmVjdG9yLT5lbGRbNV0g Jj0gfigzIDw8IDIpOwotCWlmIChpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKGNydGMtPmNvbmZp ZykpCisJaWYgKGludGVsX2NydGNfaGFzX2RwX2VuY29kZXIoY3J0Y19zdGF0ZSkpCiAJCWNvbm5l Y3Rvci0+ZWxkWzVdIHw9ICgxIDw8IDIpOwogCiAJY29ubmVjdG9yLT5lbGRbNl0gPSBkcm1fYXZf c3luY19kZWxheShjb25uZWN0b3IsIGFkanVzdGVkX21vZGUpIC8gMjsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGRpLmMKaW5kZXggN2Y3NzQxYzE0MDZkLi42NzQ4Mjc5MzEwYTQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RkaS5jCkBAIC0xODI0LDcgKzE4MjQsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFi bGVfZGRpKHN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyLAogCiAJaWYgKGludGVs X2NydGMtPmNvbmZpZy0+aGFzX2F1ZGlvKSB7CiAJCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRl dl9wcml2LCBQT1dFUl9ET01BSU5fQVVESU8pOwotCQlpbnRlbF9hdWRpb19jb2RlY19lbmFibGUo aW50ZWxfZW5jb2Rlcik7CisJCWludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShpbnRlbF9lbmNvZGVy LCBwaXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CiAJfQogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YwppbmRleCA4OGYzYjc0NWEzMjYuLjYwNDZmMGY1NGNiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jCkBAIC0yNzM0LDcgKzI3MzQsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9lbmFibGVfcG9y dChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLAogfQogCiBzdGF0aWMgdm9pZCBpbnRlbF9lbmFi bGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCi0JCQkgICAgc3RydWN0IGludGVs X2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQorCQkJICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZywKKwkJCSAgICBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9z dGF0ZSkKIHsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZl bmNvZGVyLT5iYXNlKTsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZW5jb2Rlci0+YmFzZS5k ZXY7CkBAIC0yNzc2LDcgKzI3NzcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9lbmFibGVfZHAoc3Ry dWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJaWYgKHBpcGVfY29uZmlnLT5oYXNfYXVkaW8p IHsKIAkJRFJNX0RFQlVHX0RSSVZFUigiRW5hYmxpbmcgRFAgYXVkaW8gb24gcGlwZSAlY1xuIiwK IAkJCQkgcGlwZV9uYW1lKHBpcGUpKTsKLQkJaW50ZWxfYXVkaW9fY29kZWNfZW5hYmxlKGVuY29k ZXIpOworCQlpbnRlbF9hdWRpb19jb2RlY19lbmFibGUoZW5jb2RlciwgcGlwZV9jb25maWcsIGNv bm5fc3RhdGUpOwogCX0KIH0KIApAQCAtMjc4Niw3ICsyNzg3LDcgQEAgc3RhdGljIHZvaWQgZzR4 X2VuYWJsZV9kcChzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIHsKIAlzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZlbmNvZGVyLT5iYXNlKTsKIAotCWlu dGVsX2VuYWJsZV9kcChlbmNvZGVyLCBwaXBlX2NvbmZpZyk7CisJaW50ZWxfZW5hYmxlX2RwKGVu Y29kZXIsIHBpcGVfY29uZmlnLCBjb25uX3N0YXRlKTsKIAlpbnRlbF9lZHBfYmFja2xpZ2h0X29u KGludGVsX2RwKTsKIH0KIApAQCAtMjkyMyw3ICsyOTI0LDcgQEAgc3RhdGljIHZvaWQgdmx2X3By ZV9lbmFibGVfZHAoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiB7CiAJdmx2X3BoeV9w cmVfZW5jb2Rlcl9lbmFibGUoZW5jb2Rlcik7CiAKLQlpbnRlbF9lbmFibGVfZHAoZW5jb2Rlciwg cGlwZV9jb25maWcpOworCWludGVsX2VuYWJsZV9kcChlbmNvZGVyLCBwaXBlX2NvbmZpZywgY29u bl9zdGF0ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIHZsdl9kcF9wcmVfcGxsX2VuYWJsZShzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKQEAgLTI5NDEsNyArMjk0Miw3IEBAIHN0YXRpYyB2b2lk IGNodl9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogewogCWNo dl9waHlfcHJlX2VuY29kZXJfZW5hYmxlKGVuY29kZXIpOwogCi0JaW50ZWxfZW5hYmxlX2RwKGVu Y29kZXIsIHBpcGVfY29uZmlnKTsKKwlpbnRlbF9lbmFibGVfZHAoZW5jb2RlciwgcGlwZV9jb25m aWcsIGNvbm5fc3RhdGUpOwogCiAJLyogU2Vjb25kIGNvbW1vbiBsYW5lIHdpbGwgc3RheSBhbGl2 ZSBvbiBpdHMgb3duIG5vdyAqLwogCWNodl9waHlfcmVsZWFzZV9jbDJfb3ZlcnJpZGUoZW5jb2Rl cik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDU3NjA0MjBhY2U2MS4uZTNjNDI2NTYz NTg5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTE5Miw3ICsxMTkyLDkgQEAgdTMy IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCiAvKiBpbnRlbF9hdWRpby5jICovCiB2b2lkIGludGVsX2luaXRfYXVkaW9f aG9va3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLXZvaWQgaW50ZWxfYXVk aW9fY29kZWNfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKTsKK3ZvaWQgaW50 ZWxfYXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAorCQkJ ICAgICAgY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQkgICAg ICBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSk7CiB2b2lkIGlu dGVsX2F1ZGlvX2NvZGVjX2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpOwog dm9pZCBpOTE1X2F1ZGlvX2NvbXBvbmVudF9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7CiB2b2lkIGk5MTVfYXVkaW9fY29tcG9uZW50X2NsZWFudXAoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwppbmRleCBl ZjQzMjQ0YTg4NGYuLmZkNjQzOWEyODgyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYwpA QCAtOTg0LDcgKzk4NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2VuYWJsZV9oZG1pX2F1ZGlvKHN0 cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCVdBUk5fT04oIWNydGMtPmNvbmZpZy0+aGFz X2hkbWlfc2luayk7CiAJRFJNX0RFQlVHX0RSSVZFUigiRW5hYmxpbmcgSERNSSBhdWRpbyBvbiBw aXBlICVjXG4iLAogCQkJIHBpcGVfbmFtZShjcnRjLT5waXBlKSk7Ci0JaW50ZWxfYXVkaW9fY29k ZWNfZW5hYmxlKGVuY29kZXIpOworCWludGVsX2F1ZGlvX2NvZGVjX2VuYWJsZShlbmNvZGVyLCBw aXBlX2NvbmZpZywgY29ubl9zdGF0ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGc0eF9lbmFibGVfaGRt aShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKLS0gCjIuNy40CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK