From: Matt Roper Subject: [PATCH 4/5] drm/i915: remove intel_pipe_set_base() (v4) Date: Tue, 18 Nov 2014 18:18:48 -0800 Message-ID: <1416363529-2034-5-git-send-email-matthew.d.roper@intel.com> References: <1416363529-2034-1-git-send-email-matthew.d.roper@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 7A52A6EFD1 for ; Tue, 18 Nov 2014 18:21:52 -0800 (PST) In-Reply-To: <1416363529-2034-1-git-send-email-matthew.d.roper@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: Gustavo Padovan List-Id: intel-gfx@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK QWZ0ZXIgc29tZSByZWZhY3RvciBpbnRlbF9wcmltYXJ5X3BsYW5lX3NldHBsYW5lKCkgZG9lcyB0 aGUgc2FtZQphcyBpbnRlbF9waXBlX3NldF9iYXNlKCkgc28gd2UgY2FuIGdldCByaWQgb2YgaXQg YW5kIHJlcGxhY2UgdGhlIGNhbGxzCndpdGggaW50ZWxfcHJpbWFyeV9wbGFuZV9zZXRwbGFuZSgp LgoKdjI6IHRha2UgVmlsbGUncyBjb21tZW50czoKCS0gZ2V0IHRoZSByaWdodCBhcmd1bWVudHMg Zm9yIHVwZGF0ZV9wbGFuZSgpCgktIHVzZSBkcm1fY3J0Y19nZXRfaHZfdGltaW5nKCkKCnYzIChi eSBNYXR0KToKIC0gUmViYXNlIHRvIGxhdGVzdCBkaS1uaWdodGx5IGNvZGViYXNlCiAtIFVzZSBw cmltYXJ5LT5mdW5jcy0+dXBkYXRlX3BsYW5lKCkgaW4gX19pbnRlbF9zZXRfbW9kZSgpCiAtIFVz ZSBwcmltYXJ5LT5mdW5jcy0+ZGlzYWJsZV9wbGFuZSgpIGluIGludGVsX2NydGNfZGlzYWJsZSgp Cgp2NCAoYnkgTWF0dCk6CiAtIERyb3AgcmVkdW5kYW50IGNhbGxzIHRvIGludGVsX2NydGNfd2Fp dF9mb3JfcGVuZGluZ19mbGlwcygpIGJlZm9yZQogICBjYWxsaW5nIHVwZGF0ZV9wbGFuZSgpIChW aWxsZSkKClNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNv bGxhYm9yYS5jby51az4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAx MjkgKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy OCBpbnNlcnRpb25zKCspLCAxMDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IDFjMTg4NmUuLjM0ODI5NDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTI4OTAsNzEgKzI4OTAsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRh dGVfcGlwZV9zaXplKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWNydGMtPmNvbmZpZy5waXBl X3NyY19oID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y192ZGlzcGxheTsKIH0KIAotc3RhdGljIGludAot aW50ZWxfcGlwZV9zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCB4LCBpbnQgeSwK LQkJICAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQotewotCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBjcnRjLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2lu dGVsX2NydGMoY3J0Yyk7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwotCXN0 cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IGNydGMtPnByaW1hcnktPmZiOwotCXN0cnVj dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKG9sZF9mYik7Ci0J aW50IHJldDsKLQotCWlmIChpbnRlbF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAoY3J0YykpIHsKLQkJ RFJNX0VSUk9SKCJwaXBlIGlzIHN0aWxsIGJ1c3kgd2l0aCBhbiBvbGQgcGFnZWZsaXBcbiIpOwot CQlyZXR1cm4gLUVCVVNZOwotCX0KLQotCS8qIG5vIGZiIGJvdW5kICovCi0JaWYgKCFmYikgewot CQlEUk1fRVJST1IoIk5vIEZCIGJvdW5kXG4iKTsKLQkJcmV0dXJuIDA7Ci0JfQotCi0JaWYgKGlu dGVsX2NydGMtPnBsYW5lID4gSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpIHsKLQkJRFJNX0VS Uk9SKCJubyBwbGFuZSBmb3IgY3J0YzogcGxhbmUgJWMsIG51bV9waXBlcyAlZFxuIiwKLQkJCSAg cGxhbmVfbmFtZShpbnRlbF9jcnRjLT5wbGFuZSksCi0JCQkgIElOVEVMX0lORk8oZGV2KS0+bnVt X3BpcGVzKTsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQotCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1 Y3RfbXV0ZXgpOwotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGNydGMtPnByaW1h cnksIGZiLCBOVUxMKTsKLQlpZiAocmV0ID09IDApCi0JCWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9v YmosIGludGVsX2ZiX29iaihmYiksCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBp cGUpKTsKLQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpZiAocmV0ICE9IDAp IHsKLQkJRFJNX0VSUk9SKCJwaW4gJiBmZW5jZSBmYWlsZWRcbiIpOwotCQlyZXR1cm4gcmV0Owot CX0KLQotCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIGZiLCB4 LCB5KTsKLQotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpCi0JCWludGVsX2Zyb250YnVmZmVyX2Zs aXAoZGV2LCBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUpKTsKLQotCWNydGMtPnByaW1h cnktPmZiID0gZmI7Ci0JY3J0Yy0+eCA9IHg7Ci0JY3J0Yy0+eSA9IHk7Ci0KLQlpZiAob2xkX2Zi KSB7Ci0JCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUgJiYgb2xkX2ZiICE9IGZiKQotCQkJaW50ZWxf d2FpdF9mb3JfdmJsYW5rKGRldiwgaW50ZWxfY3J0Yy0+cGlwZSk7Ci0JCW11dGV4X2xvY2soJmRl di0+c3RydWN0X211dGV4KTsKLQkJaW50ZWxfdW5waW5fZmJfb2JqKG9sZF9vYmopOwotCQltdXRl eF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0 cnVjdF9tdXRleCk7Ci0JaW50ZWxfdXBkYXRlX2ZiYyhkZXYpOwotCW11dGV4X3VubG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyB2b2lkIGludGVsX2Zk aV9ub3JtYWxfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5kZXY7CkBAIC01MjY3LDggKzUyMDIsNiBAQCBzdGF0aWMgdm9pZCBp bnRlbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwot CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKGNydGMt PnByaW1hcnktPmZiKTsKLQllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBp cGU7CiAKIAkvKiBjcnRjIHNob3VsZCBzdGlsbCBiZSBlbmFibGVkIHdoZW4gd2UgZGlzYWJsZSBp dC4gKi8KIAlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKQEAgLTUyNzcsMTQgKzUyMTAsNyBAQCBz dGF0aWMgdm9pZCBpbnRlbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlu dGVsX2NydGNfdXBkYXRlX3NhcmVhKGNydGMsIGZhbHNlKTsKIAlkZXZfcHJpdi0+ZGlzcGxheS5v ZmYoY3J0Yyk7CiAKLQlpZiAoY3J0Yy0+cHJpbWFyeS0+ZmIpIHsKLQkJbXV0ZXhfbG9jaygmZGV2 LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX29iaik7Ci0JCWk5MTVf Z2VtX3RyYWNrX2ZiKG9sZF9vYmosIE5VTEwsCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklN QVJZKHBpcGUpKTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWNydGMt PnByaW1hcnktPmZiID0gTlVMTDsKLQl9CisJY3J0Yy0+cHJpbWFyeS0+ZnVuY3MtPmRpc2FibGVf cGxhbmUoY3J0Yy0+cHJpbWFyeSk7CiAKIAkvKiBVcGRhdGUgY29tcHV0ZWQgc3RhdGUuICovCiAJ bGlzdF9mb3JfZWFjaF9lbnRyeShjb25uZWN0b3IsICZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rv cl9saXN0LCBoZWFkKSB7CkBAIC05NTc4LDYgKzk1MDQsOCBAQCBzdGF0aWMgaW50IGludGVsX2Ny dGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpvbGRfZmIgPSBjcnRjLT5wcmltYXJ5LT5mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxf Y3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9 IGNydGMtPnByaW1hcnk7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2lu dGVsX3BsYW5lKHByaW1hcnkpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsK IAlzdHJ1Y3QgaW50ZWxfdW5waW5fd29yayAqd29yazsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nOwpAQCAtOTczNiw4ICs5NjY0LDE1IEBAIGZyZWVfd29yazoKIAogCWlmIChyZXQgPT0g LUVJTykgewogb3V0X2hhbmc6Ci0JCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhj cnRjKTsKLQkJcmV0ID0gaW50ZWxfcGlwZV9zZXRfYmFzZShjcnRjLCBjcnRjLT54LCBjcnRjLT55 LCBmYik7CisJCXJldCA9IHByaW1hcnktPmZ1bmNzLT51cGRhdGVfcGxhbmUocHJpbWFyeSwgY3J0 YywgZmIsCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+Y3J0Y194LAorCQkJCQkJICAgaW50ZWxfcGxh bmUtPmNydGNfeSwKKwkJCQkJCSAgIGludGVsX3BsYW5lLT5jcnRjX2gsCisJCQkJCQkgICBpbnRl bF9wbGFuZS0+Y3J0Y193LAorCQkJCQkJICAgaW50ZWxfcGxhbmUtPnNyY194LAorCQkJCQkJICAg aW50ZWxfcGxhbmUtPnNyY195LAorCQkJCQkJICAgaW50ZWxfcGxhbmUtPnNyY19oLAorCQkJCQkJ ICAgaW50ZWxfcGxhbmUtPnNyY193KTsKIAkJaWYgKHJldCA9PSAwICYmIGV2ZW50KSB7CiAJCQlz cGluX2xvY2tfaXJxKCZkZXYtPmV2ZW50X2xvY2spOwogCQkJZHJtX3NlbmRfdmJsYW5rX2V2ZW50 KGRldiwgcGlwZSwgZXZlbnQpOwpAQCAtMTA5MTMsMjYgKzEwODQ4LDE1IEBAIHN0YXRpYyBpbnQg X19pbnRlbF9zZXRfbW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICogb24gdGhlIERQTEwu CiAJICovCiAJZm9yX2VhY2hfaW50ZWxfY3J0Y19tYXNrZWQoZGV2LCBtb2Rlc2V0X3BpcGVzLCBp bnRlbF9jcnRjKSB7Ci0JCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IGNydGMtPnBy aW1hcnktPmZiOwotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2xkX29iaiA9IGludGVs X2ZiX29iaihvbGRfZmIpOwotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50 ZWxfZmJfb2JqKGZiKTsKKwkJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IGludGVsX2NydGMt PmJhc2UucHJpbWFyeTsKKwkJaW50IHZkaXNwbGF5LCBoZGlzcGxheTsKIAotCQltdXRleF9sb2Nr KCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2Jq KGNydGMtPnByaW1hcnksIGZiLCBOVUxMKTsKLQkJaWYgKHJldCAhPSAwKSB7Ci0JCQlEUk1fRVJS T1IoInBpbiAmIGZlbmNlIGZhaWxlZFxuIik7Ci0JCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0 X211dGV4KTsKLQkJCWdvdG8gZG9uZTsKLQkJfQotCQlpZiAob2xkX2ZiKQotCQkJaW50ZWxfdW5w aW5fZmJfb2JqKG9sZF9vYmopOwotCQlpOTE1X2dlbV90cmFja19mYihvbGRfb2JqLCBvYmosCi0J CQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKGludGVsX2NydGMtPnBpcGUpKTsKLQkJbXV0 ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0KLQkJY3J0Yy0+cHJpbWFyeS0+ZmIgPSBm YjsKLQkJY3J0Yy0+eCA9IHg7Ci0JCWNydGMtPnkgPSB5OworCQlkcm1fY3J0Y19nZXRfaHZfdGlt aW5nKG1vZGUsICZoZGlzcGxheSwgJnZkaXNwbGF5KTsKKwkJcmV0ID0gcHJpbWFyeS0+ZnVuY3Mt PnVwZGF0ZV9wbGFuZShwcmltYXJ5LCAmaW50ZWxfY3J0Yy0+YmFzZSwKKwkJCQkJCSAgIGZiLCAw LCAwLAorCQkJCQkJICAgaGRpc3BsYXksIHZkaXNwbGF5LAorCQkJCQkJICAgeCA8PCAxNiwgeSA8 PCAxNiwKKwkJCQkJCSAgIGhkaXNwbGF5IDw8IDE2LCB2ZGlzcGxheSA8PCAxNik7CiAJfQogCiAJ LyogTm93IGVuYWJsZSB0aGUgY2xvY2tzLCBwbGFuZSwgcGlwZSwgYW5kIGNvbm5lY3RvcnMgdGhh dCB3ZSBzZXQgdXAuICovCkBAIC0xMTM5OCwxMSArMTEzMjIsMTQgQEAgc3RhdGljIGludCBpbnRl bF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KQogCQkJCQkgICBkaXNh YmxlX3BpcGVzKTsKIAl9IGVsc2UgaWYgKGNvbmZpZy0+ZmJfY2hhbmdlZCkgewogCQlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoc2V0LT5jcnRjKTsKLQotCQlp bnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc2V0LT5jcnRjKTsKLQotCQlyZXQgPSBp bnRlbF9waXBlX3NldF9iYXNlKHNldC0+Y3J0YywKLQkJCQkJICBzZXQtPngsIHNldC0+eSwgc2V0 LT5mYik7CisJCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBzZXQtPmNydGMtPnByaW1hcnk7 CisJCWludCB2ZGlzcGxheSwgaGRpc3BsYXk7CisKKwkJZHJtX2NydGNfZ2V0X2h2X3RpbWluZyhz ZXQtPm1vZGUsICZoZGlzcGxheSwgJnZkaXNwbGF5KTsKKwkJcmV0ID0gcHJpbWFyeS0+ZnVuY3Mt PnVwZGF0ZV9wbGFuZShwcmltYXJ5LCBzZXQtPmNydGMsIHNldC0+ZmIsCisJCQkJCQkgICAwLCAw LCBoZGlzcGxheSwgdmRpc3BsYXksCisJCQkJCQkgICBzZXQtPnggPDwgMTYsIHNldC0+eSA8PCAx NiwKKwkJCQkJCSAgIGhkaXNwbGF5IDw8IDE2LCB2ZGlzcGxheSA8PCAxNik7CiAKIAkJLyoKIAkJ ICogV2UgbmVlZCB0byBtYWtlIHN1cmUgdGhlIHByaW1hcnkgcGxhbmUgaXMgcmUtZW5hYmxlZCBp ZiBpdAotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK