From: Ander Conselvan de Oliveira Subject: [PATCH 2/9] drm/i915: Convert shared dpll reference count to a crtc mask Date: Wed, 29 Oct 2014 11:32:31 +0200 Message-ID: <1414575158-28148-3-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1414575158-28148-1-git-send-email-ander.conselvan.de.oliveira@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 24DEE6E4E8 for ; Wed, 29 Oct 2014 02:33:30 -0700 (PDT) In-Reply-To: <1414575158-28148-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira , ville.syrjala@intel.com, shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyB3aWxsIGJlIHVzZWQgaW4gYSBmb2xsb3cgdXAgcGF0Y2ggdG8gcHJvcGVybHkgcmVsZWFz ZSBzaGFyZWQgRFBMTHMKd2l0aG91dCByZWx5aW5nIG9uIHRoZSBzaGFyZWRfZHBsbCBmaWVsZCBp biBwaXBlX2NvbmZpZy4KCnYyOiBGaXggd2hpdGUgc3BhY2UgZXJyb3IgKFZpbGxlKQogICAgVXNl IGh3ZWlnaHQzMigpIChWaWxsZSkKClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBP bGl2ZWlyYSA8YW5kZXIuY29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMgfCA1MCArKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDMg ZmlsZXMgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCBhNzlmODNjLi5jZTMyYWU3IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMjYzMCw4ICsyNjMwLDggQEAgc3RhdGljIGludCBp OTE1X3NoYXJlZF9kcGxsc19pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQog CQlzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKnBsbCA9ICZkZXZfcHJpdi0+c2hhcmVkX2RwbGxz W2ldOwogCiAJCXNlcV9wcmludGYobSwgIkRQTEwlaTogJXMsIGlkOiAlaVxuIiwgaSwgcGxsLT5u YW1lLCBwbGwtPmlkKTsKLQkJc2VxX3ByaW50ZihtLCAiIHJlZmNvdW50OiAlaSwgYWN0aXZlOiAl aSwgb246ICVzXG4iLCBwbGwtPnJlZmNvdW50LAotCQkJICAgcGxsLT5hY3RpdmUsIHllc25vKHBs bC0+b24pKTsKKwkJc2VxX3ByaW50ZihtLCAiIGNydGNfbWFzazogMHglMDh4LCBhY3RpdmU6ICVk LCBvbjogJXNcbiIsCisJCQkgICBwbGwtPmNydGNfbWFzaywgcGxsLT5hY3RpdmUsIHllc25vKHBs bC0+b24pKTsKIAkJc2VxX3ByaW50ZihtLCAiIHRyYWNrZWQgaGFyZHdhcmUgc3RhdGU6XG4iKTsK IAkJc2VxX3ByaW50ZihtLCAiIGRwbGw6ICAgIDB4JTA4eFxuIiwgcGxsLT5od19zdGF0ZS5kcGxs KTsKIAkJc2VxX3ByaW50ZihtLCAiIGRwbGxfbWQ6IDB4JTA4eFxuIiwgcGxsLT5od19zdGF0ZS5k cGxsX21kKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDZhNzM4MDMuLmM1MWY5ZGUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjI3LDcgKzIyNyw3IEBAIHN0cnVjdCBpbnRlbF9k cGxsX2h3X3N0YXRlIHsKIH07CiAKIHN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCB7Ci0JaW50IHJl ZmNvdW50OyAvKiBjb3VudCBvZiBudW1iZXIgb2YgQ1JUQ3Mgc2hhcmluZyB0aGlzIFBMTCAqLwor CXVuc2lnbmVkIGNydGNfbWFzazsgLyogbWFzayBvZiBDUlRDcyBzaGFyaW5nIHRoaXMgUExMICov CiAJaW50IGFjdGl2ZTsgLyogY291bnQgb2YgbnVtYmVyIG9mIGFjdGl2ZSBDUlRDcyAoaS5lLiBE UE1TIG9uKSAqLwogCWJvb2wgb247IC8qIGlzIHRoZSBQTEwgYWN0dWFsbHkgYWN0aXZlPyBEaXNh YmxlZCBkdXJpbmcgbW9kZXNldCAqLwogCWNvbnN0IGNoYXIgKm5hbWU7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOWY1M2ZkNS4uMThhMWI4MyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTc3OSw3ICsxNzc5LDcgQEAgc3RhdGljIHZvaWQgaW50 ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlpZiAoV0FS Tl9PTihwbGwgPT0gTlVMTCkpCiAJCXJldHVybjsKIAotCVdBUk5fT04oIXBsbC0+cmVmY291bnQp OworCVdBUk5fT04oIXBsbC0+Y3J0Y19tYXNrKTsKIAlpZiAocGxsLT5hY3RpdmUgPT0gMCkgewog CQlEUk1fREVCVUdfRFJJVkVSKCJzZXR0aW5nIHVwICVzXG4iLCBwbGwtPm5hbWUpOwogCQlXQVJO X09OKHBsbC0+b24pOwpAQCAtMTgwNiw3ICsxODA2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5h YmxlX3NoYXJlZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWlmIChXQVJOX09OKHBs bCA9PSBOVUxMKSkKIAkJcmV0dXJuOwogCi0JaWYgKFdBUk5fT04ocGxsLT5yZWZjb3VudCA9PSAw KSkKKwlpZiAoV0FSTl9PTihwbGwtPmNydGNfbWFzayA9PSAwKSkKIAkJcmV0dXJuOwogCiAJRFJN X0RFQlVHX0tNUygiZW5hYmxlICVzIChhY3RpdmUgJWQsIG9uPyAlZCkgZm9yIGNydGMgJWRcbiIs CkBAIC0xODM4LDcgKzE4MzgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kaXNhYmxlX3NoYXJlZF9k cGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWlmIChXQVJOX09OKHBsbCA9PSBOVUxMKSkK IAkgICAgICAgcmV0dXJuOwogCi0JaWYgKFdBUk5fT04ocGxsLT5yZWZjb3VudCA9PSAwKSkKKwlp ZiAoV0FSTl9PTihwbGwtPmNydGNfbWFzayA9PSAwKSkKIAkJcmV0dXJuOwogCiAJRFJNX0RFQlVH X0tNUygiZGlzYWJsZSAlcyAoYWN0aXZlICVkLCBvbj8gJWQpIGZvciBjcnRjICVkXG4iLApAQCAt Mzg0MiwxMiArMzg0MiwxMyBAQCB2b2lkIGludGVsX3B1dF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YykKIAlpZiAocGxsID09IE5VTEwpCiAJCXJldHVybjsKIAotCWlmIChwbGwt PnJlZmNvdW50ID09IDApIHsKLQkJV0FSTigxLCAiYmFkICVzIHJlZmNvdW50XG4iLCBwbGwtPm5h bWUpOworCWlmICghKHBsbC0+Y3J0Y19tYXNrICYgKDEgPDwgY3J0Yy0+cGlwZSkpKSB7CisJCVdB Uk4oMSwgImJhZCAlcyBjcnRjIG1hc2tcbiIsIHBsbC0+bmFtZSk7CiAJCXJldHVybjsKIAl9CiAK LQlpZiAoLS1wbGwtPnJlZmNvdW50ID09IDApIHsKKwlwbGwtPmNydGNfbWFzayAmPSB+KDEgPDwg Y3J0Yy0+cGlwZSk7CisJaWYgKHBsbC0+Y3J0Y19tYXNrID09IDApIHsKIAkJV0FSTl9PTihwbGwt Pm9uKTsKIAkJV0FSTl9PTihwbGwtPmFjdGl2ZSk7CiAJfQpAQCAtMzg3NSw3ICszODc2LDcgQEAg c3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCiAJCURSTV9ERUJVR19LTVMoIkNSVEM6JWQgdXNpbmcgcHJlLWFsbG9j YXRlZCAlc1xuIiwKIAkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lKTsKIAot CQlXQVJOX09OKHBsbC0+cmVmY291bnQpOworCQlXQVJOX09OKHBsbC0+Y3J0Y19tYXNrKTsKIAog CQlnb3RvIGZvdW5kOwogCX0KQEAgLTM4ODQsMTQgKzM4ODUsMTUgQEAgc3RydWN0IGludGVsX3No YXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMp CiAJCXBsbCA9ICZkZXZfcHJpdi0+c2hhcmVkX2RwbGxzW2ldOwogCiAJCS8qIE9ubHkgd2FudCB0 byBjaGVjayBlbmFibGVkIHRpbWluZ3MgZmlyc3QgKi8KLQkJaWYgKHBsbC0+cmVmY291bnQgPT0g MCkKKwkJaWYgKHBsbC0+Y3J0Y19tYXNrID09IDApCiAJCQljb250aW51ZTsKIAogCQlpZiAobWVt Y21wKCZjcnRjLT5jb25maWcuZHBsbF9od19zdGF0ZSwgJnBsbC0+aHdfc3RhdGUsCiAJCQkgICBz aXplb2YocGxsLT5od19zdGF0ZSkpID09IDApIHsKLQkJCURSTV9ERUJVR19LTVMoIkNSVEM6JWQg c2hhcmluZyBleGlzdGluZyAlcyAocmVmY291bnQgJWQsIGF0aXZlICVkKVxuIiwKLQkJCQkgICAg ICBjcnRjLT5iYXNlLmJhc2UuaWQsCi0JCQkJICAgICAgcGxsLT5uYW1lLCBwbGwtPnJlZmNvdW50 LCBwbGwtPmFjdGl2ZSk7CisJCQlEUk1fREVCVUdfS01TKCJDUlRDOiVkIHNoYXJpbmcgZXhpc3Rp bmcgJXMgIgorCQkJCSAgICAgICIoY3J0Y19tYXNrIDB4JTA4eCwgYWN0aXZlICVkKVxuIiwKKwkJ CQkgICAgICBjcnRjLT5iYXNlLmJhc2UuaWQsIHBsbC0+bmFtZSwKKwkJCQkgICAgICBwbGwtPmNy dGNfbWFzaywgcGxsLT5hY3RpdmUpOwogCiAJCQlnb3RvIGZvdW5kOwogCQl9CkBAIC0zOTAwLDcg KzM5MDIsNyBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgKmludGVsX2dldF9zaGFyZWRfZHBs bChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkvKiBPayBubyBtYXRjaGluZyB0aW1pbmdzLCBt YXliZSB0aGVyZSdzIGEgZnJlZSBvbmU/ICovCiAJZm9yIChpID0gMDsgaSA8IGRldl9wcml2LT5u dW1fc2hhcmVkX2RwbGw7IGkrKykgewogCQlwbGwgPSAmZGV2X3ByaXYtPnNoYXJlZF9kcGxsc1tp XTsKLQkJaWYgKHBsbC0+cmVmY291bnQgPT0gMCkgeworCQlpZiAocGxsLT5jcnRjX21hc2sgPT0g MCkgewogCQkJRFJNX0RFQlVHX0tNUygiQ1JUQzolZCBhbGxvY2F0ZWQgJXNcbiIsCiAJCQkJICAg ICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBwbGwtPm5hbWUpOwogCQkJZ290byBmb3VuZDsKQEAgLTM5 MTAsMTQgKzM5MTIsMTQgQEAgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRfc2hh cmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJcmV0dXJuIE5VTEw7CiAKIGZvdW5k OgotCWlmIChwbGwtPnJlZmNvdW50ID09IDApCisJaWYgKHBsbC0+Y3J0Y19tYXNrID09IDApCiAJ CXBsbC0+aHdfc3RhdGUgPSBjcnRjLT5jb25maWcuZHBsbF9od19zdGF0ZTsKIAogCWNydGMtPmNv bmZpZy5zaGFyZWRfZHBsbCA9IGk7CiAJRFJNX0RFQlVHX0RSSVZFUigidXNpbmcgJXMgZm9yIHBp cGUgJWNcbiIsIHBsbC0+bmFtZSwKIAkJCSBwaXBlX25hbWUoY3J0Yy0+cGlwZSkpOwogCi0JcGxs LT5yZWZjb3VudCsrOworCXBsbC0+Y3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlwZTsKIAogCXJl dHVybiBwbGw7CiB9CkBAIC0xMDU5NCw5ICsxMDU5Niw5IEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJYWN0aXZlID0gcGxsLT5nZXRfaHdfc3Rh dGUoZGV2X3ByaXYsIHBsbCwgJmRwbGxfaHdfc3RhdGUpOwogCi0JCVdBUk4ocGxsLT5hY3RpdmUg PiBwbGwtPnJlZmNvdW50LAorCQlXQVJOKHBsbC0+YWN0aXZlID4gaHdlaWdodDMyKHBsbC0+Y3J0 Y19tYXNrKSwKIAkJICAgICAibW9yZSBhY3RpdmUgcGxsIHVzZXJzIHRoYW4gcmVmZXJlbmNlczog JWkgdnMgJWlcbiIsCi0JCSAgICAgcGxsLT5hY3RpdmUsIHBsbC0+cmVmY291bnQpOworCQkgICAg IHBsbC0+YWN0aXZlLCBod2VpZ2h0MzIocGxsLT5jcnRjX21hc2spKTsKIAkJV0FSTihwbGwtPmFj dGl2ZSAmJiAhcGxsLT5vbiwKIAkJICAgICAicGxsIGluIGFjdGl2ZSB1c2UgYnV0IG5vdCBvbiBp biBzdyB0cmFja2luZ1xuIik7CiAJCVdBUk4ocGxsLT5vbiAmJiAhcGxsLT5hY3RpdmUsCkBAIC0x MDYxNCw5ICsxMDYxNiw5IEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0YXRlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCVdBUk4ocGxsLT5hY3RpdmUgIT0gYWN0aXZlX2NydGNzLAogCQkgICAgICJw bGwgYWN0aXZlIGNydGNzIG1pc21hdGNoIChleHBlY3RlZCAlaSwgZm91bmQgJWkpXG4iLAogCQkg ICAgIHBsbC0+YWN0aXZlLCBhY3RpdmVfY3J0Y3MpOwotCQlXQVJOKHBsbC0+cmVmY291bnQgIT0g ZW5hYmxlZF9jcnRjcywKKwkJV0FSTihod2VpZ2h0MzIocGxsLT5jcnRjX21hc2spICE9IGVuYWJs ZWRfY3J0Y3MsCiAJCSAgICAgInBsbCBlbmFibGVkIGNydGNzIG1pc21hdGNoIChleHBlY3RlZCAl aSwgZm91bmQgJWkpXG4iLAotCQkgICAgIHBsbC0+cmVmY291bnQsIGVuYWJsZWRfY3J0Y3MpOwor CQkgICAgIGh3ZWlnaHQzMihwbGwtPmNydGNfbWFzayksIGVuYWJsZWRfY3J0Y3MpOwogCiAJCVdB Uk4ocGxsLT5vbiAmJiBtZW1jbXAoJnBsbC0+aHdfc3RhdGUsICZkcGxsX2h3X3N0YXRlLAogCQkJ CSAgICAgICBzaXplb2YoZHBsbF9od19zdGF0ZSkpLApAQCAtMTMwNjcsMTYgKzEzMDY5LDE4IEBA IHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCiAJCXBsbC0+b24gPSBwbGwtPmdldF9od19zdGF0ZShkZXZfcHJpdiwgcGxs LCAmcGxsLT5od19zdGF0ZSk7CiAJCXBsbC0+YWN0aXZlID0gMDsKKwkJcGxsLT5jcnRjX21hc2sg PSAwOwogCQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0YykgewotCQkJaWYgKGNydGMtPmFj dGl2ZSAmJiBpbnRlbF9jcnRjX3RvX3NoYXJlZF9kcGxsKGNydGMpID09IHBsbCkKKwkJCWlmIChj cnRjLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChjcnRjKSA9PSBwbGwpIHsK IAkJCQlwbGwtPmFjdGl2ZSsrOworCQkJCXBsbC0+Y3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlw ZTsKKwkJCX0KIAkJfQotCQlwbGwtPnJlZmNvdW50ID0gcGxsLT5hY3RpdmU7CiAKLQkJRFJNX0RF QlVHX0tNUygiJXMgaHcgc3RhdGUgcmVhZG91dDogcmVmY291bnQgJWksIG9uICVpXG4iLAotCQkJ ICAgICAgcGxsLT5uYW1lLCBwbGwtPnJlZmNvdW50LCBwbGwtPm9uKTsKKwkJRFJNX0RFQlVHX0tN UygiJXMgaHcgc3RhdGUgcmVhZG91dDogY3J0Y19tYXNrIDB4JTA4eCwgb24gJWlcbiIsCisJCQkg ICAgICBwbGwtPm5hbWUsIHBsbC0+Y3J0Y19tYXNrLCBwbGwtPm9uKTsKIAotCQlpZiAocGxsLT5y ZWZjb3VudCkKKwkJaWYgKHBsbC0+Y3J0Y19tYXNrKQogCQkJaW50ZWxfZGlzcGxheV9wb3dlcl9n ZXQoZGV2X3ByaXYsIFBPV0VSX0RPTUFJTl9QTExTKTsKIAl9CiAKLS0gCjEuOS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=