From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 6/7] drm/i915/guc: (re)initialise doorbell h/w when enabling GuC submission Date: Mon, 21 Mar 2016 10:16:39 +0000 Message-ID: <1458555400-22859-7-git-send-email-david.s.gordon@intel.com> References: <1458555400-22859-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id B41E36E290 for ; Mon, 21 Mar 2016 10:16:57 +0000 (UTC) In-Reply-To: <1458555400-22859-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 YXJlLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNv bT4KQ2M6IEFydW4gU2lsdXZlcnkgPGFydW4uc2lsdXZlcnlAbGludXguaW50ZWwuY29tPgpDYzog QWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jIHwgNDYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiAx IGZpbGUgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCA2YjMwMjA3Li5lYThiOGNi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC03MDcs NiArNzA3LDUwIEBAIHN0YXRpYyB2b2lkIGd1Y19jbGllbnRfZnJlZShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCWtmcmVlKGNsaWVudCk7CiB9CiAKKy8qCisgKiBCb3Jyb3cgdGhlIGZpcnN0IGNs aWVudCB0byBzZXQgdXAgJiB0ZWFyIGRvd24gZXZlcnkgZG9vcmJlbGwKKyAqIGluIHR1cm4sIHRv IGVuc3VyZSB0aGF0IGFsbCBkb29yYmVsbCBoL3cgaXMgKHJlKWluaXRpYWxpc2VkLgorICovCitz dGF0aWMgdm9pZCBndWNfaW5pdF9kb29yYmVsbF9odyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCit7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsK KwlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQgPSBndWMtPmV4ZWNidWZfY2xpZW50Owor CXN0cnVjdCBndWNfZG9vcmJlbGxfaW5mbyAqZG9vcmJlbGw7CisJdWludDE2X3QgZGJfaWQsIGk7 CisJdm9pZCAqYmFzZTsKKwlpbnQgcmV0OworCisJYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2Vt X29iamVjdF9nZXRfcGFnZShjbGllbnQtPmNsaWVudF9vYmosIDApKTsKKwlkb29yYmVsbCA9IGJh c2UgKyBjbGllbnQtPmRvb3JiZWxsX29mZnNldDsKKwlkYl9pZCA9IGNsaWVudC0+ZG9vcmJlbGxf aWQ7CisKKwlmb3IgKGkgPSAwOyBpIDwgR1VDX01BWF9ET09SQkVMTFM7ICsraSkgeworCQlpOTE1 X3JlZ190IGRyYnJlZyA9IEdFTjhfRFJCUkVHTChpKTsKKwkJdTMyIHZhbHVlID0gSTkxNV9SRUFE KGRyYnJlZyk7CisKKwkJcmV0ID0gZ3VjX3VwZGF0ZV9kb29yYmVsbF9pZChjbGllbnQsIGRvb3Ji ZWxsLCBpKTsKKworCQlpZiAoKCh2YWx1ZSAmIEdVQ19ET09SQkVMTF9FTkFCTEVEKSAmJiAoaSAh PSBkYl9pZCkpIHx8IHJldCkKKwkJCURSTV9ERUJVR19EUklWRVIoIkRvb3JiZWxsIHJlZyAweCV4 IHdhcyAweCV4LCByZXQgJWRcbiIsCisJCQkJZHJicmVnLnJlZywgdmFsdWUsIHJldCk7CisJfQor CisJLyogUmVzdG9yZSB0byBvcmlnaW5hbCB2YWx1ZSAqLworCWd1Y191cGRhdGVfZG9vcmJlbGxf aWQoY2xpZW50LCBkb29yYmVsbCwgZGJfaWQpOworCisJZm9yIChpID0gMDsgaSA8IEdVQ19NQVhf RE9PUkJFTExTOyArK2kpIHsKKwkJaTkxNV9yZWdfdCBkcmJyZWcgPSBHRU44X0RSQlJFR0woaSk7 CisJCXUzMiB2YWx1ZSA9IEk5MTVfUkVBRChkcmJyZWcpOworCisJCWlmICgodmFsdWUgJiBHVUNf RE9PUkJFTExfRU5BQkxFRCkgJiYgKGkgIT0gZGJfaWQpKQorCQkJRFJNX0RFQlVHX0RSSVZFUigi RG9vcmJlbGwgcmVnIDB4JXggZmluYWxseSAweCV4XG4iLAorCQkJCQkJZHJicmVnLnJlZywgdmFs dWUpOworCisJfQorCisJa3VubWFwX2F0b21pYyhiYXNlKTsKK30KKwogLyoqCiAgKiBndWNfY2xp ZW50X2FsbG9jKCkgLSBBbGxvY2F0ZSBhbiBpOTE1X2d1Y19jbGllbnQKICAqIEBkZXY6CWRybSBk ZXZpY2UKQEAgLTk3MSw4ICsxMDE1LDggQEAgaW50IGk5MTVfZ3VjX3N1Ym1pc3Npb25fZW5hYmxl KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfQogCiAJZ3VjLT5leGVjYnVmX2NsaWVudCA9IGNs aWVudDsKLQogCWhvc3QyZ3VjX3NhbXBsZV9mb3JjZXdha2UoZ3VjLCBjbGllbnQpOworCWd1Y19p bml0X2Rvb3JiZWxsX2h3KGd1Yyk7CiAKIAlyZXR1cm4gMDsKIH0KLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK