From: Matt Roper Subject: [RFC 02/15] drm/i915: Drop parameters to intel_update_sprite_watermarks() Date: Wed, 20 May 2015 19:12:14 -0700 Message-ID: <1432174347-19138-3-git-send-email-matthew.d.roper@intel.com> References: <1432174347-19138-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 92D466E807 for ; Wed, 20 May 2015 19:12:29 -0700 (PDT) In-Reply-To: <1432174347-19138-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 VGhlIHZhbHVlcyB0aGF0IHVsdGltYXRlbHkgZ2V0IHBhc3NlZCB0bwppbnRlbF91cGRhdGVfc3By aXRlX3dhdGVybWFya3MoKSBhcmUgcHVsbGVkIG91dCBvZiB0aGUgcGxhbmUgc3RhdGUKKHdoaWNo IGhhcyBhbHJlYWR5IGJlZW4gc3dhcHBlZCBpbnRvIHBsYW5lLT5zdGF0ZSkgYXMgd2UgdXBkYXRl IHRoZQpwbGFuZSBwcm9ncmFtbWluZy4gIERyb3AgdGhlIGZ1bmN0aW9uIHBhcmFtZXRlcnMgYW5k IGp1c3QgcHVsbCB0aGUKcmVsZXZhbnQgdmFsdWVzIG91dCBvZiB0aGUgc3RhdGUgc3RydWN0dXJl IGluc2lkZSB0aGUgZnVuY3Rpb24uCgpUaGlzIGNoYW5nZSB3aWxsIG1ha2UgaXQgZWFzaWVyIGZv ciB1cyB0byBleHRyYWN0IHRoZSBzcHJpdGUgV00KcHJvZ3JhbW1pbmcgb3V0IG9mIHRoZSBsb3ct bGV2ZWwgZm9vX3VwZGF0ZV9wbGFuZSgpIGZ1bmN0aW9ucyAod2hpY2ggYXJlCnJ1biB1bmRlciB2 YmxhbmsgZXZhc2lvbiBhbmQgc2hvdWxkbid0IGJlIGNhbGxpbmcgcG90ZW50aWFsbHkgYmxvY2tp bmcKd2F0ZXJtYXJrIGZ1bmN0aW9ucykuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0 aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwg IDYgKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgfCAxNyArKysr KysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgIHwgMjEg KysrKysrLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyks IDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAx ZDcwMzQ5Li4wNzEzMjU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0x MzI0MCw4ICsxMzI0MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChz dHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJZHJtX2Zvcl9lYWNoX2xlZ2FjeV9wbGFuZShwLCAmZGV2 LT5tb2RlX2NvbmZpZy5wbGFuZV9saXN0KQogCQlpZiAoaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0 ZV9zcHJpdGVfd2F0ZXJtYXJrcyAmCiAJCSAgICAoMSA8PCBkcm1fcGxhbmVfaW5kZXgocCkpKQot CQkJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHAsIGNydGMsIDAsIDAsIDAsCi0JCQkJ CQkgICAgICAgZmFsc2UsIGZhbHNlKTsKKwkJCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJr cyhwLCBjcnRjKTsKIAogCW1lbXNldCgmaW50ZWxfY3J0Yy0+YXRvbWljLCAwLCBzaXplb2YoaW50 ZWxfY3J0Yy0+YXRvbWljKSk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDQ3YmM3 MjkuLmZlOTY2Y2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0xMzQ0LDExICsxMzQ0 LDcgQEAgdm9pZCBpbnRlbF9zdXNwZW5kX2h3KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50 IGlsa193bV9tYXhfbGV2ZWwoY29uc3Qgc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGlu dGVsX3VwZGF0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVs X3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkg ICAgc3RydWN0IGRybV9jcnRjICpjcnRjLAotCQkJCSAgICB1aW50MzJfdCBzcHJpdGVfd2lkdGgs Ci0JCQkJICAgIHVpbnQzMl90IHNwcml0ZV9oZWlnaHQsCi0JCQkJICAgIGludCBwaXhlbF9zaXpl LAotCQkJCSAgICBib29sIGVuYWJsZWQsIGJvb2wgc2NhbGVkKTsKKwkJCQkgICAgc3RydWN0IGRy bV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKIHZvaWQgaW50ZWxfcG1fc2V0dXAoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGlu dGVsX2dwdV9pcHNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMKaW5kZXggY2UxZDA3OS4uMjE3MGNjNSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9wbS5jCkBAIC0zNzU2LDEzICszNzU2LDIwIEBAIHZvaWQgaW50ZWxfdXBkYXRlX3dhdGVy bWFya3Moc3RydWN0IGRybV9jcnRjICpjcnRjKQogfQogCiB2b2lkIGludGVsX3VwZGF0ZV9zcHJp dGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCQkgICAgc3RydWN0IGRy bV9jcnRjICpjcnRjLAotCQkJCSAgICB1aW50MzJfdCBzcHJpdGVfd2lkdGgsCi0JCQkJICAgIHVp bnQzMl90IHNwcml0ZV9oZWlnaHQsCi0JCQkJICAgIGludCBwaXhlbF9zaXplLAotCQkJCSAgICBi b29sIGVuYWJsZWQsIGJvb2wgc2NhbGVkKQorCQkJCSAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcGxhbmUtPmRldi0+ZGV2 X3ByaXZhdGU7CisJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSA9IHRvX2ludGVsX3Bs YW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBz dGF0ZS0+YmFzZS5mYjsKKwl1aW50MzJfdCBzcHJpdGVfd2lkdGggPSBkcm1fcmVjdF93aWR0aCgm c3RhdGUtPmRzdCk7CisJdWludDMyX3Qgc3ByaXRlX2hlaWdodCA9IGRybV9yZWN0X2hlaWdodCgm c3RhdGUtPmRzdCk7CisJaW50IHBpeGVsX3NpemUgPSBmYiA/IGRybV9mb3JtYXRfcGxhbmVfY3Bw KGZiLT5waXhlbF9mb3JtYXQsIDApIDogMDsKKwlib29sIGVuYWJsZWQgPSBzdGF0ZS0+dmlzaWJs ZTsKKwl1bnNpZ25lZCBpbnQgc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPnNyYykgPj4g MTY7CisJdW5zaWduZWQgaW50IHNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+c3JjKSA+ PiAxNjsKKwl1bnNpZ25lZCBpbnQgZHN0X3cgPSBkcm1fcmVjdF93aWR0aCgmc3RhdGUtPmRzdCk7 CisJdW5zaWduZWQgaW50IGRzdF9oID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+ZHN0KTsKKwli b29sIHNjYWxlZCA9IChzcmNfdyAhPSBkc3RfdyB8fCBzcmNfaCAhPSBkc3RfaCk7CiAKIAlpZiAo ZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3Nwcml0ZV93bSkKIAkJZGV2X3ByaXYtPmRpc3BsYXku dXBkYXRlX3Nwcml0ZV93bShwbGFuZSwgY3J0YywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKaW5kZXggM2Y3MGQ1OS4uM2E5Njk1NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKQEAgLTE4MSw3ICsxODEsNiBAQCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWNvbnN0IGludCBwaXBlID0gaW50 ZWxfcGxhbmUtPnBpcGU7CiAJY29uc3QgaW50IHBsYW5lID0gaW50ZWxfcGxhbmUtPnBsYW5lICsg MTsKIAl1MzIgcGxhbmVfY3RsLCBzdHJpZGVfZGl2LCBzdHJpZGU7Ci0JaW50IHBpeGVsX3NpemUg PSBkcm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKIAljb25zdCBzdHJ1 Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqa2V5ID0gJmludGVsX3BsYW5lLT5ja2V5Owog CXVuc2lnbmVkIGxvbmcgc3VyZl9hZGRyOwogCXUzMiB0aWxlX2hlaWdodCwgcGxhbmVfb2Zmc2V0 LCBwbGFuZV9zaXplOwpAQCAtMTk5LDkgKzE5OCw3IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcm90YXRpb24g PSBkcm1fcGxhbmUtPnN0YXRlLT5yb3RhdGlvbjsKIAlwbGFuZV9jdGwgfD0gc2tsX3BsYW5lX2N0 bF9yb3RhdGlvbihyb3RhdGlvbik7CiAKLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3Mo ZHJtX3BsYW5lLCBjcnRjLCBzcmNfdywgc3JjX2gsCi0JCQkJICAgICAgIHBpeGVsX3NpemUsIHRy dWUsCi0JCQkJICAgICAgIHNyY193ICE9IGNydGNfdyB8fCBzcmNfaCAhPSBjcnRjX2gpOworCWlu dGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcm1fcGxhbmUsIGNydGMpOwogCiAJc3RyaWRl X2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2LCBmYi0+bW9kaWZpZXJbMF0sCiAJ CQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKQEAgLTI4Niw3ICsyODMsNyBAQCBza2xfZGlz YWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywgYm9vbCBmb3JjZSkKIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlwZSwgcGxhbmUpLCAwKTsK IAlQT1NUSU5HX1JFQUQoUExBTkVfU1VSRihwaXBlLCBwbGFuZSkpOwogCi0JaW50ZWxfdXBkYXRl X3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFuZSwgY3J0YywgMCwgMCwgMCwgZmFsc2UsIGZhbHNlKTsK KwlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjKTsKIH0KIAogc3Rh dGljIHZvaWQKQEAgLTQwMiw5ICszOTksNyBAQCB2bHZfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1f cGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChvYmotPnRpbGluZ19t b2RlICE9IEk5MTVfVElMSU5HX05PTkUpCiAJCXNwcmN0bCB8PSBTUF9USUxFRDsKIAotCWludGVs X3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcGxhbmUsIGNydGMsIHNyY193LCBzcmNfaCwKLQkJ CQkgICAgICAgcGl4ZWxfc2l6ZSwgdHJ1ZSwKLQkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193IHx8 IHNyY19oICE9IGNydGNfaCk7CisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFu ZSwgY3J0Yyk7CiAKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNyY193LS07CkBAIC00NzQs NyArNDY5LDcgQEAgdmx2X2Rpc2FibGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMsIGJvb2wgZm9yY2UpCiAKIAlpbnRlbF9mbHVzaF9wcmltYXJ5 X3BsYW5lKGRldl9wcml2LCBpbnRlbF9jcnRjLT5wbGFuZSk7CiAKLQlpbnRlbF91cGRhdGVfc3By aXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjLCAwLCAwLCAwLCBmYWxzZSwgZmFsc2UpOworCWlu dGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcGxhbmUsIGNydGMpOwogfQogCiAKQEAgLTUz OSw5ICs1MzQsNyBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKElTX0hBU1dFTEwoZGV2KSB8fCBJU19CUk9BRFdF TEwoZGV2KSkKIAkJc3ByY3RsIHw9IFNQUklURV9QSVBFX0NTQ19FTkFCTEU7CiAKLQlpbnRlbF91 cGRhdGVfc3ByaXRlX3dhdGVybWFya3MocGxhbmUsIGNydGMsIHNyY193LCBzcmNfaCwgcGl4ZWxf c2l6ZSwKLQkJCQkgICAgICAgdHJ1ZSwKLQkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193IHx8IHNy Y19oICE9IGNydGNfaCk7CisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBj cnRjKTsKIAogCS8qIFNpemVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKQEAgLTY3OCw5ICs2 NzEsNyBAQCBpbGtfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3Qg ZHJtX2NydGMgKmNydGMsCiAJaWYgKElTX0dFTjYoZGV2KSkKIAkJZHZzY250ciB8PSBEVlNfVFJJ Q0tMRV9GRUVEX0RJU0FCTEU7IC8qIG11c3QgZGlzYWJsZSAqLwogCi0JaW50ZWxfdXBkYXRlX3Nw cml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjLCBzcmNfdywgc3JjX2gsCi0JCQkJICAgICAgIHBp eGVsX3NpemUsIHRydWUsCi0JCQkJICAgICAgIHNyY193ICE9IGNydGNfdyB8fCBzcmNfaCAhPSBj cnRjX2gpOworCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0Yyk7CiAK IAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNyY193LS07Ci0tIAoxLjguNS4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=