From: Matt Roper Subject: [PATCH 5/5] drm/i915: Drop unused position fields (v2) Date: Tue, 23 Dec 2014 10:41:53 -0800 Message-ID: <1419360113-10972-6-git-send-email-matthew.d.roper@intel.com> References: <1419360113-10972-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id F21386E51A for ; Tue, 23 Dec 2014 10:42:57 -0800 (PST) In-Reply-To: <1419360113-10972-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 List-Id: intel-gfx@lists.freedesktop.org VGhlIHVzZXJzcGFjZS1yZXF1ZXN0ZWQgcGxhbmUgY29vcmRpbmF0ZXMgYXJlIG5vdyBhbHdheXMg YXZhaWxhYmxlIHZpYQpwbGFuZS0+c3RhdGUuYmFzZSAoYW5kIHRoZSBpOTE1LWFkanVzdGVkIHZh bHVlcyBhcmUgc3RvcmVkIGluCnBsYW5lLT5zdGF0ZSksIHNvIHdlIG5vIGxvbmdlciB1c2UgdGhl IGNvb3JkaW5hdGUgZmllbGRzIGluIGludGVsX3BsYW5lCmFuZCBjYW4gZHJvcCB0aGVtLgoKQWxz bywgbm90ZSB0aGF0IHRoZSBlcnJvciBjYXNlIGZvciBwYWdlZmxpcCBjYWxscyB1cGRhdGVfcGxh bmUoKSB0bwpwcm9ncmFtIHRoZSB2YWx1ZXMgZnJvbSBwbGFuZS0+c3RhdGU7IGl0J3Mgc2ltcGxl ciB0byBqdXN0IGNhbGwKaW50ZWxfcGxhbmVfcmVzdG9yZSgpIHdoaWNoIGRvZXMgdGhlIHNhbWUg dGhpbmcuCgp2MjogUmVwbGFjZSBtYW51YWwgdXBkYXRlX3BsYW5lKCkgd2l0aCBpbnRlbF9wbGFu ZV9yZXN0b3JlKCkgaW4gcGFnZWZsaXAKICAgIGVycm9yIGhhbmRsZXIuCgpSZXZpZXdlZC1ieSh2 MSk6IEJvYiBQYWF1d2UgPGJvYi5qLnBhYXV3ZUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1h dHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBBbmRlciBD b25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMjcgKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAg ICAgfCAgNCAtLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxOSAr KysrLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNDUg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGU3YjUx ZGIuLjc1YTUxNGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTk2MTYs NyArOTYxNiw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9j cnRjICpjcnRjLAogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9v YmooZmIpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhj cnRjKTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+cHJpbWFyeTsKLQlzdHJ1 Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocHJpbWFyeSk7CiAJ ZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBpbnRlbF91bnBpbl93 b3JrICp3b3JrOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CkBAIC05Nzc1LDE1ICs5 Nzc0LDcgQEAgZnJlZV93b3JrOgogCiAJaWYgKHJldCA9PSAtRUlPKSB7CiBvdXRfaGFuZzoKLQkJ cmV0ID0gcHJpbWFyeS0+ZnVuY3MtPnVwZGF0ZV9wbGFuZShwcmltYXJ5LCBjcnRjLCBmYiwKLQkJ CQkJCSAgIGludGVsX3BsYW5lLT5jcnRjX3gsCi0JCQkJCQkgICBpbnRlbF9wbGFuZS0+Y3J0Y195 LAotCQkJCQkJICAgaW50ZWxfcGxhbmUtPmNydGNfaCwKLQkJCQkJCSAgIGludGVsX3BsYW5lLT5j cnRjX3csCi0JCQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX3gsCi0JCQkJCQkgICBpbnRlbF9wbGFu ZS0+c3JjX3ksCi0JCQkJCQkgICBpbnRlbF9wbGFuZS0+c3JjX2gsCi0JCQkJCQkgICBpbnRlbF9w bGFuZS0+c3JjX3cpOworCQlyZXQgPSBpbnRlbF9wbGFuZV9yZXN0b3JlKHByaW1hcnkpOwogCQlp ZiAocmV0ID09IDAgJiYgZXZlbnQpIHsKIAkJCXNwaW5fbG9ja19pcnEoJmRldi0+ZXZlbnRfbG9j ayk7CiAJCQlkcm1fc2VuZF92YmxhbmtfZXZlbnQoZGV2LCBwaXBlLCBldmVudCk7CkBAIC0xMTgy MywxNCArMTE4MTQsNiBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3Bs YW5lICpwbGFuZSwKIAljcnRjLT54ID0gc3JjLT54MSA+PiAxNjsKIAljcnRjLT55ID0gc3JjLT55 MSA+PiAxNjsKIAotCWludGVsX3BsYW5lLT5jcnRjX3ggPSBzdGF0ZS0+YmFzZS5jcnRjX3g7Ci0J aW50ZWxfcGxhbmUtPmNydGNfeSA9IHN0YXRlLT5iYXNlLmNydGNfeTsKLQlpbnRlbF9wbGFuZS0+ Y3J0Y193ID0gc3RhdGUtPmJhc2UuY3J0Y193OwotCWludGVsX3BsYW5lLT5jcnRjX2ggPSBzdGF0 ZS0+YmFzZS5jcnRjX2g7Ci0JaW50ZWxfcGxhbmUtPnNyY194ID0gc3RhdGUtPmJhc2Uuc3JjX3g7 Ci0JaW50ZWxfcGxhbmUtPnNyY195ID0gc3RhdGUtPmJhc2Uuc3JjX3k7Ci0JaW50ZWxfcGxhbmUt PnNyY193ID0gc3RhdGUtPmJhc2Uuc3JjX3c7Ci0JaW50ZWxfcGxhbmUtPnNyY19oID0gc3RhdGUt PmJhc2Uuc3JjX2g7CiAJaW50ZWxfcGxhbmUtPm9iaiA9IG9iajsKIAogCWlmIChpbnRlbF9jcnRj LT5hY3RpdmUpIHsKQEAgLTEyMTExLDE0ICsxMjA5NCw2IEBAIGludGVsX2NvbW1pdF9jdXJzb3Jf cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJY3J0Yy0+Y3Vyc29yX3ggPSBzdGF0ZS0+ YmFzZS5jcnRjX3g7CiAJY3J0Yy0+Y3Vyc29yX3kgPSBzdGF0ZS0+YmFzZS5jcnRjX3k7CiAKLQlp bnRlbF9wbGFuZS0+Y3J0Y194ID0gc3RhdGUtPmJhc2UuY3J0Y194OwotCWludGVsX3BsYW5lLT5j cnRjX3kgPSBzdGF0ZS0+YmFzZS5jcnRjX3k7Ci0JaW50ZWxfcGxhbmUtPmNydGNfdyA9IHN0YXRl LT5iYXNlLmNydGNfdzsKLQlpbnRlbF9wbGFuZS0+Y3J0Y19oID0gc3RhdGUtPmJhc2UuY3J0Y19o OwotCWludGVsX3BsYW5lLT5zcmNfeCA9IHN0YXRlLT5iYXNlLnNyY194OwotCWludGVsX3BsYW5l LT5zcmNfeSA9IHN0YXRlLT5iYXNlLnNyY195OwotCWludGVsX3BsYW5lLT5zcmNfdyA9IHN0YXRl LT5iYXNlLnNyY193OwotCWludGVsX3BsYW5lLT5zcmNfaCA9IHN0YXRlLT5iYXNlLnNyY19oOwog CWludGVsX3BsYW5lLT5vYmogPSBvYmo7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y3Vyc29yX2JvID09 IG9iaikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNjA0YmQyMi4uZGIzZmRlMyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTUxNywxMCArNTE3LDYgQEAgc3RydWN0IGludGVs X3BsYW5lIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWJvb2wgY2FuX3Nj YWxlOwogCWludCBtYXhfZG93bnNjYWxlOwotCWludCBjcnRjX3gsIGNydGNfeTsKLQl1bnNpZ25l ZCBpbnQgY3J0Y193LCBjcnRjX2g7Ci0JdWludDMyX3Qgc3JjX3gsIHNyY195OwotCXVpbnQzMl90 IHNyY193LCBzcmNfaDsKIAl1bnNpZ25lZCBpbnQgcm90YXRpb247CiAKIAkvKiBTaW5jZSB3ZSBu ZWVkIHRvIGNoYW5nZSB0aGUgd2F0ZXJtYXJrcyBiZWZvcmUvYWZ0ZXIKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKaW5kZXggMTZlN2M5Ni4uMzcwNzlmMSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfc3ByaXRlLmMKQEAgLTEyNzcsMTUgKzEyNzcsNiBAQCBpbnRlbF9jb21taXRfc3ByaXRl X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCXVuc2lnbmVkIGludCBjcnRjX3csIGNy dGNfaDsKIAl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNfaDsKIAotCWludGVsX3Bs YW5lLT5jcnRjX3ggPSBzdGF0ZS0+YmFzZS5jcnRjX3g7Ci0JaW50ZWxfcGxhbmUtPmNydGNfeSA9 IHN0YXRlLT5iYXNlLmNydGNfeTsKLQlpbnRlbF9wbGFuZS0+Y3J0Y193ID0gc3RhdGUtPmJhc2Uu Y3J0Y193OwotCWludGVsX3BsYW5lLT5jcnRjX2ggPSBzdGF0ZS0+YmFzZS5jcnRjX2g7Ci0JaW50 ZWxfcGxhbmUtPnNyY194ID0gc3RhdGUtPmJhc2Uuc3JjX3g7Ci0JaW50ZWxfcGxhbmUtPnNyY195 ID0gc3RhdGUtPmJhc2Uuc3JjX3k7Ci0JaW50ZWxfcGxhbmUtPnNyY193ID0gc3RhdGUtPmJhc2Uu c3JjX3c7Ci0JaW50ZWxfcGxhbmUtPnNyY19oID0gc3RhdGUtPmJhc2Uuc3JjX2g7Ci0KIAljcnRj ID0gY3J0YyA/IGNydGMgOiBwbGFuZS0+Y3J0YzsKIAlpbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0 YyhjcnRjKTsKIApAQCAtMTQwMCwxNiArMTM5MSwxNCBAQCBpbnQgaW50ZWxfcGxhbmVfc2V0X3By b3BlcnR5KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiBpbnQgaW50ZWxfcGxhbmVfcmVzdG9y ZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVs X3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwotCiAJaWYgKCFwbGFuZS0+Y3J0YyB8fCAh cGxhbmUtPmZiKQogCQlyZXR1cm4gMDsKIAogCXJldHVybiBwbGFuZS0+ZnVuY3MtPnVwZGF0ZV9w bGFuZShwbGFuZSwgcGxhbmUtPmNydGMsIHBsYW5lLT5mYiwKLQkJCQkgIGludGVsX3BsYW5lLT5j cnRjX3gsIGludGVsX3BsYW5lLT5jcnRjX3ksCi0JCQkJICBpbnRlbF9wbGFuZS0+Y3J0Y193LCBp bnRlbF9wbGFuZS0+Y3J0Y19oLAotCQkJCSAgaW50ZWxfcGxhbmUtPnNyY194LCBpbnRlbF9wbGFu ZS0+c3JjX3ksCi0JCQkJICBpbnRlbF9wbGFuZS0+c3JjX3csIGludGVsX3BsYW5lLT5zcmNfaCk7 CisJCQkJICBwbGFuZS0+c3RhdGUtPmNydGNfeCwgcGxhbmUtPnN0YXRlLT5jcnRjX3ksCisJCQkJ ICBwbGFuZS0+c3RhdGUtPmNydGNfdywgcGxhbmUtPnN0YXRlLT5jcnRjX2gsCisJCQkJICBwbGFu ZS0+c3RhdGUtPnNyY194LCBwbGFuZS0+c3RhdGUtPnNyY195LAorCQkJCSAgcGxhbmUtPnN0YXRl LT5zcmNfdywgcGxhbmUtPnN0YXRlLT5zcmNfaCk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg ZHJtX3BsYW5lX2Z1bmNzIGludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcyA9IHsKLS0gCjEuOC41LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==