From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 3/9] drm/i915: remove intel_pipe_set_base() (v4)
Date: Mon, 24 Nov 2014 11:53:00 -0800
Message-ID: <1416858786-25376-4-git-send-email-matthew.d.roper@intel.com>
References: <1416858786-25376-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id CD8876E940
 for <intel-gfx@lists.freedesktop.org>; Mon, 24 Nov 2014 11:54:32 -0800 (PST)
In-Reply-To: <1416858786-25376-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
aXJ0dW91c2dlZWsub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyB8IDEyOSArKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n
ZWQsIDI4IGluc2VydGlvbnMoKyksIDEwMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMKaW5kZXggODE4OTRiZS4uMTc3ODhmOCAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjg5MCw3MSArMjg5MCw2IEBAIHN0YXRpYyB2b2lkIGludGVs
X3VwZGF0ZV9waXBlX3NpemUoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJY3J0Yy0+Y29uZmln
LnBpcGVfc3JjX2ggPSBhZGp1c3RlZF9tb2RlLT5jcnRjX3ZkaXNwbGF5OwogfQogCi1zdGF0aWMg
aW50Ci1pbnRlbF9waXBlX3NldF9iYXNlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgaW50IHgsIGlu
dCB5LAotCQkgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIpCi17Ci0Jc3RydWN0IGRybV9k
ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYgPSBkZXYtPmRldl9wcml2YXRlOwotCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g
dG9faW50ZWxfY3J0YyhjcnRjKTsKLQllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7
Ci0Jc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2ZiID0gY3J0Yy0+cHJpbWFyeS0+ZmI7Ci0J
c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoob2xkX2Zi
KTsKLQlpbnQgcmV0OwotCi0JaWYgKGludGVsX2NydGNfaGFzX3BlbmRpbmdfZmxpcChjcnRjKSkg
ewotCQlEUk1fRVJST1IoInBpcGUgaXMgc3RpbGwgYnVzeSB3aXRoIGFuIG9sZCBwYWdlZmxpcFxu
Iik7Ci0JCXJldHVybiAtRUJVU1k7Ci0JfQotCi0JLyogbm8gZmIgYm91bmQgKi8KLQlpZiAoIWZi
KSB7Ci0JCURSTV9FUlJPUigiTm8gRkIgYm91bmRcbiIpOwotCQlyZXR1cm4gMDsKLQl9Ci0KLQlp
ZiAoaW50ZWxfY3J0Yy0+cGxhbmUgPiBJTlRFTF9JTkZPKGRldiktPm51bV9waXBlcykgewotCQlE
Uk1fRVJST1IoIm5vIHBsYW5lIGZvciBjcnRjOiBwbGFuZSAlYywgbnVtX3BpcGVzICVkXG4iLAot
CQkJICBwbGFuZV9uYW1lKGludGVsX2NydGMtPnBsYW5lKSwKLQkJCSAgSU5URUxfSU5GTyhkZXYp
LT5udW1fcGlwZXMpOwotCQlyZXR1cm4gLUVJTlZBTDsKLQl9Ci0KLQltdXRleF9sb2NrKCZkZXYt
PnN0cnVjdF9tdXRleCk7Ci0JcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+
cHJpbWFyeSwgZmIsIE5VTEwpOwotCWlmIChyZXQgPT0gMCkKLQkJaTkxNV9nZW1fdHJhY2tfZmIo
b2xkX29iaiwgaW50ZWxfZmJfb2JqKGZiKSwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1B
UlkocGlwZSkpOwotCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWlmIChyZXQg
IT0gMCkgewotCQlEUk1fRVJST1IoInBpbiAmIGZlbmNlIGZhaWxlZFxuIik7Ci0JCXJldHVybiBy
ZXQ7Ci0JfQotCi0JZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUoY3J0Yywg
ZmIsIHgsIHkpOwotCi0JaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKLQkJaW50ZWxfZnJvbnRidWZm
ZXJfZmxpcChkZXYsIElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkocGlwZSkpOwotCi0JY3J0Yy0+
cHJpbWFyeS0+ZmIgPSBmYjsKLQljcnRjLT54ID0geDsKLQljcnRjLT55ID0geTsKLQotCWlmIChv
bGRfZmIpIHsKLQkJaWYgKGludGVsX2NydGMtPmFjdGl2ZSAmJiBvbGRfZmIgIT0gZmIpCi0JCQlp
bnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBpbnRlbF9jcnRjLT5waXBlKTsKLQkJbXV0ZXhfbG9j
aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX29iaik7Ci0J
CW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCX0KLQotCW11dGV4X2xvY2soJmRl
di0+c3RydWN0X211dGV4KTsKLQlpbnRlbF91cGRhdGVfZmJjKGRldik7Ci0JbXV0ZXhfdW5sb2Nr
KCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0KLQlyZXR1cm4gMDsKLX0KLQogc3RhdGljIHZvaWQgaW50
ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRy
bV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKQEAgLTUyNDgsOCArNTE4Myw2IEBAIHN0YXRpYyB2
b2lkIGludGVsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRy
bV9kZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj
dG9yOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZh
dGU7Ci0Jc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9sZF9vYmogPSBpbnRlbF9mYl9vYmoo
Y3J0Yy0+cHJpbWFyeS0+ZmIpOwotCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0YyhjcnRj
KS0+cGlwZTsKIAogCS8qIGNydGMgc2hvdWxkIHN0aWxsIGJlIGVuYWJsZWQgd2hlbiB3ZSBkaXNh
YmxlIGl0LiAqLwogCVdBUk5fT04oIWNydGMtPmVuYWJsZWQpOwpAQCAtNTI1NywxNCArNTE5MCw3
IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp
CiAJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19kaXNhYmxlKGNydGMpOwogCWRldl9wcml2LT5kaXNw
bGF5Lm9mZihjcnRjKTsKIAotCWlmIChjcnRjLT5wcmltYXJ5LT5mYikgewotCQltdXRleF9sb2Nr
KCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWludGVsX3VucGluX2ZiX29iaihvbGRfb2JqKTsKLQkJ
aTkxNV9nZW1fdHJhY2tfZmIob2xkX29iaiwgTlVMTCwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVS
X1BSSU1BUlkocGlwZSkpOwotCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJ
Y3J0Yy0+cHJpbWFyeS0+ZmIgPSBOVUxMOwotCX0KKwljcnRjLT5wcmltYXJ5LT5mdW5jcy0+ZGlz
YWJsZV9wbGFuZShjcnRjLT5wcmltYXJ5KTsKIAogCS8qIFVwZGF0ZSBjb21wdXRlZCBzdGF0ZS4g
Ki8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3RvciwgJmRldi0+bW9kZV9jb25maWcuY29u
bmVjdG9yX2xpc3QsIGhlYWQpIHsKQEAgLTk2MjEsNiArOTU0Nyw4IEBAIHN0YXRpYyBpbnQgaW50
ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1fZnJh
bWVidWZmZXIgKm9sZF9mYiA9IGNydGMtPnByaW1hcnktPmZiOwogCXN0cnVjdCBkcm1faTkxNV9n
ZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cnVjdCBpbnRlbF9jcnRjICpp
bnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwcmlt
YXJ5ID0gY3J0Yy0+cHJpbWFyeTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0g
dG9faW50ZWxfcGxhbmUocHJpbWFyeSk7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5w
aXBlOwogCXN0cnVjdCBpbnRlbF91bnBpbl93b3JrICp3b3JrOwogCXN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnJpbmc7CkBAIC05Nzc5LDggKzk3MDcsMTUgQEAgZnJlZV93b3JrOgogCiAJaWYgKHJl
dCA9PSAtRUlPKSB7CiBvdXRfaGFuZzoKLQkJaW50ZWxfY3J0Y193YWl0X2Zvcl9wZW5kaW5nX2Zs
aXBzKGNydGMpOwotCQlyZXQgPSBpbnRlbF9waXBlX3NldF9iYXNlKGNydGMsIGNydGMtPngsIGNy
dGMtPnksIGZiKTsKKwkJcmV0ID0gcHJpbWFyeS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwcmltYXJ5
LCBjcnRjLCBmYiwKKwkJCQkJCSAgIGludGVsX3BsYW5lLT5jcnRjX3gsCisJCQkJCQkgICBpbnRl
bF9wbGFuZS0+Y3J0Y195LAorCQkJCQkJICAgaW50ZWxfcGxhbmUtPmNydGNfaCwKKwkJCQkJCSAg
IGludGVsX3BsYW5lLT5jcnRjX3csCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX3gsCisJCQkJ
CQkgICBpbnRlbF9wbGFuZS0+c3JjX3ksCisJCQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX2gsCisJ
CQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX3cpOwogCQlpZiAocmV0ID09IDAgJiYgZXZlbnQpIHsK
IAkJCXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9jayk7CiAJCQlkcm1fc2VuZF92Ymxhbmtf
ZXZlbnQoZGV2LCBwaXBlLCBldmVudCk7CkBAIC0xMDk2MiwyNiArMTA4OTcsMTUgQEAgc3RhdGlj
IGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKiBvbiB0aGUg
RFBMTC4KIAkgKi8KIAlmb3JfZWFjaF9pbnRlbF9jcnRjX21hc2tlZChkZXYsIG1vZGVzZXRfcGlw
ZXMsIGludGVsX2NydGMpIHsKLQkJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqb2xkX2ZiID0gY3J0
Yy0+cHJpbWFyeS0+ZmI7Ci0JCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2JqID0g
aW50ZWxfZmJfb2JqKG9sZF9mYik7Ci0JCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmog
PSBpbnRlbF9mYl9vYmooZmIpOworCQlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gaW50ZWxf
Y3J0Yy0+YmFzZS5wcmltYXJ5OworCQlpbnQgdmRpc3BsYXksIGhkaXNwbGF5OwogCi0JCW11dGV4
X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9m
Yl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIsIE5VTEwpOwotCQlpZiAocmV0ICE9IDApIHsKLQkJCURS
TV9FUlJPUigicGluICYgZmVuY2UgZmFpbGVkXG4iKTsKLQkJCW11dGV4X3VubG9jaygmZGV2LT5z
dHJ1Y3RfbXV0ZXgpOwotCQkJZ290byBkb25lOwotCQl9Ci0JCWlmIChvbGRfZmIpCi0JCQlpbnRl
bF91bnBpbl9mYl9vYmoob2xkX29iaik7Ci0JCWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9vYmosIG9i
aiwKLQkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1BUlkoaW50ZWxfY3J0Yy0+cGlwZSkpOwot
CQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQotCQljcnRjLT5wcmltYXJ5LT5m
YiA9IGZiOwotCQljcnRjLT54ID0geDsKLQkJY3J0Yy0+eSA9IHk7CisJCWRybV9jcnRjX2dldF9o
dl90aW1pbmcobW9kZSwgJmhkaXNwbGF5LCAmdmRpc3BsYXkpOworCQlyZXQgPSBwcmltYXJ5LT5m
dW5jcy0+dXBkYXRlX3BsYW5lKHByaW1hcnksICZpbnRlbF9jcnRjLT5iYXNlLAorCQkJCQkJICAg
ZmIsIDAsIDAsCisJCQkJCQkgICBoZGlzcGxheSwgdmRpc3BsYXksCisJCQkJCQkgICB4IDw8IDE2
LCB5IDw8IDE2LAorCQkJCQkJICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKIAl9
CiAKIAkvKiBOb3cgZW5hYmxlIHRoZSBjbG9ja3MsIHBsYW5lLCBwaXBlLCBhbmQgY29ubmVjdG9y
cyB0aGF0IHdlIHNldCB1cC4gKi8KQEAgLTExNDQ3LDExICsxMTM3MSwxNCBAQCBzdGF0aWMgaW50
IGludGVsX2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAJCQkJCSAg
IGRpc2FibGVfcGlwZXMpOwogCX0gZWxzZSBpZiAoY29uZmlnLT5mYl9jaGFuZ2VkKSB7CiAJCXN0
cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhzZXQtPmNydGMpOwot
Ci0JCWludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhzZXQtPmNydGMpOwotCi0JCXJl
dCA9IGludGVsX3BpcGVfc2V0X2Jhc2Uoc2V0LT5jcnRjLAotCQkJCQkgIHNldC0+eCwgc2V0LT55
LCBzZXQtPmZiKTsKKwkJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IHNldC0+Y3J0Yy0+cHJp
bWFyeTsKKwkJaW50IHZkaXNwbGF5LCBoZGlzcGxheTsKKworCQlkcm1fY3J0Y19nZXRfaHZfdGlt
aW5nKHNldC0+bW9kZSwgJmhkaXNwbGF5LCAmdmRpc3BsYXkpOworCQlyZXQgPSBwcmltYXJ5LT5m
dW5jcy0+dXBkYXRlX3BsYW5lKHByaW1hcnksIHNldC0+Y3J0Yywgc2V0LT5mYiwKKwkJCQkJCSAg
IDAsIDAsIGhkaXNwbGF5LCB2ZGlzcGxheSwKKwkJCQkJCSAgIHNldC0+eCA8PCAxNiwgc2V0LT55
IDw8IDE2LAorCQkJCQkJICAgaGRpc3BsYXkgPDwgMTYsIHZkaXNwbGF5IDw8IDE2KTsKIAogCQkv
KgogCQkgKiBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGUgcHJpbWFyeSBwbGFuZSBpcyByZS1lbmFi
bGVkIGlmIGl0Ci0tIAoxLjguNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl
ZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2ludGVsLWdmeAo=