From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 5/5] drm/i915: remove intel_pipe_set_base() (v3)
Date: Mon, 17 Nov 2014 18:10:39 -0800
Message-ID: <1416276639-30297-6-git-send-email-matthew.d.roper@intel.com>
References: <1416276639-30297-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 4D54C6E270
 for <intel-gfx@lists.freedesktop.org>; Mon, 17 Nov 2014 18:11:48 -0800 (PST)
In-Reply-To: <1416276639-30297-1-git-send-email-matthew.d.roper@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK
QWZ0ZXIgc29tZSByZWZhY3RvciBpbnRlbF9wcmltYXJ5X3BsYW5lX3NldHBsYW5lKCkgZG9lcyB0
aGUgc2FtZQphcyBpbnRlbF9waXBlX3NldF9iYXNlKCkgc28gd2UgY2FuIGdldCByaWQgb2YgaXQg
YW5kIHJlcGxhY2UgdGhlIGNhbGxzCndpdGggaW50ZWxfcHJpbWFyeV9wbGFuZV9zZXRwbGFuZSgp
LgoKdjI6IHRha2UgVmlsbGUncyBjb21tZW50czoKCS0gZ2V0IHRoZSByaWdodCBhcmd1bWVudHMg
Zm9yIHVwZGF0ZV9wbGFuZSgpCgktIHVzZSBkcm1fY3J0Y19nZXRfaHZfdGltaW5nKCkKCnYzIChi
eSBNYXR0KToKIC0gUmViYXNlIHRvIGxhdGVzdCBkaS1uaWdodGx5IGNvZGViYXNlCiAtIFVzZSBw
cmltYXJ5LT5mdW5jcy0+dXBkYXRlX3BsYW5lKCkgaW4gX19pbnRlbF9zZXRfbW9kZSgpCiAtIFVz
ZSBwcmltYXJ5LT5mdW5jcy0+ZGlzYWJsZV9wbGFuZSgpIGluIGludGVsX2NydGNfZGlzYWJsZSgp
CgpTaWduZWQtb2ZmLWJ5OiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJv
cmEuY28udWs+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRl
bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTI0ICsr
KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5z
ZXJ0aW9ucygrKSwgOTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCmluZGV4IDFjMTg4NmUuLjk2OGVmMGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw
bGF5LmMKQEAgLTI4OTAsNzEgKzI4OTAsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfcGlw
ZV9zaXplKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWNydGMtPmNvbmZpZy5waXBlX3NyY19o
ID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y192ZGlzcGxheTsKIH0KIAotc3RhdGljIGludAotaW50ZWxf
cGlwZV9zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCB4LCBpbnQgeSwKLQkJICAg
IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQotewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg
PSBjcnRjLT5kZXY7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5k
ZXZfcHJpdmF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2Ny
dGMoY3J0Yyk7Ci0JZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwotCXN0cnVjdCBk
cm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IGNydGMtPnByaW1hcnktPmZiOwotCXN0cnVjdCBkcm1f
aTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKG9sZF9mYik7Ci0JaW50IHJl
dDsKLQotCWlmIChpbnRlbF9jcnRjX2hhc19wZW5kaW5nX2ZsaXAoY3J0YykpIHsKLQkJRFJNX0VS
Uk9SKCJwaXBlIGlzIHN0aWxsIGJ1c3kgd2l0aCBhbiBvbGQgcGFnZWZsaXBcbiIpOwotCQlyZXR1
cm4gLUVCVVNZOwotCX0KLQotCS8qIG5vIGZiIGJvdW5kICovCi0JaWYgKCFmYikgewotCQlEUk1f
RVJST1IoIk5vIEZCIGJvdW5kXG4iKTsKLQkJcmV0dXJuIDA7Ci0JfQotCi0JaWYgKGludGVsX2Ny
dGMtPnBsYW5lID4gSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpIHsKLQkJRFJNX0VSUk9SKCJu
byBwbGFuZSBmb3IgY3J0YzogcGxhbmUgJWMsIG51bV9waXBlcyAlZFxuIiwKLQkJCSAgcGxhbmVf
bmFtZShpbnRlbF9jcnRjLT5wbGFuZSksCi0JCQkgIElOVEVMX0lORk8oZGV2KS0+bnVtX3BpcGVz
KTsKLQkJcmV0dXJuIC1FSU5WQUw7Ci0JfQotCi0JbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0
ZXgpOwotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGNydGMtPnByaW1hcnksIGZi
LCBOVUxMKTsKLQlpZiAocmV0ID09IDApCi0JCWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9vYmosIGlu
dGVsX2ZiX29iaihmYiksCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUpKTsK
LQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpZiAocmV0ICE9IDApIHsKLQkJ
RFJNX0VSUk9SKCJwaW4gJiBmZW5jZSBmYWlsZWRcbiIpOwotCQlyZXR1cm4gcmV0OwotCX0KLQot
CWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9wcmltYXJ5X3BsYW5lKGNydGMsIGZiLCB4LCB5KTsK
LQotCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpCi0JCWludGVsX2Zyb250YnVmZmVyX2ZsaXAoZGV2
LCBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBpcGUpKTsKLQotCWNydGMtPnByaW1hcnktPmZi
ID0gZmI7Ci0JY3J0Yy0+eCA9IHg7Ci0JY3J0Yy0+eSA9IHk7Ci0KLQlpZiAob2xkX2ZiKSB7Ci0J
CWlmIChpbnRlbF9jcnRjLT5hY3RpdmUgJiYgb2xkX2ZiICE9IGZiKQotCQkJaW50ZWxfd2FpdF9m
b3JfdmJsYW5rKGRldiwgaW50ZWxfY3J0Yy0+cGlwZSk7Ci0JCW11dGV4X2xvY2soJmRldi0+c3Ry
dWN0X211dGV4KTsKLQkJaW50ZWxfdW5waW5fZmJfb2JqKG9sZF9vYmopOwotCQltdXRleF91bmxv
Y2soJmRldi0+c3RydWN0X211dGV4KTsKLQl9Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9t
dXRleCk7Ci0JaW50ZWxfdXBkYXRlX2ZiYyhkZXYpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1
Y3RfbXV0ZXgpOwotCi0JcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyB2b2lkIGludGVsX2ZkaV9ub3Jt
YWxfdHJhaW4oc3RydWN0IGRybV9jcnRjICpjcnRjKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYgPSBjcnRjLT5kZXY7CkBAIC01MjY3LDggKzUyMDIsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9j
cnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcjsKIAlzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVj
dCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKGNydGMtPnByaW1h
cnktPmZiKTsKLQllbnVtIHBpcGUgcGlwZSA9IHRvX2ludGVsX2NydGMoY3J0YyktPnBpcGU7CiAK
IAkvKiBjcnRjIHNob3VsZCBzdGlsbCBiZSBlbmFibGVkIHdoZW4gd2UgZGlzYWJsZSBpdC4gKi8K
IAlXQVJOX09OKCFjcnRjLT5lbmFibGVkKTsKQEAgLTUyNzcsMTQgKzUyMTAsNyBAQCBzdGF0aWMg
dm9pZCBpbnRlbF9jcnRjX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWludGVsX2Ny
dGNfdXBkYXRlX3NhcmVhKGNydGMsIGZhbHNlKTsKIAlkZXZfcHJpdi0+ZGlzcGxheS5vZmYoY3J0
Yyk7CiAKLQlpZiAoY3J0Yy0+cHJpbWFyeS0+ZmIpIHsKLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1
Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX29iaik7Ci0JCWk5MTVfZ2VtX3Ry
YWNrX2ZiKG9sZF9vYmosIE5VTEwsCi0JCQkJICBJTlRFTF9GUk9OVEJVRkZFUl9QUklNQVJZKHBp
cGUpKTsKLQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWNydGMtPnByaW1h
cnktPmZiID0gTlVMTDsKLQl9CisJY3J0Yy0+cHJpbWFyeS0+ZnVuY3MtPmRpc2FibGVfcGxhbmUo
Y3J0Yy0+cHJpbWFyeSk7CiAKIAkvKiBVcGRhdGUgY29tcHV0ZWQgc3RhdGUuICovCiAJbGlzdF9m
b3JfZWFjaF9lbnRyeShjb25uZWN0b3IsICZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rvcl9saXN0
LCBoZWFkKSB7CkBAIC05NTc4LDYgKzk1MDQsOCBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFn
ZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpv
bGRfZmIgPSBjcnRjLT5wcmltYXJ5LT5mYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq
b2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9
IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IGNydGMt
PnByaW1hcnk7CisJc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSA9IHRvX2ludGVsX3Bs
YW5lKHByaW1hcnkpOwogCWVudW0gcGlwZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlzdHJ1
Y3QgaW50ZWxfdW5waW5fd29yayAqd29yazsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n
OwpAQCAtOTczNyw3ICs5NjY1LDE1IEBAIGZyZWVfd29yazoKIAlpZiAocmV0ID09IC1FSU8pIHsK
IG91dF9oYW5nOgogCQlpbnRlbF9jcnRjX3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoY3J0Yyk7Ci0J
CXJldCA9IGludGVsX3BpcGVfc2V0X2Jhc2UoY3J0YywgY3J0Yy0+eCwgY3J0Yy0+eSwgZmIpOwor
CQlyZXQgPSBwcmltYXJ5LT5mdW5jcy0+dXBkYXRlX3BsYW5lKHByaW1hcnksIGNydGMsIGZiLAor
CQkJCQkJICAgaW50ZWxfcGxhbmUtPmNydGNfeCwKKwkJCQkJCSAgIGludGVsX3BsYW5lLT5jcnRj
X3ksCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+Y3J0Y19oLAorCQkJCQkJICAgaW50ZWxfcGxhbmUt
PmNydGNfdywKKwkJCQkJCSAgIGludGVsX3BsYW5lLT5zcmNfeCwKKwkJCQkJCSAgIGludGVsX3Bs
YW5lLT5zcmNfeSwKKwkJCQkJCSAgIGludGVsX3BsYW5lLT5zcmNfaCwKKwkJCQkJCSAgIGludGVs
X3BsYW5lLT5zcmNfdyk7CiAJCWlmIChyZXQgPT0gMCAmJiBldmVudCkgewogCQkJc3Bpbl9sb2Nr
X2lycSgmZGV2LT5ldmVudF9sb2NrKTsKIAkJCWRybV9zZW5kX3ZibGFua19ldmVudChkZXYsIHBp
cGUsIGV2ZW50KTsKQEAgLTEwOTEzLDI2ICsxMDg0OSwxNSBAQCBzdGF0aWMgaW50IF9faW50ZWxf
c2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqIG9uIHRoZSBEUExMLgogCSAqLwog
CWZvcl9lYWNoX2ludGVsX2NydGNfbWFza2VkKGRldiwgbW9kZXNldF9waXBlcywgaW50ZWxfY3J0
YykgewotCQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpvbGRfZmIgPSBjcnRjLT5wcmltYXJ5LT5m
YjsKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoo
b2xkX2ZiKTsKLQkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29i
aihmYik7Ci0KLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlyZXQgPSBpbnRl
bF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjcnRjLT5wcmltYXJ5LCBmYiwgTlVMTCk7Ci0JCWlmIChy
ZXQgIT0gMCkgewotCQkJRFJNX0VSUk9SKCJwaW4gJiBmZW5jZSBmYWlsZWRcbiIpOwotCQkJbXV0
ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCQlnb3RvIGRvbmU7Ci0JCX0KLQkJaWYg
KG9sZF9mYikKLQkJCWludGVsX3VucGluX2ZiX29iaihvbGRfb2JqKTsKLQkJaTkxNV9nZW1fdHJh
Y2tfZmIob2xkX29iaiwgb2JqLAotCQkJCSAgSU5URUxfRlJPTlRCVUZGRVJfUFJJTUFSWShpbnRl
bF9jcnRjLT5waXBlKSk7Ci0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOworCQlz
dHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5OworCQlp
bnQgdmRpc3BsYXksIGhkaXNwbGF5OwogCi0JCWNydGMtPnByaW1hcnktPmZiID0gZmI7Ci0JCWNy
dGMtPnggPSB4OwotCQljcnRjLT55ID0geTsKKwkJZHJtX2NydGNfZ2V0X2h2X3RpbWluZyhtb2Rl
LCAmaGRpc3BsYXksICZ2ZGlzcGxheSk7CisJCXJldCA9IHByaW1hcnktPmZ1bmNzLT51cGRhdGVf
cGxhbmUocHJpbWFyeSwgJmludGVsX2NydGMtPmJhc2UsCisJCQkJCQkgICBmYiwgMCwgMCwKKwkJ
CQkJCSAgIGhkaXNwbGF5LCB2ZGlzcGxheSwKKwkJCQkJCSAgIHggPDwgMTYsIHkgPDwgMTYsCisJ
CQkJCQkgICBoZGlzcGxheSA8PCAxNiwgdmRpc3BsYXkgPDwgMTYpOwogCX0KIAogCS8qIE5vdyBl
bmFibGUgdGhlIGNsb2NrcywgcGxhbmUsIHBpcGUsIGFuZCBjb25uZWN0b3JzIHRoYXQgd2Ugc2V0
IHVwLiAqLwpAQCAtMTEzOTgsMTEgKzExMzIzLDE2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19z
ZXRfY29uZmlnKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCkKIAkJCQkJICAgZGlzYWJsZV9waXBl
cyk7CiAJfSBlbHNlIGlmIChjb25maWctPmZiX2NoYW5nZWQpIHsKIAkJc3RydWN0IGludGVsX2Ny
dGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKHNldC0+Y3J0Yyk7CisJCXN0cnVjdCBkcm1f
cGxhbmUgKnByaW1hcnkgPSBzZXQtPmNydGMtPnByaW1hcnk7CisJCWludCB2ZGlzcGxheSwgaGRp
c3BsYXk7CiAKIAkJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKHNldC0+Y3J0Yyk7
CiAKLQkJcmV0ID0gaW50ZWxfcGlwZV9zZXRfYmFzZShzZXQtPmNydGMsCi0JCQkJCSAgc2V0LT54
LCBzZXQtPnksIHNldC0+ZmIpOworCQlkcm1fY3J0Y19nZXRfaHZfdGltaW5nKHNldC0+bW9kZSwg
JmhkaXNwbGF5LCAmdmRpc3BsYXkpOworCQlyZXQgPSBwcmltYXJ5LT5mdW5jcy0+dXBkYXRlX3Bs
YW5lKHByaW1hcnksIHNldC0+Y3J0Yywgc2V0LT5mYiwKKwkJCQkJCSAgIDAsIDAsIGhkaXNwbGF5
LCB2ZGlzcGxheSwKKwkJCQkJCSAgIHNldC0+eCA8PCAxNiwgc2V0LT55IDw8IDE2LAorCQkJCQkJ
ICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKIAogCQkvKgogCQkgKiBXZSBuZWVk
IHRvIG1ha2Ugc3VyZSB0aGUgcHJpbWFyeSBwbGFuZSBpcyByZS1lbmFibGVkIGlmIGl0Ci0tIAox
LjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ
bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0
cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=