From: Jani Nikula Subject: [PATCH 2/2] drm/i915/audio: do not mess with audio registers if port is invalid Date: Mon, 4 May 2015 17:20:49 +0300 Message-ID: <1430749249-15565-2-git-send-email-jani.nikula@intel.com> References: <1430749249-15565-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 73FF7897F0 for ; Mon, 4 May 2015 07:18:49 -0700 (PDT) In-Reply-To: <1430749249-15565-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@intel.com List-Id: intel-gfx@lists.freedesktop.org V2Ugc2hvdWxkIG5vIGxvbmdlciBlbnRlciB0aGUgY29kZWMgZW5hYmxlL2Rpc2FibGUgZnVuY3Rp b25zIGluIHF1ZXN0aW9uCndpdGggcG9ydCBBIGFueXdheSwgYnV0IHRvIGVyciBvbiB0aGUgc2Fm ZSBzaWRlLCBrZWVwIHRoZSB3YXJuaW5ncy4gSnVzdApiYWlsIG91dCBlYXJseSB3aXRob3V0IG1l c3Npbmcgd2l0aCB0aGUgcmVnaXN0ZXJzLgoKU2lnbmVkLW9mZi1ieTogSmFuaSBOaWt1bGEgPGph bmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRp by5jIHwgMjAgKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGluc2VydGlv bnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2F1ZGlvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdWRpby5jCmluZGV4 IGY3MmU5M2E0NWUxMS4uYzQzMTIxNzdiMGVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9hdWRpby5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F1ZGlv LmMKQEAgLTI2OSw2ICsyNjksOSBAQCBzdGF0aWMgdm9pZCBpbGtfYXVkaW9fY29kZWNfZGlzYWJs ZShzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlEUk1fREVCVUdfS01TKCJEaXNhYmxl IGF1ZGlvIGNvZGVjIG9uIHBvcnQgJWMsIHBpcGUgJWNcbiIsCiAJCSAgICAgIHBvcnRfbmFtZShw b3J0KSwgcGlwZV9uYW1lKHBpcGUpKTsKIAorCWlmIChXQVJOX09OKHBvcnQgPT0gUE9SVF9BKSkK KwkJcmV0dXJuOworCiAJaWYgKEhBU19QQ0hfSUJYKGRldl9wcml2LT5kZXYpKSB7CiAJCWF1ZF9j b25maWcgPSBJQlhfQVVEX0NGRyhwaXBlKTsKIAkJYXVkX2NudHJsX3N0MiA9IElCWF9BVURfQ05U TF9TVDI7CkBAIC0yOTAsMTIgKzI5Myw3IEBAIHN0YXRpYyB2b2lkIGlsa19hdWRpb19jb2RlY19k aXNhYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCQl0bXAgfD0gQVVEX0NPTkZJ R19OX1ZBTFVFX0lOREVYOwogCUk5MTVfV1JJVEUoYXVkX2NvbmZpZywgdG1wKTsKIAotCWlmIChX QVJOX09OKCFwb3J0KSkgewotCQllbGR2ID0gSUJYX0VMRF9WQUxJRChQT1JUX0IpIHwgSUJYX0VM RF9WQUxJRChQT1JUX0MpIHwKLQkJCUlCWF9FTERfVkFMSUQoUE9SVF9EKTsKLQl9IGVsc2Ugewot CQllbGR2ID0gSUJYX0VMRF9WQUxJRChwb3J0KTsKLQl9CisJZWxkdiA9IElCWF9FTERfVkFMSUQo cG9ydCk7CiAKIAkvKiBJbnZhbGlkYXRlIEVMRCAqLwogCXRtcCA9IEk5MTVfUkVBRChhdWRfY250 cmxfc3QyKTsKQEAgLTMyNSw2ICszMjMsOSBAQCBzdGF0aWMgdm9pZCBpbGtfYXVkaW9fY29kZWNf ZW5hYmxlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJRFJNX0RFQlVHX0tNUygi RW5hYmxlIGF1ZGlvIGNvZGVjIG9uIHBvcnQgJWMsIHBpcGUgJWMsICV1IGJ5dGVzIEVMRFxuIiwK IAkJICAgICAgcG9ydF9uYW1lKHBvcnQpLCBwaXBlX25hbWUocGlwZSksIGRybV9lbGRfc2l6ZShl bGQpKTsKIAorCWlmIChXQVJOX09OKHBvcnQgPT0gUE9SVF9BKSkKKwkJcmV0dXJuOworCiAJLyoK IAkgKiBGSVhNRTogV2UncmUgc3VwcG9zZWQgdG8gd2FpdCBmb3IgdmJsYW5rIGhlcmUsIGJ1dCB3 ZSBoYXZlIHZibGFua3MKIAkgKiBkaXNhYmxlZCBkdXJpbmcgdGhlIG1vZGUgc2V0LiBUaGUgcHJv cGVyIGZpeCB3b3VsZCBiZSB0byBwdXNoIHRoZQpAQCAtMzQ5LDEyICszNTAsNyBAQCBzdGF0aWMg dm9pZCBpbGtfYXVkaW9fY29kZWNfZW5hYmxlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0 b3IsCiAJCWF1ZF9jbnRybF9zdDIgPSBDUFRfQVVEX0NOVFJMX1NUMjsKIAl9CiAKLQlpZiAoV0FS Tl9PTighcG9ydCkpIHsKLQkJZWxkdiA9IElCWF9FTERfVkFMSUQoUE9SVF9CKSB8IElCWF9FTERf VkFMSUQoUE9SVF9DKSB8Ci0JCQlJQlhfRUxEX1ZBTElEKFBPUlRfRCk7Ci0JfSBlbHNlIHsKLQkJ ZWxkdiA9IElCWF9FTERfVkFMSUQocG9ydCk7Ci0JfQorCWVsZHYgPSBJQlhfRUxEX1ZBTElEKHBv cnQpOwogCiAJLyogSW52YWxpZGF0ZSBFTEQgKi8KIAl0bXAgPSBJOTE1X1JFQUQoYXVkX2NudHJs X3N0Mik7Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK