From: Ville Syrjala Subject: [PATCH 2/2] drm/i915: Remove most encoder->type uses from the audio code Date: Mon, 30 Oct 2017 20:46:54 +0200 Message-ID: <20171030184654.17429-2-ville.syrjala@linux.intel.com> References: <20171030184654.17429-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BAB36E4A2 for ; Mon, 30 Oct 2017 18:47:00 +0000 (UTC) In-Reply-To: <20171030184654.17429-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmVu Y29kZXItPnR5cGUgaXNuJ3QgZ2VucmVhbGx5IHNhZmUgYXJvdW5kIERESSBwb3J0cywgc28gbGV0 J3MKcmVwbGFjZSBzb21lIHVzZXMgaW4gdGhlIGF1ZGlvIGNvZGUgd2l0aCB0aGUgY3J0YyBzdGF0 ZSdzCm91dHB1dF90eXBlcyBpbnN0ZWFkLgoKQWN0dWFsbHkgaW4gdGhlc2UgY2FzZXMgZW5jb2Rl ci0+dHlwZSB3b3VsZCB3b3JrIHNpbmNlIHRoZSBEUApTU1QgY2FzZSBpcyBvbmx5IHJlbGV2YW50 IGZvciBWTFYvQ0hWIGFuZCBlbmNvZGVyLT50eXBlPT1EUAppcyBhIHRoaW5nIG9uIHRob3NlIHBs YXRmb3Jtcy4gVGhlIERQIE1TVCBjYXNlcyB3b3VsZCB3b3JrCmFzIHdlbGwgc2luY2UgTVNUIGVu Y29kZXItPnR5cGU9PURQX01TVCBhbHdheXMuIEJ1dCBJIHRoaW5rCml0J3MgYmVzdCB0byB0cnkg YW5kIG1pbmltaXplIHRoZSBlbmNvZGVyLT50eXBlIHVzZSBpbiBnZW5lcmFsCnRvIGF2b2lkIHNo b3dpbmcgYSBiYWQgZXhhbXBsZSB0byBwZW9wbGUuCgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlr dWxhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJq YWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRp by5jIHwgNiArKystLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlvLmMKaW5kZXggZTU2NTIwMDM3MjcwLi40 NzA1MTk0YjE5OTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlv LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXVkaW8uYwpAQCAtNjQxLDcgKzY0 MSw3IEBAIHZvaWQgaW50ZWxfYXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVy ICplbmNvZGVyLAogCiAJaWYgKGFjb21wICYmIGFjb21wLT5hdWRpb19vcHMgJiYgYWNvbXAtPmF1 ZGlvX29wcy0+cGluX2VsZF9ub3RpZnkpIHsKIAkJLyogYXVkaW8gZHJpdmVycyBleHBlY3QgcGlw ZSA9IC0xIHRvIGluZGljYXRlIE5vbi1NU1QgY2FzZXMgKi8KLQkJaWYgKGVuY29kZXItPnR5cGUg IT0gSU5URUxfT1VUUFVUX0RQX01TVCkKKwkJaWYgKCFpbnRlbF9jcnRjX2hhc190eXBlKGNydGNf c3RhdGUsIElOVEVMX09VVFBVVF9EUF9NU1QpKQogCQkJcGlwZSA9IC0xOwogCQlhY29tcC0+YXVk aW9fb3BzLT5waW5fZWxkX25vdGlmeShhY29tcC0+YXVkaW9fb3BzLT5hdWRpb19wdHIsCiAJCQkJ CQkgKGludCkgcG9ydCwgKGludCkgcGlwZSk7CkBAIC02NDksNyArNjQ5LDcgQEAgdm9pZCBpbnRl bF9hdWRpb19jb2RlY19lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAKIAlp bnRlbF9scGVfYXVkaW9fbm90aWZ5KGRldl9wcml2LCBwaXBlLCBwb3J0LCBjb25uZWN0b3ItPmVs ZCwKIAkJCSAgICAgICBjcnRjX3N0YXRlLT5wb3J0X2Nsb2NrLAotCQkJICAgICAgIGVuY29kZXIt PnR5cGUgPT0gSU5URUxfT1VUUFVUX0RQKTsKKwkJCSAgICAgICBpbnRlbF9jcnRjX2hhc19kcF9l bmNvZGVyKGNydGNfc3RhdGUpKTsKIH0KIAogLyoqCkBAIC02ODMsNyArNjgzLDcgQEAgdm9pZCBp bnRlbF9hdWRpb19jb2RlY19kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAog CiAJaWYgKGFjb21wICYmIGFjb21wLT5hdWRpb19vcHMgJiYgYWNvbXAtPmF1ZGlvX29wcy0+cGlu X2VsZF9ub3RpZnkpIHsKIAkJLyogYXVkaW8gZHJpdmVycyBleHBlY3QgcGlwZSA9IC0xIHRvIGlu ZGljYXRlIE5vbi1NU1QgY2FzZXMgKi8KLQkJaWYgKGVuY29kZXItPnR5cGUgIT0gSU5URUxfT1VU UFVUX0RQX01TVCkKKwkJaWYgKCFpbnRlbF9jcnRjX2hhc190eXBlKG9sZF9jcnRjX3N0YXRlLCBJ TlRFTF9PVVRQVVRfRFBfTVNUKSkKIAkJCXBpcGUgPSAtMTsKIAkJYWNvbXAtPmF1ZGlvX29wcy0+ cGluX2VsZF9ub3RpZnkoYWNvbXAtPmF1ZGlvX29wcy0+YXVkaW9fcHRyLAogCQkJCQkJIChpbnQp IHBvcnQsIChpbnQpIHBpcGUpOwotLSAKMi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK