From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 03/13] drm/i915: Split watermark level computation from the code Date: Tue, 6 Aug 2013 22:24:02 +0300 Message-ID: <1375817052-32310-4-git-send-email-ville.syrjala@linux.intel.com> References: <1375817052-32310-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id EDD2FE5CCB for ; Tue, 6 Aug 2013 12:24:28 -0700 (PDT) In-Reply-To: <1375817052-32310-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClJl ZmFjdG9yIHRoZSB3YXRlcm1hcmtzIGNvbXB1dGF0aW9uIGZvciBvbmUgbGV2ZWwgdG8gYSBzZXBh cmF0ZQpmdW5jdGlvbi4gVGhpcyBmdW5jdGlvbiB3aWxsIG5vdyBzZXQgdGhlIC0+ZW5hYmxlIGZs YXQgdG8gdHJ1ZSwKZXZlbiBpZiB0aGUgd2F0ZXJtYXJrIGxldmVsIHdhc24ndCBhY3R1YWxseSBj aGVja2VkIHlldC4gSW4gdGhlCmZ1dHVyZSB3ZSB3aWxsIGRlbGF5IHRoZSBjaGVja2luZyBzbyB3 ZSBtdXN0IGNvbnNpZGVyIGFsbCB1bmNoZWNrZWQKd2F0ZXJtYXJrcyBhcyBwb3NzaWJseSB2YWxp ZC4KCnYyOiBQcmVzZXJ2ZSBjb21tZW50IGFib3V0IGxhdGVuY3kgdW5pdHMKClNpZ25lZC1vZmYt Ynk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyB8IDUxICsrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwg MTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZjIzNzRlMC4uOGEz Y2RlMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yMjkwLDYgKzIyOTAsOSBAQCBzdGF0 aWMgYm9vbCBpbGtfY2hlY2tfd20oaW50IGxldmVsLAogewogCWJvb2wgcmV0OwogCisJaWYgKCFy ZXN1bHQtPmVuYWJsZSkKKwkJcmV0dXJuIGZhbHNlOworCiAJcmVzdWx0LT5lbmFibGUgPSByZXN1 bHQtPnByaV92YWwgPD0gbWF4LT5wcmkgJiYKIAkJCSByZXN1bHQtPnNwcl92YWwgPD0gbWF4LT5z cHIgJiYKIAkJCSByZXN1bHQtPmN1cl92YWwgPD0gbWF4LT5jdXI7CkBAIC0yMzE0LDMxICsyMzE3 LDQ1IEBAIHN0YXRpYyBib29sIGlsa19jaGVja193bShpbnQgbGV2ZWwsCiAJcmV0dXJuIHJldDsK IH0KIAorc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fbGV2ZWwoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAorCQkJCSBpbnQgbGV2ZWwsCisJCQkJIHN0cnVjdCBoc3dfcGlwZV93 bV9wYXJhbWV0ZXJzICpwLAorCQkJCSBzdHJ1Y3QgaHN3X2xwX3dtX3Jlc3VsdCAqcmVzdWx0KQor eworCXVpbnQxNl90IHByaV9sYXRlbmN5ID0gZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5W2xldmVs XTsKKwl1aW50MTZfdCBzcHJfbGF0ZW5jeSA9IGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeVtsZXZl bF07CisJdWludDE2X3QgY3VyX2xhdGVuY3kgPSBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3lbbGV2 ZWxdOworCisJLyogV00xKyBsYXRlbmN5IHZhbHVlcyBzdG9yZWQgaW4gMC41dXMgdW5pdHMgKi8K KwlpZiAobGV2ZWwgPiAwKSB7CisJCXByaV9sYXRlbmN5ICo9IDU7CisJCXNwcl9sYXRlbmN5ICo9 IDU7CisJCWN1cl9sYXRlbmN5ICo9IDU7CisJfQorCisJcmVzdWx0LT5wcmlfdmFsID0gaWxrX2Nv bXB1dGVfcHJpX3dtKHAsIHByaV9sYXRlbmN5LCBsZXZlbCk7CisJcmVzdWx0LT5zcHJfdmFsID0g aWxrX2NvbXB1dGVfc3ByX3dtKHAsIHNwcl9sYXRlbmN5KTsKKwlyZXN1bHQtPmN1cl92YWwgPSBp bGtfY29tcHV0ZV9jdXJfd20ocCwgY3VyX2xhdGVuY3kpOworCXJlc3VsdC0+ZmJjX3ZhbCA9IGls a19jb21wdXRlX2ZiY193bShwLCByZXN1bHQtPnByaV92YWwpOworCXJlc3VsdC0+ZW5hYmxlID0g dHJ1ZTsKK30KKwogc3RhdGljIGJvb2wgaHN3X2NvbXB1dGVfbHBfd20oc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgaW50IGxldmVsLCBzdHJ1Y3QgaHN3X3dtX21h eGltdW1zICptYXgsCiAJCQkgICAgICBzdHJ1Y3QgaHN3X3BpcGVfd21fcGFyYW1ldGVycyAqcGFy YW1zLAogCQkJICAgICAgc3RydWN0IGhzd19scF93bV9yZXN1bHQgKnJlc3VsdCkKIHsKIAllbnVt IHBpcGUgcGlwZTsKLQl1aW50MzJfdCBwcmlfdmFsWzNdLCBzcHJfdmFsWzNdLCBjdXJfdmFsWzNd LCBmYmNfdmFsWzNdOworCXN0cnVjdCBoc3dfbHBfd21fcmVzdWx0IHJlc1szXTsKIAotCWZvciAo cGlwZSA9IFBJUEVfQTsgcGlwZSA8PSBQSVBFX0M7IHBpcGUrKykgewotCQlzdHJ1Y3QgaHN3X3Bp cGVfd21fcGFyYW1ldGVycyAqcCA9ICZwYXJhbXNbcGlwZV07Ci0JCS8qIFdNMSsgbGF0ZW5jeSB2 YWx1ZXMgc3RvcmVkIGluIDAuNXVzIHVuaXRzICovCi0JCXVpbnQxNl90IHByaV9sYXRlbmN5ID0g ZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5W2xldmVsXSAqIDU7Ci0JCXVpbnQxNl90IHNwcl9sYXRl bmN5ID0gZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5W2xldmVsXSAqIDU7Ci0JCXVpbnQxNl90IGN1 cl9sYXRlbmN5ID0gZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5W2xldmVsXSAqIDU7Ci0KLQkJcHJp X3ZhbFtwaXBlXSA9IGlsa19jb21wdXRlX3ByaV93bShwLCBwcmlfbGF0ZW5jeSwgdHJ1ZSk7Ci0J CXNwcl92YWxbcGlwZV0gPSBpbGtfY29tcHV0ZV9zcHJfd20ocCwgc3ByX2xhdGVuY3kpOwotCQlj dXJfdmFsW3BpcGVdID0gaWxrX2NvbXB1dGVfY3VyX3dtKHAsIGN1cl9sYXRlbmN5KTsKLQkJZmJj X3ZhbFtwaXBlXSA9IGlsa19jb21wdXRlX2ZiY193bShwLCBwcmlfdmFsW3BpcGVdKTsKLQl9CisJ Zm9yIChwaXBlID0gUElQRV9BOyBwaXBlIDw9IFBJUEVfQzsgcGlwZSsrKQorCQlpbGtfY29tcHV0 ZV93bV9sZXZlbChkZXZfcHJpdiwgbGV2ZWwsICZwYXJhbXNbcGlwZV0sICZyZXNbcGlwZV0pOwog Ci0JcmVzdWx0LT5wcmlfdmFsID0gbWF4MyhwcmlfdmFsWzBdLCBwcmlfdmFsWzFdLCBwcmlfdmFs WzJdKTsKLQlyZXN1bHQtPnNwcl92YWwgPSBtYXgzKHNwcl92YWxbMF0sIHNwcl92YWxbMV0sIHNw cl92YWxbMl0pOwotCXJlc3VsdC0+Y3VyX3ZhbCA9IG1heDMoY3VyX3ZhbFswXSwgY3VyX3ZhbFsx XSwgY3VyX3ZhbFsyXSk7Ci0JcmVzdWx0LT5mYmNfdmFsID0gbWF4MyhmYmNfdmFsWzBdLCBmYmNf dmFsWzFdLCBmYmNfdmFsWzJdKTsKKwlyZXN1bHQtPnByaV92YWwgPSBtYXgzKHJlc1swXS5wcmlf dmFsLCByZXNbMV0ucHJpX3ZhbCwgcmVzWzJdLnByaV92YWwpOworCXJlc3VsdC0+c3ByX3ZhbCA9 IG1heDMocmVzWzBdLnNwcl92YWwsIHJlc1sxXS5zcHJfdmFsLCByZXNbMl0uc3ByX3ZhbCk7CisJ cmVzdWx0LT5jdXJfdmFsID0gbWF4MyhyZXNbMF0uY3VyX3ZhbCwgcmVzWzFdLmN1cl92YWwsIHJl c1syXS5jdXJfdmFsKTsKKwlyZXN1bHQtPmZiY192YWwgPSBtYXgzKHJlc1swXS5mYmNfdmFsLCBy ZXNbMV0uZmJjX3ZhbCwgcmVzWzJdLmZiY192YWwpOworCXJlc3VsdC0+ZW5hYmxlID0gdHJ1ZTsK IAogCWlmIChyZXN1bHQtPmZiY192YWwgPiBtYXgtPmZiYykgewogCQlyZXN1bHQtPmZiY19lbmFi bGUgPSBmYWxzZTsKLS0gCjEuOC4xLjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==