From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 4/5] drm/i915: Make more use of the shared engine irq setup Date: Fri, 1 Jul 2016 17:47:14 +0100 Message-ID: <1467391635-9902-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467391635-9902-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id E22D06E1CE for ; Fri, 1 Jul 2016 16:47:21 +0000 (UTC) In-Reply-To: <1467391635-9902-1-git-send-email-tvrtko.ursulin@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClVzZSBpdCBm b3IgbGVnYWN5IGVuZ2luZSBpbml0aWFsaXphdGlvbiBieSBhZGRpbmcgYQppbnRlbF9yaW5nX2Rl ZmF1bHRfaXJxcyBoZWxwZXIgdXNlZCBieSBpbmRpdmlkdWFsIGVuZ2luZXMuCgpTaWduZWQtb2Zm LWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDM2ICsrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDIwIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCBh MDBhZGMzNDM4ZjMuLjk2NDc3NmJiMTgxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYwpAQCAtMjM5NCw4ICsyMzk0LDYgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3Jp bmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJbWVtc2V0KGVuZ2luZS0+c2VtYXBo b3JlLnN5bmNfc2Vxbm8sIDAsCiAJICAgICAgIHNpemVvZihlbmdpbmUtPnNlbWFwaG9yZS5zeW5j X3NlcW5vKSk7CiAKLQlpbml0X3dhaXRxdWV1ZV9oZWFkKCZlbmdpbmUtPmlycV9xdWV1ZSk7Ci0K IAkvKiBXZSBtYXkgbmVlZCB0byBkbyB0aGluZ3Mgd2l0aCB0aGUgc2hyaW5rZXIgd2hpY2gKIAkg KiByZXF1aXJlIHVzIHRvIGltbWVkaWF0ZWx5IHN3aXRjaCBiYWNrIHRvIHRoZSBkZWZhdWx0CiAJ ICogY29udGV4dC4gVGhpcyBjYW4gY2F1c2UgYSBwcm9ibGVtIGFzIHBpbm5pbmcgdGhlCkBAIC0z MDMzLDYgKzMwMzEsMTMgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJaW50ZWxfcmluZ19pbml0X3NlbWFw aG9yZXMoZGV2X3ByaXYsIGVuZ2luZSk7CiB9CiAKK3N0YXRpYyB2b2lkCitpbnRlbF9yaW5nX2Rl ZmF1bHRfaXJxcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJZW5naW5lLT5p cnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgZW5naW5lLT5pcnFf c2hpZnQ7CisJaW5pdF93YWl0cXVldWVfaGVhZCgmZW5naW5lLT5pcnFfcXVldWUpOworfQorCiBp bnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+ aTkxNTsKQEAgLTMwNDAsMTIgKzMwNDUsMTIgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3Jpbmdf YnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlpbnQgcmV0OwogCiAJaW50 ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKKwlpbnRlbF9yaW5nX2Rl ZmF1bHRfaXJxcyhlbmdpbmUpOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewog CQllbmdpbmUtPmluaXRfY29udGV4dCA9IGludGVsX3Jjc19jdHhfaW5pdDsKIAkJZW5naW5lLT5h ZGRfcmVxdWVzdCA9IGdlbjhfcmVuZGVyX2FkZF9yZXF1ZXN0OwogCQllbmdpbmUtPmZsdXNoID0g Z2VuOF9yZW5kZXJfcmluZ19mbHVzaDsKLQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9S RU5ERVJfVVNFUl9JTlRFUlJVUFQ7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRl dl9wcml2KSkKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjhfcmNzX3NpZ25hbDsK IAl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgewpAQCAtMzA1MywxNCArMzA1 OCwxMiBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogCQllbmdpbmUtPmZsdXNoID0gZ2VuN19yZW5kZXJfcmluZ19mbHVz aDsKIAkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKQogCQkJZW5naW5lLT5mbHVzaCA9IGdlbjZfcmVu ZGVyX3JpbmdfZmx1c2g7Ci0JCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gR1RfUkVOREVSX1VT RVJfSU5URVJSVVBUOwogCX0gZWxzZSBpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJZW5naW5l LT5hZGRfcmVxdWVzdCA9IHBjX3JlbmRlcl9hZGRfcmVxdWVzdDsKIAkJZW5naW5lLT5mbHVzaCA9 IGdlbjRfcmVuZGVyX3JpbmdfZmx1c2g7CiAJCWVuZ2luZS0+Z2V0X3NlcW5vID0gcGNfcmVuZGVy X2dldF9zZXFubzsKIAkJZW5naW5lLT5zZXRfc2Vxbm8gPSBwY19yZW5kZXJfc2V0X3NlcW5vOwot CQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCB8Ci0J CQkJCUdUX1JFTkRFUl9QSVBFQ1RMX05PVElGWV9JTlRFUlJVUFQ7CisJCWVuZ2luZS0+aXJxX2Vu YWJsZV9tYXNrIHw9IEdUX1JFTkRFUl9QSVBFQ1RMX05PVElGWV9JTlRFUlJVUFQ7CiAJfSBlbHNl IHsKIAkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA0KQogCQkJZW5naW5lLT5mbHVzaCA9IGdl bjJfcmVuZGVyX3JpbmdfZmx1c2g7CkBAIC0zMTEyLDE2ICszMTE1LDE0IEBAIGludCBpbnRlbF9p bml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCiAJaW50ZWxf cmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKKwlpbnRlbF9yaW5nX2RlZmF1 bHRfaXJxcyhlbmdpbmUpOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgewogCQkv KiBnZW42IGJzZCBuZWVkcyBhIHNwZWNpYWwgd2EgZm9yIHRhaWwgdXBkYXRlcyAqLwogCQlpZiAo SVNfR0VONihkZXZfcHJpdikpCiAJCQllbmdpbmUtPndyaXRlX3RhaWwgPSBnZW42X2JzZF9yaW5n X3dyaXRlX3RhaWw7CiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2ZsdXNoOwotCQlp ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQotCQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sg PQotCQkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X1ZDUzFfSVJRX1NISUZUOwot CQllbHNlCisJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkKIAkJCWVuZ2luZS0+aXJxX2Vu YWJsZV9tYXNrID0gR1RfQlNEX1VTRVJfSU5URVJSVVBUOwogCX0gZWxzZSB7CiAJCWVuZ2luZS0+ bW1pb19iYXNlID0gQlNEX1JJTkdfQkFTRTsKQEAgLTMxNDMsMTAgKzMxNDQsOSBAQCBpbnQgaW50 ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAKIAlp bnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOworCWludGVsX3Jpbmdf ZGVmYXVsdF9pcnFzKGVuZ2luZSk7CiAKIAllbmdpbmUtPmZsdXNoID0gZ2VuNl9ic2RfcmluZ19m bHVzaDsKLQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9Ci0JCQlHVF9SRU5ERVJfVVNFUl9JTlRF UlJVUFQgPDwgR0VOOF9WQ1MyX0lSUV9TSElGVDsKIAogCXJldHVybiBpbnRlbF9pbml0X3Jpbmdf YnVmZmVyKGRldl9wcml2LT5kZXYsIGVuZ2luZSk7CiB9CkBAIC0zMTU2LDEyICszMTU2LDEwIEBA IGludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1 OwogCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKKwlpbnRl bF9yaW5nX2RlZmF1bHRfaXJxcyhlbmdpbmUpOwogCiAJZW5naW5lLT5mbHVzaCA9IGdlbjZfcmlu Z19mbHVzaDsKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KQotCQllbmdpbmUtPmlycV9l bmFibGVfbWFzayA9Ci0JCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9CQ1NfSVJR X1NISUZUOwotCWVsc2UKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDgpCiAJCWVuZ2luZS0+ aXJxX2VuYWJsZV9tYXNrID0gR1RfQkxUX1VTRVJfSU5URVJSVVBUOwogCiAJcmV0dXJuIGludGVs X2luaXRfcmluZ19idWZmZXIoZGV2X3ByaXYtPmRldiwgZW5naW5lKTsKQEAgLTMxNzIsMTMgKzMx NzAsMTEgQEAgaW50IGludGVsX2luaXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVu Z2luZS0+aTkxNTsKIAogCWludGVsX3JpbmdfZGVmYXVsdF92ZnVuY3MoZGV2X3ByaXYsIGVuZ2lu ZSk7CisJaW50ZWxfcmluZ19kZWZhdWx0X2lycXMoZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2gg PSBnZW42X3JpbmdfZmx1c2g7CiAKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7Ci0J CWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KLQkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8 PCBHRU44X1ZFQ1NfSVJRX1NISUZUOwotCX0gZWxzZSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPCA4KSB7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gUE1fVkVCT1hfVVNFUl9JTlRF UlJVUFQ7CiAJCWVuZ2luZS0+aXJxX2dldCA9IGhzd192ZWJveF9nZXRfaXJxOwogCQllbmdpbmUt PmlycV9wdXQgPSBoc3dfdmVib3hfcHV0X2lycTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK