From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 05/13] drm/i915: Consolidate get/set_seqno Date: Wed, 29 Jun 2016 16:09:24 +0100 Message-ID: <1467212972-861-5-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: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BD496E720 for ; Wed, 29 Jun 2016 15:09:41 +0000 (UTC) In-Reply-To: <1467212972-861-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+ClJldmlld2Vk LWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAxOCArKy0tLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA4ZDllMmUyNGY2N2QuLmUwZTkw Yjk5YmJjYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjg3 Nyw2ICsyODc3LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICAgICAgc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogewogCWVuZ2luZS0+d3JpdGVfdGFpbCA9IHJpbmdfd3JpdGVfdGFp bDsKKwllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOworCWVuZ2luZS0+c2V0X3Nl cW5vID0gcmluZ19zZXRfc2Vxbm87CiAKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7 CiAJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBnZW42X2FkZF9yZXF1ZXN0OwpAQCAtMjk0MCw4ICsy OTQyLDYgQEAgaW50IGludGVsX2luaXRfcmVuZGVyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBnZW44X3JlbmRlcl9hZGRfcmVxdWVz dDsKIAkJZW5naW5lLT5mbHVzaCA9IGdlbjhfcmVuZGVyX3JpbmdfZmx1c2g7CiAJCWVuZ2luZS0+ aXJxX2VuYWJsZV9tYXNrID0gR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUOwotCQllbmdpbmUtPmdl dF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwotCQllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdfc2V0 X3NlcW5vOwogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJ CVdBUk5fT04oIWRldl9wcml2LT5zZW1hcGhvcmVfb2JqKTsKIAkJCWVuZ2luZS0+c2VtYXBob3Jl LnN5bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKQEAgLTI5NTQsOCArMjk1NCw2IEBAIGludCBpbnRl bF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAo SVNfR0VONihkZXZfcHJpdikpCiAJCQllbmdpbmUtPmZsdXNoID0gZ2VuNl9yZW5kZXJfcmluZ19m bHVzaDsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9SRU5ERVJfVVNFUl9JTlRFUlJV UFQ7Ci0JCWVuZ2luZS0+Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87Ci0JCWVuZ2luZS0+c2V0 X3NlcW5vID0gcmluZ19zZXRfc2Vxbm87CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVk KGRldl9wcml2KSkgewogCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmluZ19z eW5jOwogCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7CkBAIC0yOTg5 LDggKzI5ODcsNiBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAkJCWVuZ2luZS0+Zmx1c2ggPSBnZW4yX3JlbmRlcl9yaW5nX2ZsdXNo OwogCQllbHNlCiAJCQllbmdpbmUtPmZsdXNoID0gZ2VuNF9yZW5kZXJfcmluZ19mbHVzaDsKLQkJ ZW5naW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKLQkJZW5naW5lLT5zZXRfc2Vxbm8g PSByaW5nX3NldF9zZXFubzsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBJOTE1X1VTRVJf SU5URVJSVVBUOwogCX0KIApAQCAtMzA1OSw4ICszMDU1LDYgQEAgaW50IGludGVsX2luaXRfYnNk X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWlmIChJU19HRU42KGRldl9w cml2KSkKIAkJCWVuZ2luZS0+d3JpdGVfdGFpbCA9IGdlbjZfYnNkX3Jpbmdfd3JpdGVfdGFpbDsK IAkJZW5naW5lLT5mbHVzaCA9IGdlbjZfYnNkX3JpbmdfZmx1c2g7Ci0JCWVuZ2luZS0+Z2V0X3Nl cW5vID0gcmluZ19nZXRfc2Vxbm87Ci0JCWVuZ2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vx bm87CiAJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJCWVuZ2luZS0+aXJxX2Vu YWJsZV9tYXNrID0KIAkJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgR0VOOF9WQ1MxX0lS UV9TSElGVDsKQEAgLTMwOTMsOCArMzA4Nyw2IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0gZWxzZSB7CiAJCWVuZ2luZS0+bW1pb19i YXNlID0gQlNEX1JJTkdfQkFTRTsKIAkJZW5naW5lLT5mbHVzaCA9IGJzZF9yaW5nX2ZsdXNoOwot CQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwotCQllbmdpbmUtPnNldF9zZXFu byA9IHJpbmdfc2V0X3NlcW5vOwogCQlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJCWVuZ2lu ZS0+aXJxX2VuYWJsZV9tYXNrID0gSUxLX0JTRF9VU0VSX0lOVEVSUlVQVDsKIAkJfSBlbHNlIHsK QEAgLTMxMjQsOCArMzExNiw2IEBAIGludCBpbnRlbF9pbml0X2JzZDJfcmluZ19idWZmZXIoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2 LCBlbmdpbmUpOwogCiAJZW5naW5lLT5mbHVzaCA9IGdlbjZfYnNkX3JpbmdfZmx1c2g7Ci0JZW5n aW5lLT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKLQllbmdpbmUtPnNldF9zZXFubyA9IHJp bmdfc2V0X3NlcW5vOwogCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KIAkJCUdUX1JFTkRFUl9V U0VSX0lOVEVSUlVQVCA8PCBHRU44X1ZDUzJfSVJRX1NISUZUOwogCWVuZ2luZS0+ZGlzcGF0Y2hf ZXhlY2J1ZmZlciA9CkBAIC0zMTU0LDggKzMxNDQsNiBAQCBpbnQgaW50ZWxfaW5pdF9ibHRfcmlu Z19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1 bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5naW5lLT5mbHVzaCA9IGdlbjZfcmluZ19mbHVz aDsKLQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwotCWVuZ2luZS0+c2V0X3Nl cW5vID0gcmluZ19zZXRfc2Vxbm87CiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewog CQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQlHVF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQg PDwgR0VOOF9CQ1NfSVJRX1NISUZUOwpAQCAtMzIwOSw4ICszMTk3LDYgQEAgaW50IGludGVsX2lu aXRfdmVib3hfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9yaW5n X2RlZmF1bHRfdmZ1bmNzKGRldl9wcml2LCBlbmdpbmUpOwogCiAJZW5naW5lLT5mbHVzaCA9IGdl bjZfcmluZ19mbHVzaDsKLQllbmdpbmUtPmdldF9zZXFubyA9IHJpbmdfZ2V0X3NlcW5vOwotCWVu Z2luZS0+c2V0X3NlcW5vID0gcmluZ19zZXRfc2Vxbm87CiAKIAlpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA4KSB7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KLS0gCjEuOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK