From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 04/13] drm/i915: Consolidate get and put irq vfuncs Date: Mon, 27 Jun 2016 15:04:11 +0100 Message-ID: <1467036260-9252-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467036260-9252-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A04E6E2DE for ; Mon, 27 Jun 2016 14:04:55 +0000 (UTC) In-Reply-To: <1467036260-9252-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNDYgKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMjkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4 IGE0MzkxY2JiYjJiNi4uNWRkZGNkZDI1NzBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5jCkBAIC0yODg0LDYgKzI4ODQsMjMgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmlu Z19kZWZhdWx0X3ZmdW5jcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfSBl bHNlIHsKIAkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGk5eHhfYWRkX3JlcXVlc3Q7CiAJfQorCisJ aWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgeworCQllbmdpbmUtPmlycV9nZXQgPSBnZW44 X3JpbmdfZ2V0X2lycTsKKwkJZW5naW5lLT5pcnFfcHV0ID0gZ2VuOF9yaW5nX3B1dF9pcnE7CisJ fSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKKwkJZW5naW5lLT5pcnFfZ2V0 ID0gZ2VuNl9yaW5nX2dldF9pcnE7CisJCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjZfcmluZ19wdXRf aXJxOworCX0gZWxzZSBpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKKwkJZW5naW5lLT5pcnFfZ2V0 ID0gZ2VuNV9yaW5nX2dldF9pcnE7CisJCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjVfcmluZ19wdXRf aXJxOworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAzKSB7CisJCWVuZ2luZS0+ aXJxX2dldCA9IGk5eHhfcmluZ19nZXRfaXJxOworCQllbmdpbmUtPmlycV9wdXQgPSBpOXh4X3Jp bmdfcHV0X2lycTsKKwl9IGVsc2UgaWYgKElTX0dFTjIoZGV2X3ByaXYpKSB7CisJCWVuZ2luZS0+ aXJxX2dldCA9IGk4eHhfcmluZ19nZXRfaXJxOworCQllbmdpbmUtPmlycV9wdXQgPSBpOHh4X3Jp bmdfcHV0X2lycTsKKwl9CiB9CiAKIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtMjkyMiw4ICsyOTM5LDYgQEAgaW50IGludGVsX2lu aXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVuZ2luZS0+ aW5pdF9jb250ZXh0ID0gaW50ZWxfcmNzX2N0eF9pbml0OwogCQllbmdpbmUtPmFkZF9yZXF1ZXN0 ID0gZ2VuOF9yZW5kZXJfYWRkX3JlcXVlc3Q7CiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW44X3JlbmRl cl9yaW5nX2ZsdXNoOwotCQllbmdpbmUtPmlycV9nZXQgPSBnZW44X3JpbmdfZ2V0X2lycTsKLQkJ ZW5naW5lLT5pcnFfcHV0ID0gZ2VuOF9yaW5nX3B1dF9pcnE7CiAJCWVuZ2luZS0+aXJxX2VuYWJs ZV9tYXNrID0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUOwogCQllbmdpbmUtPmdldF9zZXFubyA9 IHJpbmdfZ2V0X3NlcW5vOwogCQllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwpA QCAtMjkzOCw4ICsyOTUzLDYgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW43X3JlbmRlcl9yaW5n X2ZsdXNoOwogCQlpZiAoSVNfR0VONihkZXZfcHJpdikpCiAJCQllbmdpbmUtPmZsdXNoID0gZ2Vu Nl9yZW5kZXJfcmluZ19mbHVzaDsKLQkJZW5naW5lLT5pcnFfZ2V0ID0gZ2VuNl9yaW5nX2dldF9p cnE7Ci0JCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjZfcmluZ19wdXRfaXJxOwogCQllbmdpbmUtPmly cV9lbmFibGVfbWFzayA9IEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVDsKIAkJZW5naW5lLT5nZXRf c2Vxbm8gPSByaW5nX2dldF9zZXFubzsKIAkJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5nX3NldF9z ZXFubzsKQEAgLTI5NjksOCArMjk4Miw2IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1 ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQllbmdpbmUtPmZsdXNoID0gZ2VuNF9yZW5k ZXJfcmluZ19mbHVzaDsKIAkJZW5naW5lLT5nZXRfc2Vxbm8gPSBwY19yZW5kZXJfZ2V0X3NlcW5v OwogCQllbmdpbmUtPnNldF9zZXFubyA9IHBjX3JlbmRlcl9zZXRfc2Vxbm87Ci0JCWVuZ2luZS0+ aXJxX2dldCA9IGdlbjVfcmluZ19nZXRfaXJxOwotCQllbmdpbmUtPmlycV9wdXQgPSBnZW41X3Jp bmdfcHV0X2lycTsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9J TlRFUlJVUFQgfAogCQkJCQlHVF9SRU5ERVJfUElQRUNUTF9OT1RJRllfSU5URVJSVVBUOwogCX0g ZWxzZSB7CkBAIC0yOTgwLDEzICsyOTkxLDYgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3Jpbmdf YnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQllbmdpbmUtPmZsdXNoID0gZ2VuNF9y ZW5kZXJfcmluZ19mbHVzaDsKIAkJZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsK IAkJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5nX3NldF9zZXFubzsKLQkJaWYgKElTX0dFTjIoZGV2 X3ByaXYpKSB7Ci0JCQllbmdpbmUtPmlycV9nZXQgPSBpOHh4X3JpbmdfZ2V0X2lycTsKLQkJCWVu Z2luZS0+aXJxX3B1dCA9IGk4eHhfcmluZ19wdXRfaXJxOwotCQl9IGVsc2UgewotCQkJZW5naW5l LT5pcnFfZ2V0ID0gaTl4eF9yaW5nX2dldF9pcnE7Ci0JCQllbmdpbmUtPmlycV9wdXQgPSBpOXh4 X3JpbmdfcHV0X2lycTsKLQkJfQogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEk5MTVfVVNF Ul9JTlRFUlJVUFQ7CiAJfQogCkBAIC0zMDYwLDggKzMwNjQsNiBAQCBpbnQgaW50ZWxfaW5pdF9i c2RfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOCkgewogCQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJCUdUX1JF TkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X1ZDUzFfSVJRX1NISUZUOwotCQkJZW5naW5lLT5p cnFfZ2V0ID0gZ2VuOF9yaW5nX2dldF9pcnE7Ci0JCQllbmdpbmUtPmlycV9wdXQgPSBnZW44X3Jp bmdfcHV0X2lycTsKIAkJCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9CiAJCQkJZ2VuOF9y aW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxl ZChkZXZfcHJpdikpIHsKQEAgLTMwNzEsOCArMzA3Myw2IEBAIGludCBpbnRlbF9pbml0X2JzZF9y aW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJfQogCQl9IGVsc2UgewogCQkJ ZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CU0RfVVNFUl9JTlRFUlJVUFQ7Ci0JCQllbmdp bmUtPmlycV9nZXQgPSBnZW42X3JpbmdfZ2V0X2lycTsKLQkJCWVuZ2luZS0+aXJxX3B1dCA9IGdl bjZfcmluZ19wdXRfaXJxOwogCQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KIAkJCQln ZW42X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAkJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19l bmFibGVkKGRldl9wcml2KSkgewpAQCAtMzA5NywxMiArMzA5Nyw4IEBAIGludCBpbnRlbF9pbml0 X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQllbmdpbmUtPnNldF9z ZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCQlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJCWVu Z2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSUxLX0JTRF9VU0VSX0lOVEVSUlVQVDsKLQkJCWVuZ2lu ZS0+aXJxX2dldCA9IGdlbjVfcmluZ19nZXRfaXJxOwotCQkJZW5naW5lLT5pcnFfcHV0ID0gZ2Vu NV9yaW5nX3B1dF9pcnE7CiAJCX0gZWxzZSB7CiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9 IEk5MTVfQlNEX1VTRVJfSU5URVJSVVBUOwotCQkJZW5naW5lLT5pcnFfZ2V0ID0gaTl4eF9yaW5n X2dldF9pcnE7Ci0JCQllbmdpbmUtPmlycV9wdXQgPSBpOXh4X3JpbmdfcHV0X2lycTsKIAkJfQog CQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpOTY1X2Rpc3BhdGNoX2V4ZWNidWZmZXI7 CiAJfQpAQCAtMzEzMiw4ICszMTI4LDYgQEAgaW50IGludGVsX2luaXRfYnNkMl9yaW5nX2J1ZmZl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRf c2Vxbm87CiAJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5U RVJSVVBUIDw8IEdFTjhfVkNTMl9JUlFfU0hJRlQ7Ci0JZW5naW5lLT5pcnFfZ2V0ID0gZ2VuOF9y aW5nX2dldF9pcnE7Ci0JZW5naW5lLT5pcnFfcHV0ID0gZ2VuOF9yaW5nX3B1dF9pcnE7CiAJZW5n aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KIAkJCWdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVm ZmVyOwogCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewpAQCAtMzE2 NSw4ICszMTU5LDYgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewogCQllbmdpbmUt PmlycV9lbmFibGVfbWFzayA9CiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9C Q1NfSVJRX1NISUZUOwotCQllbmdpbmUtPmlycV9nZXQgPSBnZW44X3JpbmdfZ2V0X2lycTsKLQkJ ZW5naW5lLT5pcnFfcHV0ID0gZ2VuOF9yaW5nX3B1dF9pcnE7CiAJCWVuZ2luZS0+ZGlzcGF0Y2hf ZXhlY2J1ZmZlciA9IGdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwogCQlpZiAoaTkxNV9z ZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnN5 bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKQEAgLTMxNzUsOCArMzE2Nyw2IEBAIGludCBpbnRlbF9p bml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl9CiAJfSBlbHNl IHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CTFRfVVNFUl9JTlRFUlJVUFQ7Ci0J CWVuZ2luZS0+aXJxX2dldCA9IGdlbjZfcmluZ19nZXRfaXJxOwotCQllbmdpbmUtPmlycV9wdXQg PSBnZW42X3JpbmdfcHV0X2lycTsKIAkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2Vu Nl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFi bGVkKGRldl9wcml2KSkgewogCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWdu YWw7CkBAIC0zMjI1LDggKzMyMTUsNiBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZl cihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgp IHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5URVJS VVBUIDw8IEdFTjhfVkVDU19JUlFfU0hJRlQ7Ci0JCWVuZ2luZS0+aXJxX2dldCA9IGdlbjhfcmlu Z19nZXRfaXJxOwotCQllbmdpbmUtPmlycV9wdXQgPSBnZW44X3JpbmdfcHV0X2lycTsKIAkJZW5n aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7 CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQkJZW5naW5l LT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOwotLSAKMS45LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=