From: Dave Gordon Subject: [PATCH v4 4/6] drm/i915/guc: (re)initialise doorbell h/w when enabling GuC submission Date: Thu, 7 Apr 2016 18:21:16 +0100 Message-ID: <1460049678-21918-5-git-send-email-david.s.gordon@intel.com> References: <1460049678-21918-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 538D16E9EC for ; Thu, 7 Apr 2016 17:21:51 +0000 (UTC) In-Reply-To: <1460049678-21918-1-git-send-email-david.s.gordon@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 RHVyaW5nIGEgaGliZXJuYXRlL3Jlc3VtZSBjeWNsZSwgdGhlIHdob2xlIHN5c3RlbSBpcyByZXNl dCwgaW5jbHVkaW5nCnRoZSBHdUMgYW5kIHRoZSBkb29yYmVsbCBoYXJkd2FyZS4gVGhlbiB0aGUg c3lzdGVtIGlzIGJvb3RlZCB1cCwgZHJpdmVycwphcmUgbG9hZGVkLCBldGMgLS0gdGhlIEd1QyBm aXJtd2FyZSBtYXkgYmUgbG9hZGVkIGFuZCBzZXQgcnVubmluZyBhdCB0aGlzCnBvaW50LiBCdXQg dGhlbiwgdGhlIGJvb3RlZCBrZXJuZWwgaXMgcmVwbGFjZWQgYnkgdGhlIGhpYmVybmF0ZWQgaW1h Z2UsCmFuZCB0aGlzIHJlc3VtZWQga2VybmVsIHdpbGwgYWxzbyB0cnkgdG8gcmVsb2FkIHRoZSBH dUMgZmlybXdhcmUgKHdoaWNoCndpbGwgZmFpbCkuIFRvIHJlY292ZXIsIHdlIHJlc2V0IHRoZSBH dUMgYW5kIHRyeSBhZ2FpbiAod2hpY2ggc2hvdWxkCndvcmspLiBCdXQgdGhpcyBHdUMgcmVzZXQg ZG9lc24ndCBhbHNvIHJlc2V0IHRoZSBkb29yYmVsbCBoYXJkd2FyZSwgc28KaXQgY2FuIGJlIGxl ZnQgaW4gYSBzdGF0ZSBpbmNvbnNpc3RlbnQgd2l0aCB0aGF0IGFzc3VtZWQgYnkgdGhlIGRyaXZl cgphbmQgdGhlIEd1Qy4KCkl0IHdvdWxkIGJlIGJldHRlciBpZiB0aGUgR3VDIHJlc2V0IGFsc28g Y2xlYXJlZCBhbGwgZG9vcmJlbGwgc3RhdGUsCmJ1dCB0aGF0J3Mgbm90IGhvdyB0aGUgaGFyZHdh cmUgY3VycmVudGx5IHdvcmtzOyBhbHNvLCB0aGUgZHJpdmVyIGNhbm5vdApkaXJlY3RseSByZXBy b2dyYW0gdGhlIGRvb3JiZWxsIGhhcmR3YXJlIChvbmx5IHRoZSBHdUMgY2FuIGRvIHRoYXQpLgoK U28gdGhpcyBwYXRjaCBjeWNsZXMgdGhyb3VnaCBhbGwgZG9vcmJlbGxzLCBhc3NpZ25pbmcgYW5k IHJlbGVhc2luZyBlYWNoCmluIHR1cm4sIHNvIHRoYXQgYWxsIHRoZSBkb29yYmVsbCBoYXJkd2Fy ZSBpcyBsZWZ0IGluIGEgY29uc2lzdGVudCBzdGF0ZSwKbm8gbWF0dGVyIGhvdyBpdCB3YXMgcHJv Z3JhbW1lZCBieSB0aGUgcHJldmlvdXNseS1ydW5uaW5nIGtlcm5lbCBhbmQvb3IKR3VDIGZpcm13 YXJlLgoKVGhpcyBwYXRjaCBjYW4gYmUgcmVtb3ZlZCBpZi93aGVuIHRoZSBHdUMgZmlybXdhcmUg aXMgdXBkYXRlZCBzbyB0aGF0IGl0CihyZSlpbml0aWFsaXNlcyB0aGUgZG9vcmJlbGwgaGFyZHdh cmUgYWZ0ZXIgZXZlcnkgZmlybXdhcmUgKHJlKWxvYWQuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdv cmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDQ2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr LQogMSBmaWxlIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMmZjNjlmMS4uZjQ2 NmVhYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lv bi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAt NzA3LDYgKzcwNyw1MCBAQCBzdGF0aWMgdm9pZCBndWNfY2xpZW50X2ZyZWUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAlrZnJlZShjbGllbnQpOwogfQogCisvKgorICogQm9ycm93IHRoZSBmaXJz dCBjbGllbnQgdG8gc2V0IHVwICYgdGVhciBkb3duIGV2ZXJ5IGRvb3JiZWxsCisgKiBpbiB0dXJu LCB0byBlbnN1cmUgdGhhdCBhbGwgZG9vcmJlbGwgaC93IGlzIChyZSlpbml0aWFsaXNlZC4KKyAq Lworc3RhdGljIHZvaWQgZ3VjX2luaXRfZG9vcmJlbGxfaHcoc3RydWN0IGludGVsX2d1YyAqZ3Vj KQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19pOTE1KGd1 Yyk7CisJc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50ID0gZ3VjLT5leGVjYnVmX2NsaWVu dDsKKwlzdHJ1Y3QgZ3VjX2Rvb3JiZWxsX2luZm8gKmRvb3JiZWxsOworCXVpbnQxNl90IGRiX2lk LCBpOworCXZvaWQgKmJhc2U7CisJaW50IHJldDsKKworCWJhc2UgPSBrbWFwX2F0b21pYyhpOTE1 X2dlbV9vYmplY3RfZ2V0X3BhZ2UoY2xpZW50LT5jbGllbnRfb2JqLCAwKSk7CisJZG9vcmJlbGwg PSBiYXNlICsgY2xpZW50LT5kb29yYmVsbF9vZmZzZXQ7CisJZGJfaWQgPSBjbGllbnQtPmRvb3Ji ZWxsX2lkOworCisJZm9yIChpID0gMDsgaSA8IEdVQ19NQVhfRE9PUkJFTExTOyArK2kpIHsKKwkJ aTkxNV9yZWdfdCBkcmJyZWcgPSBHRU44X0RSQlJFR0woaSk7CisJCXUzMiB2YWx1ZSA9IEk5MTVf UkVBRChkcmJyZWcpOworCisJCXJldCA9IGd1Y191cGRhdGVfZG9vcmJlbGxfaWQoY2xpZW50LCBk b29yYmVsbCwgaSk7CisKKwkJaWYgKCgodmFsdWUgJiBHVUNfRE9PUkJFTExfRU5BQkxFRCkgJiYg KGkgIT0gZGJfaWQpKSB8fCByZXQpCisJCQlEUk1fREVCVUdfRFJJVkVSKCJEb29yYmVsbCByZWcg MHgleCB3YXMgMHgleCwgcmV0ICVkXG4iLAorCQkJCWRyYnJlZy5yZWcsIHZhbHVlLCByZXQpOwor CX0KKworCS8qIFJlc3RvcmUgdG8gb3JpZ2luYWwgdmFsdWUgKi8KKwlndWNfdXBkYXRlX2Rvb3Ji ZWxsX2lkKGNsaWVudCwgZG9vcmJlbGwsIGRiX2lkKTsKKworCWZvciAoaSA9IDA7IGkgPCBHVUNf TUFYX0RPT1JCRUxMUzsgKytpKSB7CisJCWk5MTVfcmVnX3QgZHJicmVnID0gR0VOOF9EUkJSRUdM KGkpOworCQl1MzIgdmFsdWUgPSBJOTE1X1JFQUQoZHJicmVnKTsKKworCQlpZiAoKHZhbHVlICYg R1VDX0RPT1JCRUxMX0VOQUJMRUQpICYmIChpICE9IGRiX2lkKSkKKwkJCURSTV9ERUJVR19EUklW RVIoIkRvb3JiZWxsIHJlZyAweCV4IGZpbmFsbHkgMHgleFxuIiwKKwkJCQkJCWRyYnJlZy5yZWcs IHZhbHVlKTsKKworCX0KKworCWt1bm1hcF9hdG9taWMoYmFzZSk7Cit9CisKIC8qKgogICogZ3Vj X2NsaWVudF9hbGxvYygpIC0gQWxsb2NhdGUgYW4gaTkxNV9ndWNfY2xpZW50CiAgKiBAZGV2Oglk cm0gZGV2aWNlCkBAIC05NzEsOCArMTAxNSw4IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2Vu YWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0KIAogCWd1Yy0+ZXhlY2J1Zl9jbGllbnQg PSBjbGllbnQ7Ci0KIAlob3N0Mmd1Y19zYW1wbGVfZm9yY2V3YWtlKGd1YywgY2xpZW50KTsKKwln dWNfaW5pdF9kb29yYmVsbF9odyhndWMpOwogCiAJcmV0dXJuIDA7CiB9Ci0tIAoxLjkuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==