From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 05/13] drm/i915: Consolidate get/set_seqno Date: Mon, 27 Jun 2016 15:04:12 +0100 Message-ID: <1467036260-9252-6-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 EE68E6E2D3 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 dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMTggKystLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggNWRkZGNkZDI1NzBkLi43 NDk2N2U4NGVlZDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAg LTI4NzcsNiArMjg3Nyw4IEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfZGVmYXVsdF92ZnVuY3Mo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJCSAgICAgIHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAllbmdpbmUtPndyaXRlX3RhaWwgPSByaW5nX3dyaXRl X3RhaWw7CisJZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKKwllbmdpbmUtPnNl dF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g NikgewogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gZ2VuNl9hZGRfcmVxdWVzdDsKQEAgLTI5NDAs OCArMjk0Miw2IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gZ2VuOF9yZW5kZXJfYWRkX3Jl cXVlc3Q7CiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW44X3JlbmRlcl9yaW5nX2ZsdXNoOwogCQllbmdp bmUtPmlycV9lbmFibGVfbWFzayA9IEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVDsKLQkJZW5naW5l LT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKLQkJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5n X3NldF9zZXFubzsKIAkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7 CiAJCQlXQVJOX09OKCFkZXZfcHJpdi0+c2VtYXBob3JlX29iaik7CiAJCQllbmdpbmUtPnNlbWFw aG9yZS5zeW5jX3RvID0gZ2VuOF9yaW5nX3N5bmM7CkBAIC0yOTU0LDggKzI5NTQsNiBAQCBpbnQg aW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ aWYgKElTX0dFTjYoZGV2X3ByaXYpKQogCQkJZW5naW5lLT5mbHVzaCA9IGdlbjZfcmVuZGVyX3Jp bmdfZmx1c2g7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gR1RfUkVOREVSX1VTRVJfSU5U RVJSVVBUOwotCQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwotCQllbmdpbmUt PnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5h YmxlZChkZXZfcHJpdikpIHsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jp bmdfc3luYzsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFsOwpAQCAt Mjk4OSw4ICsyOTg3LDYgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAJCQllbmdpbmUtPmZsdXNoID0gZ2VuMl9yZW5kZXJfcmluZ19m bHVzaDsKIAkJZWxzZQogCQkJZW5naW5lLT5mbHVzaCA9IGdlbjRfcmVuZGVyX3JpbmdfZmx1c2g7 Ci0JCWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87Ci0JCWVuZ2luZS0+c2V0X3Nl cW5vID0gcmluZ19zZXRfc2Vxbm87CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9V U0VSX0lOVEVSUlVQVDsKIAl9CiAKQEAgLTMwNTksOCArMzA1NSw2IEBAIGludCBpbnRlbF9pbml0 X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoSVNfR0VONihk ZXZfcHJpdikpCiAJCQllbmdpbmUtPndyaXRlX3RhaWwgPSBnZW42X2JzZF9yaW5nX3dyaXRlX3Rh aWw7CiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2ZsdXNoOwotCQllbmdpbmUtPmdl dF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwotCQllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0 X3NlcW5vOwogCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CiAJCQllbmdpbmUtPmly cV9lbmFibGVfbWFzayA9CiAJCQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkNT MV9JUlFfU0hJRlQ7CkBAIC0zMDkzLDggKzMwODcsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2Rfcmlu Z19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9IGVsc2UgewogCQllbmdpbmUtPm1t aW9fYmFzZSA9IEJTRF9SSU5HX0JBU0U7CiAJCWVuZ2luZS0+Zmx1c2ggPSBic2RfcmluZ19mbHVz aDsKLQkJZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKLQkJZW5naW5lLT5zZXRf c2Vxbm8gPSByaW5nX3NldF9zZXFubzsKIAkJaWYgKElTX0dFTjUoZGV2X3ByaXYpKSB7CiAJCQll bmdpbmUtPmlycV9lbmFibGVfbWFzayA9IElMS19CU0RfVVNFUl9JTlRFUlJVUFQ7CiAJCX0gZWxz ZSB7CkBAIC0zMTI0LDggKzMxMTYsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVy KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZf cHJpdiwgZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2ZsdXNoOwot CWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87Ci0JZW5naW5lLT5zZXRfc2Vxbm8g PSByaW5nX3NldF9zZXFubzsKIAllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQlHVF9SRU5E RVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WQ1MyX0lSUV9TSElGVDsKIAllbmdpbmUtPmRpc3Bh dGNoX2V4ZWNidWZmZXIgPQpAQCAtMzE1NCw4ICszMTQ0LDYgQEAgaW50IGludGVsX2luaXRfYmx0 X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfcmluZ19kZWZhdWx0 X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X3Jpbmdf Zmx1c2g7Ci0JZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKLQllbmdpbmUtPnNl dF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgp IHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5URVJS VVBUIDw8IEdFTjhfQkNTX0lSUV9TSElGVDsKQEAgLTMyMDksOCArMzE5Nyw2IEBAIGludCBpbnRl bF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJaW50ZWxf cmluZ19kZWZhdWx0X3ZmdW5jcyhkZXZfcHJpdiwgZW5naW5lKTsKIAogCWVuZ2luZS0+Zmx1c2gg PSBnZW42X3JpbmdfZmx1c2g7Ci0JZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsK LQllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0X3NlcW5vOwogCiAJaWYgKElOVEVMX0dFTihk ZXZfcHJpdikgPj0gOCkgewogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9Ci0tIAoxLjkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==