From: Dave Gordon Subject: [PATCH v2 6/6] drm/i915/guc: (re)initialise doorbell h/w when enabling GuC submission Date: Fri, 10 Jun 2016 17:51:01 +0100 Message-ID: <1465577461-35616-7-git-send-email-david.s.gordon@intel.com> References: <1465577461-35616-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id BC38D6EDC8 for ; Fri, 10 Jun 2016 16:51:12 +0000 (UTC) In-Reply-To: <1465577461-35616-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 aXJtd2FyZSBtYXkgYmUgbG9hZGVkIGFuZCBzZXQgcnVubmluZyBhdAp0aGlzIHBvaW50LiBCdXQg dGhlbiwgdGhlIGJvb3RlZCBrZXJuZWwgaXMgcmVwbGFjZWQgYnkgdGhlIGhpYmVybmF0ZWQKaW1h Z2UsIGFuZCB0aGlzIHJlc3VtZWQga2VybmVsIHdpbGwgYWxzbyB0cnkgdG8gcmVsb2FkIHRoZSBH dUMgZmlybXdhcmUKKHdoaWNoIHdpbGwgZmFpbCkuIFRvIHJlY292ZXIsIHdlIHJlc2V0IHRoZSBH dUMgYW5kIHRyeSBhZ2FpbiAod2hpY2gKc2hvdWxkIHdvcmspLiBCdXQgdGhpcyBHdUMgcmVzZXQg ZG9lc24ndCBhbHNvIHJlc2V0IHRoZSBkb29yYmVsbApoYXJkd2FyZSwgc28gaXQgY2FuIGJlIGxl ZnQgaW4gYSBzdGF0ZSBpbmNvbnNpc3RlbnQgd2l0aCB0aGF0IGFzc3VtZWQKYnkgdGhlIGRyaXZl ciBhbmQvb3IgdGhlIG5ld2x5LWxvYWRlZCBHdUMgZmlybXdhcmUuCgpJdCB3b3VsZCBiZSBiZXR0 ZXIgaWYgdGhlIEd1QyByZXNldCBhbHNvIGNsZWFyZWQgYWxsIGRvb3JiZWxsIHN0YXRlLApidXQg dGhhdCdzIG5vdCBob3cgdGhlIGhhcmR3YXJlIGN1cnJlbnRseSB3b3JrczsgYWxzbywgdGhlIGRy aXZlciBjYW5ub3QKZGlyZWN0bHkgcmVwcm9ncmFtIHRoZSBkb29yYmVsbCBoYXJkd2FyZSAob25s eSB0aGUgR3VDIGNhbiBkbyB0aGF0KS4KClNvIHRoaXMgcGF0Y2ggY3ljbGVzIHRocm91Z2ggYWxs IGRvb3JiZWxscywgYXNzaWduaW5nIGFuZCByZWxlYXNpbmcgZWFjaAppbiB0dXJuLCBzbyB0aGF0 IGFsbCB0aGUgZG9vcmJlbGwgaGFyZHdhcmUgaXMgbGVmdCBpbiBhIGNvbnNpc3RlbnQKc3RhdGUs IG5vIG1hdHRlciBob3cgaXQgd2FzIHByb2dyYW1tZWQgYnkgdGhlIHByZXZpb3VzbHktcnVubmlu ZyBrZXJuZWwKYW5kL29yIEd1QyBmaXJtd2FyZS4KCnYyOiBkb24ndCB1c2Uga21hcF9hdG9taWMo KSBub3cgdGhhdCBjbGllbnQgcGFnZSAwIGlzIGtlcHQgbWFwcGVkLgoKU2lnbmVkLW9mZi1ieTog RGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgfCA0NCArKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0KIDEgZmlsZSBjaGFuZ2VkLCA0MyBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDE4MzNi ZmQuLjEyMGQyZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1 Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMKQEAgLTY5NCw2ICs2OTQsNDggQEAgc3RhdGljIHZvaWQgZ3VjX2NsaWVudF9mcmVlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJa2ZyZWUoY2xpZW50KTsKIH0KIAorLyoKKyAqIEJvcnJvdyB0 aGUgZmlyc3QgY2xpZW50IHRvIHNldCB1cCAmIHRlYXIgZG93biBldmVyeSBkb29yYmVsbAorICog aW4gdHVybiwgdG8gZW5zdXJlIHRoYXQgYWxsIGRvb3JiZWxsIGgvdyBpcyAocmUpaW5pdGlhbGlz ZWQuCisgKi8KK3N0YXRpYyB2b2lkIGd1Y19pbml0X2Rvb3JiZWxsX2h3KHN0cnVjdCBpbnRlbF9n dWMgKmd1YykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9f aTkxNShndWMpOworCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCA9IGd1Yy0+ZXhlY2J1 Zl9jbGllbnQ7CisJdWludDE2X3QgZGJfaWQsIGk7CisJaW50IGVycjsKKworCWRiX2lkID0gY2xp ZW50LT5kb29yYmVsbF9pZDsKKworCWZvciAoaSA9IDA7IGkgPCBHVUNfTUFYX0RPT1JCRUxMUzsg KytpKSB7CisJCWk5MTVfcmVnX3QgZHJicmVnID0gR0VOOF9EUkJSRUdMKGkpOworCQl1MzIgdmFs dWUgPSBJOTE1X1JFQUQoZHJicmVnKTsKKworCQllcnIgPSBndWNfdXBkYXRlX2Rvb3JiZWxsX2lk KGd1YywgY2xpZW50LCBpKTsKKworCQkvKiBSZXBvcnQgdXBkYXRlIGZhaWx1cmUgb3IgdW5leHBl Y3RlZGx5IGFjdGl2ZSBkb29yYmVsbCAqLworCQlpZiAoZXJyIHx8IChpICE9IGRiX2lkICYmICh2 YWx1ZSAmIEdVQ19ET09SQkVMTF9FTkFCTEVEKSkpCisJCQlEUk1fREVCVUdfRFJJVkVSKCJEb29y YmVsbCAlZCAocmVnIDB4JXgpIHdhcyAweCV4LCBlcnIgJWRcbiIsCisJCQkJCSAgaSwgZHJicmVn LnJlZywgdmFsdWUsIGVycik7CisJfQorCisJLyogUmVzdG9yZSB0byBvcmlnaW5hbCB2YWx1ZSAq LworCWVyciA9IGd1Y191cGRhdGVfZG9vcmJlbGxfaWQoZ3VjLCBjbGllbnQsIGRiX2lkKTsKKwlp ZiAoZXJyKQorCQlEUk1fRVJST1IoIkZhaWxlZCB0byByZXN0b3JlIGRvb3JiZWxsIHRvICVkLCBl cnIgJWRcbiIsCisJCQlkYl9pZCwgZXJyKTsKKworCWZvciAoaSA9IDA7IGkgPCBHVUNfTUFYX0RP T1JCRUxMUzsgKytpKSB7CisJCWk5MTVfcmVnX3QgZHJicmVnID0gR0VOOF9EUkJSRUdMKGkpOwor CQl1MzIgdmFsdWUgPSBJOTE1X1JFQUQoZHJicmVnKTsKKworCQlpZiAoaSAhPSBkYl9pZCAmJiAo dmFsdWUgJiBHVUNfRE9PUkJFTExfRU5BQkxFRCkpCisJCQlEUk1fREVCVUdfRFJJVkVSKCJEb29y YmVsbCAlZCAocmVnIDB4JXgpIGZpbmFsbHkgMHgleFxuIiwKKwkJCQkJICBpLCBkcmJyZWcucmVn LCB2YWx1ZSk7CisKKwl9Cit9CisKIC8qKgogICogZ3VjX2NsaWVudF9hbGxvYygpIC0gQWxsb2Nh dGUgYW4gaTkxNV9ndWNfY2xpZW50CiAgKiBAZGV2Oglkcm0gZGV2aWNlCkBAIC05NTksOCArMTAw MSw4IEBAIGludCBpOTE1X2d1Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCX0KIAogCWd1Yy0+ZXhlY2J1Zl9jbGllbnQgPSBjbGllbnQ7Ci0KIAlob3N0Mmd1Y19z YW1wbGVfZm9yY2V3YWtlKGd1YywgY2xpZW50KTsKKwlndWNfaW5pdF9kb29yYmVsbF9odyhndWMp OwogCiAJcmV0dXJuIDA7CiB9Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==