From: ville.syrjala@linux.intel.com Subject: [PATCH 01/35] drm/i915: Add scaled paramater to update_sprite_watermarks() Date: Fri, 5 Jul 2013 11:57:13 +0300 Message-ID: <1373014667-19484-2-git-send-email-ville.syrjala@linux.intel.com> References: <1373014667-19484-1-git-send-email-ville.syrjala@linux.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 ACB84E6755 for ; Fri, 5 Jul 2013 01:58:02 -0700 (PDT) In-Reply-To: <1373014667-19484-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZy byBjYWxjdWxhdGluZyB3YXRlcm1hcmtzIHdlIHdhbnQgdG8ga25vdyB3aGV0aGVyIHNwcml0ZXMg YXJlCnNjYWxlZC4gUGFzcyB0aGF0IGluZm9ybWF0aW9uIHRvIHVwZGF0ZV9zcHJpdGVfd2F0ZXJt YXJrcygpIHNvIHRoYXQKZXZlbnR1YWxseSB3ZSBtYXkgZG8gc29tZSB3YXRlcm1hcmsgcHJlLWNv bXB1dGluZy4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBs aW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgfCAgNyArKysrLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICB8IDEzICsrKysrKystLS0tLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIHwgMTEgKysrKysrKy0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKaW5kZXggZmQwZjU4OS4uOTllYjk4MCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCkBAIC0zNjEsNyArMzYxLDcgQEAgc3RydWN0IGRybV9pOTE1X2Rpc3BsYXlfZnVuY3Mg ewogCXZvaWQgKCp1cGRhdGVfd20pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCXZvaWQgKCp1 cGRhdGVfc3ByaXRlX3dtKShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSwKIAkJCQkg dWludDMyX3Qgc3ByaXRlX3dpZHRoLCBpbnQgcGl4ZWxfc2l6ZSwKLQkJCQkgYm9vbCBlbmFibGUp OworCQkJCSBib29sIGVuYWJsZSwgYm9vbCBzY2FsZWQpOwogCXZvaWQgKCptb2Rlc2V0X2dsb2Jh bF9yZXNvdXJjZXMpKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCS8qIFJldHVybnMgdGhlIGFj dGl2ZSBzdGF0ZSBvZiB0aGUgY3J0YywgYW5kIGlmIHRoZSBjcnRjIGlzIGFjdGl2ZSwKIAkgKiBm aWxscyBvdXQgdGhlIHBpcGUtY29uZmlnIHdpdGggdGhlIGh3IHN0YXRlLiAqLwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAppbmRleCA1ZGZjMWEwLi4zMzcxZWNjIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcnYuaApAQCAtMzUzLDcgKzM1Myw4IEBAIHN0cnVjdCBpbnRlbF9wbGFuZSB7CiAJICogZm9y IHRoZSB3YXRlcm1hcmsgY2FsY3VsYXRpb25zLiBDdXJyZW50bHkgb25seSBIYXN3ZWxsIHVzZXMg dGhpcy4KIAkgKi8KIAlzdHJ1Y3QgewotCQlib29sIGVuYWJsZTsKKwkJYm9vbCBlbmFibGVkOwor CQlib29sIHNjYWxlZDsKIAkJdWludDhfdCBieXRlc19wZXJfcGl4ZWw7CiAJCXVpbnQzMl90IGhv cml6X3BpeGVsczsKIAl9IHdtOwpAQCAtNzcyLDggKzc3Myw4IEBAIGV4dGVybiB2b2lkIGludGVs X2RkaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcG9ydCBwb3J0KTsKIC8qIEZv ciB1c2UgYnkgSVZCIExQIHdhdGVybWFyayB3b3JrYXJvdW5kIGluIGludGVsX3Nwcml0ZS5jICov CiBleHRlcm4gdm9pZCBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KTsKIGV4dGVybiB2b2lkIGludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSwKLQkJCQkJICAgdWludDMyX3Qgc3ByaXRlX3dpZHRo LAotCQkJCQkgICBpbnQgcGl4ZWxfc2l6ZSwgYm9vbCBlbmFibGUpOworCQkJCQkgICB1aW50MzJf dCBzcHJpdGVfd2lkdGgsIGludCBwaXhlbF9zaXplLAorCQkJCQkgICBib29sIGVuYWJsZWQsIGJv b2wgc2NhbGVkKTsKIAogZXh0ZXJuIHVuc2lnbmVkIGxvbmcgaW50ZWxfZ2VuNF9jb21wdXRlX3Bh Z2Vfb2Zmc2V0KGludCAqeCwgaW50ICp5LAogCQkJCQkJICAgIHVuc2lnbmVkIGludCB0aWxpbmdf bW9kZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDdjZmQzYjcuLmJlY2ExODYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjM4OCw3ICsyMzg4LDcgQEAgc3RhdGljIHZvaWQgaHN3 X2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlwaXBlID0g aW50ZWxfcGxhbmUtPnBpcGU7CiAJCXAgPSAmcGFyYW1zW3BpcGVdOwogCi0JCXAtPnNwcml0ZV9l bmFibGVkID0gaW50ZWxfcGxhbmUtPndtLmVuYWJsZTsKKwkJcC0+c3ByaXRlX2VuYWJsZWQgPSBp bnRlbF9wbGFuZS0+d20uZW5hYmxlZDsKIAkJcC0+c3ByX2J5dGVzX3Blcl9waXhlbCA9IGludGVs X3BsYW5lLT53bS5ieXRlc19wZXJfcGl4ZWw7CiAJCXAtPnNwcl9ob3Jpel9waXhlbHMgPSBpbnRl bF9wbGFuZS0+d20uaG9yaXpfcGl4ZWxzOwogCkBAIC0yNjE2LDcgKzI2MTYsNyBAQCBzdGF0aWMg dm9pZCBoYXN3ZWxsX3VwZGF0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiBzdGF0aWMg dm9pZCBoYXN3ZWxsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50 IHBpcGUsCiAJCQkJICAgICB1aW50MzJfdCBzcHJpdGVfd2lkdGgsIGludCBwaXhlbF9zaXplLAot CQkJCSAgICAgYm9vbCBlbmFibGUpCisJCQkJICAgICBib29sIGVuYWJsZWQsIGJvb2wgc2NhbGVk KQogewogCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCkBAIC0yNjI0LDcgKzI2MjQsOCBAQCBz dGF0aWMgdm9pZCBoYXN3ZWxsX3VwZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRl diwgaW50IHBpcGUsCiAJCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRl bF9wbGFuZShwbGFuZSk7CiAKIAkJaWYgKGludGVsX3BsYW5lLT5waXBlID09IHBpcGUpIHsKLQkJ CWludGVsX3BsYW5lLT53bS5lbmFibGUgPSBlbmFibGU7CisJCQlpbnRlbF9wbGFuZS0+d20uZW5h YmxlZCA9IGVuYWJsZWQ7CisJCQlpbnRlbF9wbGFuZS0+d20uc2NhbGVkID0gc2NhbGVkOwogCQkJ aW50ZWxfcGxhbmUtPndtLmhvcml6X3BpeGVscyA9IHNwcml0ZV93aWR0aCArIDE7CiAJCQlpbnRl bF9wbGFuZS0+d20uYnl0ZXNfcGVyX3BpeGVsID0gcGl4ZWxfc2l6ZTsKIAkJCWJyZWFrOwpAQCAt MjcxMiw3ICsyNzEzLDcgQEAgc2FuZHlicmlkZ2VfY29tcHV0ZV9zcHJpdGVfc3J3bShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCBpbnQgcGxhbmUsCiAKIHN0YXRpYyB2b2lkIHNhbmR5YnJpZGdlX3Vw ZGF0ZV9zcHJpdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IHBpcGUsCiAJCQkJCSB1 aW50MzJfdCBzcHJpdGVfd2lkdGgsIGludCBwaXhlbF9zaXplLAotCQkJCQkgYm9vbCBlbmFibGUp CisJCQkJCSBib29sIGVuYWJsZSwgYm9vbCBzY2FsZWQpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlpbnQgbGF0ZW5jeSA9IFNOQl9S RUFEX1dNMF9MQVRFTkNZKCkgKiAxMDA7CS8qIEluIHVuaXQgMC4xdXMgKi8KQEAgLTI4MzUsMTMg KzI4MzYsMTMgQEAgdm9pZCBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCiB2b2lkIGludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBpbnQgcGlwZSwKIAkJCQkgICAgdWludDMyX3Qgc3ByaXRlX3dpZHRoLCBp bnQgcGl4ZWxfc2l6ZSwKLQkJCQkgICAgYm9vbCBlbmFibGUpCisJCQkJICAgIGJvb2wgZW5hYmxl LCBib29sIHNjYWxlZCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9zcHJpdGVf d20pCiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9zcHJpdGVfd20oZGV2LCBwaXBlLCBzcHJp dGVfd2lkdGgsCi0JCQkJCQkgICBwaXhlbF9zaXplLCBlbmFibGUpOworCQkJCQkJICAgcGl4ZWxf c2l6ZSwgZW5hYmxlLCBzY2FsZWQpOwogfQogCiBzdGF0aWMgc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCAxZmE1NjEyLi41YTFm M2ZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTE0LDcgKzExNCw4IEBA IHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2Zy YW1lYnVmZmVyICpmYiwKIAljcnRjX3ctLTsKIAljcnRjX2gtLTsKIAotCWludGVsX3VwZGF0ZV9z cHJpdGVfd2F0ZXJtYXJrcyhkZXYsIHBpcGUsIGNydGNfdywgcGl4ZWxfc2l6ZSwgdHJ1ZSk7CisJ aW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRldiwgcGlwZSwgY3J0Y193LCBwaXhlbF9z aXplLCB0cnVlLAorCQkJCSAgICAgICBzcmNfdyAhPSBjcnRjX3cgfHwgc3JjX2ggIT0gY3J0Y19o KTsKIAogCUk5MTVfV1JJVEUoU1BTVFJJREUocGlwZSwgcGxhbmUpLCBmYi0+cGl0Y2hlc1swXSk7 CiAJSTkxNV9XUklURShTUFBPUyhwaXBlLCBwbGFuZSksIChjcnRjX3kgPDwgMTYpIHwgY3J0Y194 KTsKQEAgLTI2OCw3ICsyNjksOCBAQCBpdmJfdXBkYXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg KnBsYW5lLCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAljcnRjX3ctLTsKIAljcnRjX2gt LTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkZXYsIHBpcGUsIGNydGNfdywg cGl4ZWxfc2l6ZSwgdHJ1ZSk7CisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRldiwg cGlwZSwgY3J0Y193LCBwaXhlbF9zaXplLCB0cnVlLAorCQkJCSAgICAgICBzcmNfdyAhPSBjcnRj X3cgfHwgc3JjX2ggIT0gY3J0Y19oKTsKIAogCS8qCiAJICogSVZCIHdvcmthcm91bmQ6IG11c3Qg ZGlzYWJsZSBsb3cgcG93ZXIgd2F0ZXJtYXJrcyBmb3IgYXQgbGVhc3QKQEAgLTMzNSw3ICszMzcs NyBAQCBpdmJfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKIAogCWRldl9w cml2LT5zcHJpdGVfc2NhbGluZ19lbmFibGVkICY9IH4oMSA8PCBwaXBlKTsKIAotCWludGVsX3Vw ZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkZXYsIHBpcGUsIDAsIDAsIGZhbHNlKTsKKwlpbnRlbF91 cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZGV2LCBwaXBlLCAwLCAwLCBmYWxzZSwgZmFsc2UpOwog CiAJLyogcG90ZW50aWFsbHkgcmUtZW5hYmxlIExQIHdhdGVybWFya3MgKi8KIAlpZiAoc2NhbGlu Z193YXNfZW5hYmxlZCAmJiAhZGV2X3ByaXYtPnNwcml0ZV9zY2FsaW5nX2VuYWJsZWQpCkBAIC00 NTUsNyArNDU3LDggQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwg c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCiAJY3J0Y193LS07CiAJY3J0Y19oLS07CiAKLQlp bnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZGV2LCBwaXBlLCBjcnRjX3csIHBpeGVsX3Np emUsIHRydWUpOworCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkZXYsIHBpcGUsIGNy dGNfdywgcGl4ZWxfc2l6ZSwgdHJ1ZSwKKwkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193IHx8IHNy Y19oICE9IGNydGNfaCk7CiAKIAlkdnNzY2FsZSA9IDA7CiAJaWYgKElTX0dFTjUoZGV2KSB8fCBj cnRjX3cgIT0gc3JjX3cgfHwgY3J0Y19oICE9IHNyY19oKQotLSAKMS44LjEuNQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK