From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 03/10] drm/i915: remove intel_pipe_set_base()
	(v4)
Date: Mon,  1 Dec 2014 15:40:11 -0800
Message-ID: <1417477218-9519-3-git-send-email-matthew.d.roper@intel.com>
References: <1417477218-9519-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 18FAE6E38B
 for <intel-gfx@lists.freedesktop.org>; Mon,  1 Dec 2014 15:40:37 -0800 (PST)
In-Reply-To: <1417477218-9519-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
Cgp2NCAoYnkgTWF0dCk6CiAtIERyb3AgcmVkdW5kYW50IGNhbGxzIHRvIGludGVsX2NydGNfd2Fp
dF9mb3JfcGVuZGluZ19mbGlwcygpIGJlZm9yZQogICBjYWxsaW5nIHVwZGF0ZV9wbGFuZSgpIChW
aWxsZSkKClNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNv
bGxhYm9yYS5jby51az4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVy
QGludGVsLmNvbT4KQWNrZWQtYW5kLW1vdXJuZWQtYnk6IEplc3NlIEJhcm5lcyA8amJhcm5lc0B2
aXJ0dW91c2dlZWsub3JnPgpSZXZpZXdlZC1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZlaXJh
IDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEyOSArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMoKyksIDEwMSBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggOWY5ZWQ1NC4uYWZm
ZjcxOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjk1NCw3MSArMjk1
NCw2IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9waXBlX3NpemUoc3RydWN0IGludGVsX2Ny
dGMgKmNydGMpCiAJY3J0Yy0+Y29uZmlnLnBpcGVfc3JjX2ggPSBhZGp1c3RlZF9tb2RlLT5jcnRj
X3ZkaXNwbGF5OwogfQogCi1zdGF0aWMgaW50Ci1pbnRlbF9waXBlX3NldF9iYXNlKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywgaW50IHgsIGludCB5LAotCQkgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZl
ciAqZmIpCi17Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBp
bnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKLQllbnVtIHBpcGUg
cGlwZSA9IGludGVsX2NydGMtPnBpcGU7Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2Zi
ID0gY3J0Yy0+cHJpbWFyeS0+ZmI7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9v
YmogPSBpbnRlbF9mYl9vYmoob2xkX2ZiKTsKLQlpbnQgcmV0OwotCi0JaWYgKGludGVsX2NydGNf
aGFzX3BlbmRpbmdfZmxpcChjcnRjKSkgewotCQlEUk1fRVJST1IoInBpcGUgaXMgc3RpbGwgYnVz
eSB3aXRoIGFuIG9sZCBwYWdlZmxpcFxuIik7Ci0JCXJldHVybiAtRUJVU1k7Ci0JfQotCi0JLyog
bm8gZmIgYm91bmQgKi8KLQlpZiAoIWZiKSB7Ci0JCURSTV9FUlJPUigiTm8gRkIgYm91bmRcbiIp
OwotCQlyZXR1cm4gMDsKLQl9Ci0KLQlpZiAoaW50ZWxfY3J0Yy0+cGxhbmUgPiBJTlRFTF9JTkZP
KGRldiktPm51bV9waXBlcykgewotCQlEUk1fRVJST1IoIm5vIHBsYW5lIGZvciBjcnRjOiBwbGFu
ZSAlYywgbnVtX3BpcGVzICVkXG4iLAotCQkJICBwbGFuZV9uYW1lKGludGVsX2NydGMtPnBsYW5l
KSwKLQkJCSAgSU5URUxfSU5GTyhkZXYpLT5udW1fcGlwZXMpOwotCQlyZXR1cm4gLUVJTlZBTDsK
LQl9Ci0KLQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JcmV0ID0gaW50ZWxfcGlu
X2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIsIE5VTEwpOwotCWlmIChyZXQgPT0g
MCkKLQkJaTkxNV9nZW1fdHJhY2tfZmIob2xkX29iaiwgaW50ZWxfZmJfb2JqKGZiKSwKLQkJCQkg
IElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOwotCW11dGV4X3VubG9jaygmZGV2LT5z
dHJ1Y3RfbXV0ZXgpOwotCWlmIChyZXQgIT0gMCkgewotCQlEUk1fRVJST1IoInBpbiAmIGZlbmNl
IGZhaWxlZFxuIik7Ci0JCXJldHVybiByZXQ7Ci0JfQotCi0JZGV2X3ByaXYtPmRpc3BsYXkudXBk
YXRlX3ByaW1hcnlfcGxhbmUoY3J0YywgZmIsIHgsIHkpOwotCi0JaWYgKGludGVsX2NydGMtPmFj
dGl2ZSkKLQkJaW50ZWxfZnJvbnRidWZmZXJfZmxpcChkZXYsIElOVEVMX0ZST05UQlVGRkVSX1BS
SU1BUlkocGlwZSkpOwotCi0JY3J0Yy0+cHJpbWFyeS0+ZmIgPSBmYjsKLQljcnRjLT54ID0geDsK
LQljcnRjLT55ID0geTsKLQotCWlmIChvbGRfZmIpIHsKLQkJaWYgKGludGVsX2NydGMtPmFjdGl2
ZSAmJiBvbGRfZmIgIT0gZmIpCi0JCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9j
cnRjLT5waXBlKTsKLQkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91
bnBpbl9mYl9vYmoob2xkX29iaik7Ci0JCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgp
OwotCX0KLQotCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpbnRlbF91cGRhdGVf
ZmJjKGRldik7Ci0JbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0KLQlyZXR1cm4g
MDsKLX0KLQogc3RhdGljIHZvaWQgaW50ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgZHJtX2Ny
dGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKQEAgLTUz
MTIsOCArNTI0Nyw2IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJt
X2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1
Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk
ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3Qg
Km9sZF9vYmogPSBpbnRlbF9mYl9vYmooY3J0Yy0+cHJpbWFyeS0+ZmIpOwotCWVudW0gcGlwZSBw
aXBlID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+cGlwZTsKIAogCS8qIGNydGMgc2hvdWxkIHN0aWxs
IGJlIGVuYWJsZWQgd2hlbiB3ZSBkaXNhYmxlIGl0LiAqLwogCVdBUk5fT04oIWNydGMtPmVuYWJs
ZWQpOwpAQCAtNTMyMSwxNCArNTI1NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJs
ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxl
KGNydGMpOwogCWRldl9wcml2LT5kaXNwbGF5Lm9mZihjcnRjKTsKIAotCWlmIChjcnRjLT5wcmlt
YXJ5LT5mYikgewotCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWludGVsX3Vu
cGluX2ZiX29iaihvbGRfb2JqKTsKLQkJaTkxNV9nZW1fdHJhY2tfZmIob2xkX29iaiwgTlVMTCwK
LQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOwotCQltdXRleF91bmxvY2so
JmRldi0+c3RydWN0X211dGV4KTsKLQkJY3J0Yy0+cHJpbWFyeS0+ZmIgPSBOVUxMOwotCX0KKwlj
cnRjLT5wcmltYXJ5LT5mdW5jcy0+ZGlzYWJsZV9wbGFuZShjcnRjLT5wcmltYXJ5KTsKIAogCS8q
IFVwZGF0ZSBjb21wdXRlZCBzdGF0ZS4gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3Rv
ciwgJmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKQEAgLTk2OTEsNiAr
OTYxNyw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRj
ICpjcnRjLAogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9sZF9mYiA9IGNydGMtPnByaW1hcnkt
PmZiOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIp
OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsK
KwlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+cHJpbWFyeTsKKwlzdHJ1Y3QgaW50
ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocHJpbWFyeSk7CiAJZW51bSBw
aXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBpbnRlbF91bnBpbl93b3JrICp3
b3JrOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CkBAIC05ODQ5LDggKzk3NzcsMTUg
QEAgZnJlZV93b3JrOgogCiAJaWYgKHJldCA9PSAtRUlPKSB7CiBvdXRfaGFuZzoKLQkJaW50ZWxf
Y3J0Y193YWl0X2Zvcl9wZW5kaW5nX2ZsaXBzKGNydGMpOwotCQlyZXQgPSBpbnRlbF9waXBlX3Nl
dF9iYXNlKGNydGMsIGNydGMtPngsIGNydGMtPnksIGZiKTsKKwkJcmV0ID0gcHJpbWFyeS0+ZnVu
Y3MtPnVwZGF0ZV9wbGFuZShwcmltYXJ5LCBjcnRjLCBmYiwKKwkJCQkJCSAgIGludGVsX3BsYW5l
LT5jcnRjX3gsCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+Y3J0Y195LAorCQkJCQkJICAgaW50ZWxf
cGxhbmUtPmNydGNfaCwKKwkJCQkJCSAgIGludGVsX3BsYW5lLT5jcnRjX3csCisJCQkJCQkgICBp
bnRlbF9wbGFuZS0+c3JjX3gsCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX3ksCisJCQkJCQkg
ICBpbnRlbF9wbGFuZS0+c3JjX2gsCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX3cpOwogCQlp
ZiAocmV0ID09IDAgJiYgZXZlbnQpIHsKIAkJCXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9j
ayk7CiAJCQlkcm1fc2VuZF92YmxhbmtfZXZlbnQoZGV2LCBwaXBlLCBldmVudCk7CkBAIC0xMTAz
MiwyNiArMTA5NjcsMTUgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1f
Y3J0YyAqY3J0YywKIAkgKiBvbiB0aGUgRFBMTC4KIAkgKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRj
X21hc2tlZChkZXYsIG1vZGVzZXRfcGlwZXMsIGludGVsX2NydGMpIHsKLQkJc3RydWN0IGRybV9m
cmFtZWJ1ZmZlciAqb2xkX2ZiID0gY3J0Yy0+cHJpbWFyeS0+ZmI7Ci0JCXN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpvbGRfb2JqID0gaW50ZWxfZmJfb2JqKG9sZF9mYik7Ci0JCXN0cnVjdCBk
cm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOworCQlzdHJ1Y3QgZHJt
X3BsYW5lICpwcmltYXJ5ID0gaW50ZWxfY3J0Yy0+YmFzZS5wcmltYXJ5OworCQlpbnQgdmRpc3Bs
YXksIGhkaXNwbGF5OwogCi0JCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJcmV0
ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIsIE5VTEwpOwot
CQlpZiAocmV0ICE9IDApIHsKLQkJCURSTV9FUlJPUigicGluICYgZmVuY2UgZmFpbGVkXG4iKTsK
LQkJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQkJZ290byBkb25lOwotCQl9
Ci0JCWlmIChvbGRfZmIpCi0JCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX29iaik7Ci0JCWk5MTVf
Z2VtX3RyYWNrX2ZiKG9sZF9vYmosIG9iaiwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1B
UlkoaW50ZWxfY3J0Yy0+cGlwZSkpOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4
KTsKLQotCQljcnRjLT5wcmltYXJ5LT5mYiA9IGZiOwotCQljcnRjLT54ID0geDsKLQkJY3J0Yy0+
eSA9IHk7CisJCWRybV9jcnRjX2dldF9odl90aW1pbmcobW9kZSwgJmhkaXNwbGF5LCAmdmRpc3Bs
YXkpOworCQlyZXQgPSBwcmltYXJ5LT5mdW5jcy0+dXBkYXRlX3BsYW5lKHByaW1hcnksICZpbnRl
bF9jcnRjLT5iYXNlLAorCQkJCQkJICAgZmIsIDAsIDAsCisJCQkJCQkgICBoZGlzcGxheSwgdmRp
c3BsYXksCisJCQkJCQkgICB4IDw8IDE2LCB5IDw8IDE2LAorCQkJCQkJICAgaGRpc3BsYXkgPDwg
MTYsIHZkaXNwbGF5IDw8IDE2KTsKIAl9CiAKIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBs
YW5lLCBwaXBlLCBhbmQgY29ubmVjdG9ycyB0aGF0IHdlIHNldCB1cC4gKi8KQEAgLTExNTE3LDEx
ICsxMTQ0MSwxNCBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJt
X21vZGVfc2V0ICpzZXQpCiAJCQkJCSAgIGRpc2FibGVfcGlwZXMpOwogCX0gZWxzZSBpZiAoY29u
ZmlnLT5mYl9jaGFuZ2VkKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f
aW50ZWxfY3J0YyhzZXQtPmNydGMpOwotCi0JCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19m
bGlwcyhzZXQtPmNydGMpOwotCi0JCXJldCA9IGludGVsX3BpcGVfc2V0X2Jhc2Uoc2V0LT5jcnRj
LAotCQkJCQkgIHNldC0+eCwgc2V0LT55LCBzZXQtPmZiKTsKKwkJc3RydWN0IGRybV9wbGFuZSAq
cHJpbWFyeSA9IHNldC0+Y3J0Yy0+cHJpbWFyeTsKKwkJaW50IHZkaXNwbGF5LCBoZGlzcGxheTsK
KworCQlkcm1fY3J0Y19nZXRfaHZfdGltaW5nKHNldC0+bW9kZSwgJmhkaXNwbGF5LCAmdmRpc3Bs
YXkpOworCQlyZXQgPSBwcmltYXJ5LT5mdW5jcy0+dXBkYXRlX3BsYW5lKHByaW1hcnksIHNldC0+
Y3J0Yywgc2V0LT5mYiwKKwkJCQkJCSAgIDAsIDAsIGhkaXNwbGF5LCB2ZGlzcGxheSwKKwkJCQkJ
CSAgIHNldC0+eCA8PCAxNiwgc2V0LT55IDw8IDE2LAorCQkJCQkJICAgaGRpc3BsYXkgPDwgMTYs
IHZkaXNwbGF5IDw8IDE2KTsKIAogCQkvKgogCQkgKiBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUg
cHJpbWFyeSBwbGFuZSBpcyByZS1lbmFibGVkIGlmIGl0Ci0tIAoxLjguNS4xCgpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs
aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=