From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 04/13] drm/i915: Consolidate get and put irq
	vfuncs
Date: Wed, 29 Jun 2016 16:09:23 +0100
Message-ID: <1467212972-861-4-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1467212972-861-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 933EE6E71D
 for <Intel-gfx@lists.freedesktop.org>; Wed, 29 Jun 2016 15:09:40 +0000 (UTC)
In-Reply-To: <1467212972-861-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCnYyOiBDb25z
aXN0ZW50IElOVEVMX0dFTiB2cyBJU19HRU4gdXNhZ2UuIChDaHJpcyBXaWxzb24pCgpTaWduZWQt
b2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdl
ZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgNDYgKysrKysrKysrKysrLS0tLS0t
LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMjkgZGVs
ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGE0
MzkxY2JiYjJiNi4uOGQ5ZTJlMjRmNjdkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5jCkBAIC0yODg0LDYgKzI4ODQsMjMgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19k
ZWZhdWx0X3ZmdW5jcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJfSBlbHNl
IHsKIAkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGk5eHhfYWRkX3JlcXVlc3Q7CiAJfQorCisJaWYg
KElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgeworCQllbmdpbmUtPmlycV9nZXQgPSBnZW44X3Jp
bmdfZ2V0X2lycTsKKwkJZW5naW5lLT5pcnFfcHV0ID0gZ2VuOF9yaW5nX3B1dF9pcnE7CisJfSBl
bHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKKwkJZW5naW5lLT5pcnFfZ2V0ID0g
Z2VuNl9yaW5nX2dldF9pcnE7CisJCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjZfcmluZ19wdXRfaXJx
OworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KSB7CisJCWVuZ2luZS0+aXJx
X2dldCA9IGdlbjVfcmluZ19nZXRfaXJxOworCQllbmdpbmUtPmlycV9wdXQgPSBnZW41X3Jpbmdf
cHV0X2lycTsKKwl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMykgeworCQllbmdp
bmUtPmlycV9nZXQgPSBpOXh4X3JpbmdfZ2V0X2lycTsKKwkJZW5naW5lLT5pcnFfcHV0ID0gaTl4
eF9yaW5nX3B1dF9pcnE7CisJfSBlbHNlIHsKKwkJZW5naW5lLT5pcnFfZ2V0ID0gaTh4eF9yaW5n
X2dldF9pcnE7CisJCWVuZ2luZS0+aXJxX3B1dCA9IGk4eHhfcmluZ19wdXRfaXJxOworCX0KIH0K
IAogaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYpCkBAIC0yOTIyLDggKzI5MzksNiBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZm
ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJZW5naW5lLT5pbml0X2NvbnRleHQgPSBpbnRl
bF9yY3NfY3R4X2luaXQ7CiAJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBnZW44X3JlbmRlcl9hZGRf
cmVxdWVzdDsKIAkJZW5naW5lLT5mbHVzaCA9IGdlbjhfcmVuZGVyX3JpbmdfZmx1c2g7Ci0JCWVu
Z2luZS0+aXJxX2dldCA9IGdlbjhfcmluZ19nZXRfaXJxOwotCQllbmdpbmUtPmlycV9wdXQgPSBn
ZW44X3JpbmdfcHV0X2lycTsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJf
VVNFUl9JTlRFUlJVUFQ7CiAJCWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87CiAJ
CWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vxbm87CkBAIC0yOTM4LDggKzI5NTMsNiBA
QCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl
dikKIAkJZW5naW5lLT5mbHVzaCA9IGdlbjdfcmVuZGVyX3JpbmdfZmx1c2g7CiAJCWlmIChJU19H
RU42KGRldl9wcml2KSkKIAkJCWVuZ2luZS0+Zmx1c2ggPSBnZW42X3JlbmRlcl9yaW5nX2ZsdXNo
OwotCQllbmdpbmUtPmlycV9nZXQgPSBnZW42X3JpbmdfZ2V0X2lycTsKLQkJZW5naW5lLT5pcnFf
cHV0ID0gZ2VuNl9yaW5nX3B1dF9pcnE7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gR1Rf
UkVOREVSX1VTRVJfSU5URVJSVVBUOwogCQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3Nl
cW5vOwogCQllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwpAQCAtMjk2OSw4ICsy
OTgyLDYgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYpCiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW40X3JlbmRlcl9yaW5nX2ZsdXNoOwogCQll
bmdpbmUtPmdldF9zZXFubyA9IHBjX3JlbmRlcl9nZXRfc2Vxbm87CiAJCWVuZ2luZS0+c2V0X3Nl
cW5vID0gcGNfcmVuZGVyX3NldF9zZXFubzsKLQkJZW5naW5lLT5pcnFfZ2V0ID0gZ2VuNV9yaW5n
X2dldF9pcnE7Ci0JCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjVfcmluZ19wdXRfaXJxOwogCQllbmdp
bmUtPmlycV9lbmFibGVfbWFzayA9IEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCB8CiAJCQkJCUdU
X1JFTkRFUl9QSVBFQ1RMX05PVElGWV9JTlRFUlJVUFQ7CiAJfSBlbHNlIHsKQEAgLTI5ODAsMTMg
KzI5OTEsNiBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9k
ZXZpY2UgKmRldikKIAkJCWVuZ2luZS0+Zmx1c2ggPSBnZW40X3JlbmRlcl9yaW5nX2ZsdXNoOwog
CQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwogCQllbmdpbmUtPnNldF9zZXFu
byA9IHJpbmdfc2V0X3NlcW5vOwotCQlpZiAoSVNfR0VOMihkZXZfcHJpdikpIHsKLQkJCWVuZ2lu
ZS0+aXJxX2dldCA9IGk4eHhfcmluZ19nZXRfaXJxOwotCQkJZW5naW5lLT5pcnFfcHV0ID0gaTh4
eF9yaW5nX3B1dF9pcnE7Ci0JCX0gZWxzZSB7Ci0JCQllbmdpbmUtPmlycV9nZXQgPSBpOXh4X3Jp
bmdfZ2V0X2lycTsKLQkJCWVuZ2luZS0+aXJxX3B1dCA9IGk5eHhfcmluZ19wdXRfaXJxOwotCQl9
CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9VU0VSX0lOVEVSUlVQVDsKIAl9CiAK
QEAgLTMwNjAsOCArMzA2NCw2IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJ
CQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBU
IDw8IEdFTjhfVkNTMV9JUlFfU0hJRlQ7Ci0JCQllbmdpbmUtPmlycV9nZXQgPSBnZW44X3Jpbmdf
Z2V0X2lycTsKLQkJCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjhfcmluZ19wdXRfaXJxOwogCQkJZW5n
aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KIAkJCQlnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1
ZmZlcjsKIAkJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewpAQCAt
MzA3MSw4ICszMDczLDYgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYpCiAJCQl9CiAJCX0gZWxzZSB7CiAJCQllbmdpbmUtPmlycV9lbmFibGVf
bWFzayA9IEdUX0JTRF9VU0VSX0lOVEVSUlVQVDsKLQkJCWVuZ2luZS0+aXJxX2dldCA9IGdlbjZf
cmluZ19nZXRfaXJxOwotCQkJZW5naW5lLT5pcnFfcHV0ID0gZ2VuNl9yaW5nX3B1dF9pcnE7CiAJ
CQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPQogCQkJCWdlbjZfcmluZ19kaXNwYXRjaF9l
eGVjYnVmZmVyOwogCQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7
CkBAIC0zMDk3LDEyICszMDk3LDggQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0
cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vx
bm87CiAJCWlmIChJU19HRU41KGRldl9wcml2KSkgewogCQkJZW5naW5lLT5pcnFfZW5hYmxlX21h
c2sgPSBJTEtfQlNEX1VTRVJfSU5URVJSVVBUOwotCQkJZW5naW5lLT5pcnFfZ2V0ID0gZ2VuNV9y
aW5nX2dldF9pcnE7Ci0JCQllbmdpbmUtPmlycV9wdXQgPSBnZW41X3JpbmdfcHV0X2lycTsKIAkJ
fSBlbHNlIHsKIAkJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9CU0RfVVNFUl9JTlRF
UlJVUFQ7Ci0JCQllbmdpbmUtPmlycV9nZXQgPSBpOXh4X3JpbmdfZ2V0X2lycTsKLQkJCWVuZ2lu
ZS0+aXJxX3B1dCA9IGk5eHhfcmluZ19wdXRfaXJxOwogCQl9CiAJCWVuZ2luZS0+ZGlzcGF0Y2hf
ZXhlY2J1ZmZlciA9IGk5NjVfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAl9CkBAIC0zMTMyLDggKzMx
MjgsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYpCiAJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5nX3NldF9zZXFubzsKIAllbmdpbmUtPmly
cV9lbmFibGVfbWFzayA9CiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WQ1My
X0lSUV9TSElGVDsKLQllbmdpbmUtPmlycV9nZXQgPSBnZW44X3JpbmdfZ2V0X2lycTsKLQllbmdp
bmUtPmlycV9wdXQgPSBnZW44X3JpbmdfcHV0X2lycTsKIAllbmdpbmUtPmRpc3BhdGNoX2V4ZWNi
dWZmZXIgPQogCQkJZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJaWYgKGk5MTVfc2Vt
YXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CkBAIC0zMTY1LDggKzMxNTksNiBAQCBpbnQg
aW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAo
SU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0K
IAkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBHRU44X0JDU19JUlFfU0hJRlQ7Ci0JCWVu
Z2luZS0+aXJxX2dldCA9IGdlbjhfcmluZ19nZXRfaXJxOwotCQllbmdpbmUtPmlycV9wdXQgPSBn
ZW44X3JpbmdfcHV0X2lycTsKIAkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9y
aW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVk
KGRldl9wcml2KSkgewogCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhfcmluZ19z
eW5jOwpAQCAtMzE3NSw4ICszMTY3LDYgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVy
KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAl9IGVsc2UgewogCQllbmdpbmUtPmlycV9l
bmFibGVfbWFzayA9IEdUX0JMVF9VU0VSX0lOVEVSUlVQVDsKLQkJZW5naW5lLT5pcnFfZ2V0ID0g
Z2VuNl9yaW5nX2dldF9pcnE7Ci0JCWVuZ2luZS0+aXJxX3B1dCA9IGdlbjZfcmluZ19wdXRfaXJx
OwogCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBnZW42X3JpbmdfZGlzcGF0Y2hfZXhl
Y2J1ZmZlcjsKIAkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJ
CQllbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwgPSBnZW42X3NpZ25hbDsKQEAgLTMyMjUsOCArMzIx
NSw2IEBAIGludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYpCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewogCQllbmdpbmUtPmlycV9l
bmFibGVfbWFzayA9CiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WRUNTX0lS
UV9TSElGVDsKLQkJZW5naW5lLT5pcnFfZ2V0ID0gZ2VuOF9yaW5nX2dldF9pcnE7Ci0JCWVuZ2lu
ZS0+aXJxX3B1dCA9IGdlbjhfcmluZ19wdXRfaXJxOwogCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNi
dWZmZXIgPSBnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAkJaWYgKGk5MTVfc2VtYXBo
b3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJCQllbmdpbmUtPnNlbWFwaG9yZS5zeW5jX3Rv
ID0gZ2VuOF9yaW5nX3N5bmM7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v
bGlzdGluZm8vaW50ZWwtZ2Z4Cg==