From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Subject: [PATCH 2/6] drm/radeon: track memory statistics about VRAM and GTT usage and buffer moves Date: Mon, 24 Feb 2014 16:20:42 +0100 Message-ID: <1393255246-8296-3-git-send-email-maraeo@gmail.com> References: <1393255246-8296-1-git-send-email-maraeo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 92086FAAE8 for ; Mon, 24 Feb 2014 07:21:03 -0800 (PST) Received: by mail-ea0-f173.google.com with SMTP id n15so2057698ead.32 for ; Mon, 24 Feb 2014 07:21:02 -0800 (PST) Received: from localhost.localdomain ([194.228.11.204]) by mx.google.com with ESMTPSA id o43sm64864402eef.12.2014.02.24.07.21.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Feb 2014 07:21:02 -0800 (PST) In-Reply-To: <1393255246-8296-1-git-send-email-maraeo@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4KClRoZSBzdGF0aXN0aWNz IGFyZToKLSBWUkFNIHVzYWdlIGluIGJ5dGVzCi0gR1RUIHVzYWdlIGluIGJ5dGVzCi0gbnVtYmVy IG9mIGJ5dGVzIG1vdmVkIGJ5IFRUTQoKVGhlIGxhc3Qgb25lIGlzIGFjdHVhbGx5IGEgY291bnRl ciwgc28geW91IG5lZWQgdG8gc2FtcGxlIGl0IGJlZm9yZSBhbmQgYWZ0ZXIKY29tbWFuZCBzdWJt aXNzaW9uIGFuZCB0YWtlIHRoZSBkaWZmZXJlbmNlLgoKVGhpcyBpcyB1c2VmdWwgZm9yIGZpbmRp bmcgcGVyZm9ybWFuY2UgYm90dGxlbmVja3MuIFVzZXJzcGFjZSBxdWVyaWVzIGFyZQphbHNvIGFk ZGVkLgoKU2lnbmVkLW9mZi1ieTogTWFyZWsgT2zFocOhayA8bWFyZWsub2xzYWtAYW1kLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbi5oICAgICAgICB8ICA1ICsrKysrCiBk cml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYyB8ICAxICsKIGRyaXZlcnMvZ3B1 L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jICAgIHwgMTUgKysrKysrKysrKysrKysKIGRyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX29iamVjdC5jIHwgMzggKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fb2JqZWN0LmggfCAg MiArLQogZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdHRtLmMgICAgfCAxMCArKysrKysr Ky0KIGluY2x1ZGUvdWFwaS9kcm0vcmFkZW9uX2RybS5oICAgICAgICAgIHwgIDMgKysrCiA3IGZp bGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb24uaCBiL2RyaXZlcnMvZ3B1L2RybS9yYWRl b24vcmFkZW9uLmgKaW5kZXggM2YxMDc4Mi4uZDM3YTU3YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL3JhZGVvbi9yYWRlb24uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVv bi5oCkBAIC0yMzA3LDYgKzIzMDcsMTEgQEAgc3RydWN0IHJhZGVvbl9kZXZpY2UgewogCS8qIHZp cnR1YWwgbWVtb3J5ICovCiAJc3RydWN0IHJhZGVvbl92bV9tYW5hZ2VyCXZtX21hbmFnZXI7CiAJ c3RydWN0IG11dGV4CQkJZ3B1X2Nsb2NrX211dGV4OworCS8qIG1lbW9yeSBzdGF0cyAqLworCXN0 cnVjdCBtdXRleAkJCW1lbW9yeV9zdGF0c19tdXRleDsKKwl1aW50NjRfdAkJCXZyYW1fdXNhZ2U7 CisJdWludDY0X3QJCQlndHRfdXNhZ2U7CisJdWludDY0X3QJCQludW1fYnl0ZXNfbW92ZWQ7CiAJ LyogQUNQSSBpbnRlcmZhY2UgKi8KIAlzdHJ1Y3QgcmFkZW9uX2F0aWYJCWF0aWY7CiAJc3RydWN0 IHJhZGVvbl9hdGNzCQlhdGNzOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9y YWRlb25fZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZpY2UuYwpp bmRleCBiMDEyY2JiLi42NTY0YWY3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9u L3JhZGVvbl9kZXZpY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9kZXZp Y2UuYwpAQCAtMTE4NCw2ICsxMTg0LDcgQEAgaW50IHJhZGVvbl9kZXZpY2VfaW5pdChzdHJ1Y3Qg cmFkZW9uX2RldmljZSAqcmRldiwKIAltdXRleF9pbml0KCZyZGV2LT5nZW0ubXV0ZXgpOwogCW11 dGV4X2luaXQoJnJkZXYtPnBtLm11dGV4KTsKIAltdXRleF9pbml0KCZyZGV2LT5ncHVfY2xvY2tf bXV0ZXgpOworCW11dGV4X2luaXQoJnJkZXYtPm1lbW9yeV9zdGF0c19tdXRleCk7CiAJbXV0ZXhf aW5pdCgmcmRldi0+c3JibV9tdXRleCk7CiAJaW5pdF9yd3NlbSgmcmRldi0+cG0ubWNsa19sb2Nr KTsKIAlpbml0X3J3c2VtKCZyZGV2LT5leGNsdXNpdmVfbG9jayk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX2ttcy5jCmluZGV4IDBiNjMxZWIuLmRkYzhjNzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9yYWRlb24vcmFkZW9uX2ttcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX2ttcy5jCkBAIC00ODYsNiArNDg2LDIxIEBAIHN0YXRpYyBpbnQgcmFkZW9uX2luZm9f aW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxl CiAJY2FzZSBSQURFT05fSU5GT19WQ0VfRkJfVkVSU0lPTjoKIAkJKnZhbHVlID0gcmRldi0+dmNl LmZiX3ZlcnNpb247CiAJCWJyZWFrOworCWNhc2UgUkFERU9OX0lORk9fTlVNX0JZVEVTX01PVkVE OgorCQl2YWx1ZSA9ICh1aW50MzJfdCopJnZhbHVlNjQ7CisJCXZhbHVlX3NpemUgPSBzaXplb2Yo dWludDY0X3QpOworCQl2YWx1ZTY0ID0gcmRldi0+bnVtX2J5dGVzX21vdmVkOworCQlicmVhazsK KwljYXNlIFJBREVPTl9JTkZPX1ZSQU1fVVNBR0U6CisJCXZhbHVlID0gKHVpbnQzMl90KikmdmFs dWU2NDsKKwkJdmFsdWVfc2l6ZSA9IHNpemVvZih1aW50NjRfdCk7CisJCXZhbHVlNjQgPSByZGV2 LT52cmFtX3VzYWdlOworCQlicmVhazsKKwljYXNlIFJBREVPTl9JTkZPX0dUVF9VU0FHRToKKwkJ dmFsdWUgPSAodWludDMyX3QqKSZ2YWx1ZTY0OworCQl2YWx1ZV9zaXplID0gc2l6ZW9mKHVpbnQ2 NF90KTsKKwkJdmFsdWU2NCA9IHJkZXYtPmd0dF91c2FnZTsKKwkJYnJlYWs7CiAJZGVmYXVsdDoK IAkJRFJNX0RFQlVHX0tNUygiSW52YWxpZCByZXF1ZXN0ICVkXG4iLCBpbmZvLT5yZXF1ZXN0KTsK IAkJcmV0dXJuIC1FSU5WQUw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3Jh ZGVvbl9vYmplY3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX29iamVjdC5jCmlu ZGV4IGRkMTJiYjQuLmQ2NzZlZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24v cmFkZW9uX29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX29iamVj dC5jCkBAIC01NiwxMSArNTYsMzggQEAgc3RhdGljIHZvaWQgcmFkZW9uX2JvX2NsZWFyX3ZhKHN0 cnVjdCByYWRlb25fYm8gKmJvKQogCX0KIH0KIAorc3RhdGljIHZvaWQgcmFkZW9uX3VwZGF0ZV9t ZW1vcnlfdXNhZ2Uoc3RydWN0IHJhZGVvbl9ibyAqYm8sCisJCQkJICAgICAgIHVuc2lnbmVkIG1l bV90eXBlLCBpbnQgc2lnbikKK3sKKwlzdHJ1Y3QgcmFkZW9uX2RldmljZSAqcmRldiA9IGJvLT5y ZGV2OworCXU2NCBzaXplID0gKHU2NCliby0+dGJvLm51bV9wYWdlcyA8PCBQQUdFX1NISUZUOwor CisJbXV0ZXhfbG9jaygmcmRldi0+bWVtb3J5X3N0YXRzX211dGV4KTsKKwlzd2l0Y2ggKG1lbV90 eXBlKSB7CisJY2FzZSBUVE1fUExfVFQ6CisJCWlmIChzaWduID4gMCkKKwkJCXJkZXYtPmd0dF91 c2FnZSArPSBzaXplOworCQllbHNlCisJCQlyZGV2LT5ndHRfdXNhZ2UgLT0gc2l6ZTsKKwkJYnJl YWs7CisJY2FzZSBUVE1fUExfVlJBTToKKwkJaWYgKHNpZ24gPiAwKQorCQkJcmRldi0+dnJhbV91 c2FnZSArPSBzaXplOworCQllbHNlCisJCQlyZGV2LT52cmFtX3VzYWdlIC09IHNpemU7CisJCWJy ZWFrOworCX0KKwltdXRleF91bmxvY2soJnJkZXYtPm1lbW9yeV9zdGF0c19tdXRleCk7Cit9CisK IHN0YXRpYyB2b2lkIHJhZGVvbl90dG1fYm9fZGVzdHJveShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmpl Y3QgKnRibykKIHsKIAlzdHJ1Y3QgcmFkZW9uX2JvICpibzsKIAogCWJvID0gY29udGFpbmVyX29m KHRibywgc3RydWN0IHJhZGVvbl9ibywgdGJvKTsKKworCXJhZGVvbl91cGRhdGVfbWVtb3J5X3Vz YWdlKGJvLCBiby0+dGJvLm1lbS5tZW1fdHlwZSwgLTEpOworCiAJbXV0ZXhfbG9jaygmYm8tPnJk ZXYtPmdlbS5tdXRleCk7CiAJbGlzdF9kZWxfaW5pdCgmYm8tPmxpc3QpOwogCW11dGV4X3VubG9j aygmYm8tPnJkZXYtPmdlbS5tdXRleCk7CkBAIC01NjcsMTQgKzU5NCwyMyBAQCBpbnQgcmFkZW9u X2JvX2NoZWNrX3RpbGluZyhzdHJ1Y3QgcmFkZW9uX2JvICpibywgYm9vbCBoYXNfbW92ZWQsCiB9 CiAKIHZvaWQgcmFkZW9uX2JvX21vdmVfbm90aWZ5KHN0cnVjdCB0dG1fYnVmZmVyX29iamVjdCAq Ym8sCi0JCQkgICBzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbSkKKwkJCSAgIHN0cnVjdCB0dG1fbWVt X3JlZyAqbmV3X21lbSkKIHsKIAlzdHJ1Y3QgcmFkZW9uX2JvICpyYm87CisKIAlpZiAoIXJhZGVv bl90dG1fYm9faXNfcmFkZW9uX2JvKGJvKSkKIAkJcmV0dXJuOworCiAJcmJvID0gY29udGFpbmVy X29mKGJvLCBzdHJ1Y3QgcmFkZW9uX2JvLCB0Ym8pOwogCXJhZGVvbl9ib19jaGVja190aWxpbmco cmJvLCAwLCAxKTsKIAlyYWRlb25fdm1fYm9faW52YWxpZGF0ZShyYm8tPnJkZXYsIHJibyk7CisK KwkvKiB1cGRhdGUgc3RhdGlzdGljcyAqLworCWlmICghbmV3X21lbSkKKwkJcmV0dXJuOworCisJ cmFkZW9uX3VwZGF0ZV9tZW1vcnlfdXNhZ2UocmJvLCBiby0+bWVtLm1lbV90eXBlLCAtMSk7CisJ cmFkZW9uX3VwZGF0ZV9tZW1vcnlfdXNhZ2UocmJvLCBuZXdfbWVtLT5tZW1fdHlwZSwgMSk7CiB9 CiAKIGludCByYWRlb25fYm9fZmF1bHRfcmVzZXJ2ZV9ub3RpZnkoc3RydWN0IHR0bV9idWZmZXJf b2JqZWN0ICpibykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX29i amVjdC5oIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fb2JqZWN0LmgKaW5kZXggMjA5 YjExMS4uYTlhOGMxMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25f b2JqZWN0LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fb2JqZWN0LmgKQEAg LTE1MSw3ICsxNTEsNyBAQCBleHRlcm4gdm9pZCByYWRlb25fYm9fZ2V0X3RpbGluZ19mbGFncyhz dHJ1Y3QgcmFkZW9uX2JvICpibywKIGV4dGVybiBpbnQgcmFkZW9uX2JvX2NoZWNrX3RpbGluZyhz dHJ1Y3QgcmFkZW9uX2JvICpibywgYm9vbCBoYXNfbW92ZWQsCiAJCQkJYm9vbCBmb3JjZV9kcm9w KTsKIGV4dGVybiB2b2lkIHJhZGVvbl9ib19tb3ZlX25vdGlmeShzdHJ1Y3QgdHRtX2J1ZmZlcl9v YmplY3QgKmJvLAotCQkJCQlzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbSk7CisJCQkJICBzdHJ1Y3Qg dHRtX21lbV9yZWcgKm5ld19tZW0pOwogZXh0ZXJuIGludCByYWRlb25fYm9fZmF1bHRfcmVzZXJ2 ZV9ub3RpZnkoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibyk7CiBleHRlcm4gaW50IHJhZGVv bl9ib19nZXRfc3VyZmFjZV9yZWcoc3RydWN0IHJhZGVvbl9ibyAqYm8pOwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl90dG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX3R0bS5jCmluZGV4IDc3ZjViMGMuLjdlMmU4MzMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9yYWRlb24vcmFkZW9uX3R0bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9y YWRlb24vcmFkZW9uX3R0bS5jCkBAIC00MDYsOCArNDA2LDE2IEBAIHN0YXRpYyBpbnQgcmFkZW9u X2JvX21vdmUoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAlpZiAocikgewogbWVtY3B5 OgogCQlyID0gdHRtX2JvX21vdmVfbWVtY3B5KGJvLCBldmljdCwgbm9fd2FpdF9ncHUsIG5ld19t ZW0pOworCQlpZiAocikgeworCQkJcmV0dXJuIHI7CisJCX0KIAl9Ci0JcmV0dXJuIHI7CisKKwkv KiB1cGRhdGUgc3RhdGlzdGljcyAqLworCW11dGV4X2xvY2soJnJkZXYtPm1lbW9yeV9zdGF0c19t dXRleCk7CisJcmRldi0+bnVtX2J5dGVzX21vdmVkICs9ICh1NjQpYm8tPm51bV9wYWdlcyA8PCBQ QUdFX1NISUZUOworCW11dGV4X3VubG9jaygmcmRldi0+bWVtb3J5X3N0YXRzX211dGV4KTsKKwly ZXR1cm4gMDsKIH0KIAogc3RhdGljIGludCByYWRlb25fdHRtX2lvX21lbV9yZXNlcnZlKHN0cnVj dCB0dG1fYm9fZGV2aWNlICpiZGV2LCBzdHJ1Y3QgdHRtX21lbV9yZWcgKm1lbSkKZGlmZiAtLWdp dCBhL2luY2x1ZGUvdWFwaS9kcm0vcmFkZW9uX2RybS5oIGIvaW5jbHVkZS91YXBpL2RybS9yYWRl b25fZHJtLmgKaW5kZXggY2I1YzkzYS4uYWVmYTJmNiAxMDA2NDQKLS0tIGEvaW5jbHVkZS91YXBp L2RybS9yYWRlb25fZHJtLmgKKysrIGIvaW5jbHVkZS91YXBpL2RybS9yYWRlb25fZHJtLmgKQEAg LTEwMDQsNiArMTAwNCw5IEBAIHN0cnVjdCBkcm1fcmFkZW9uX2NzIHsKICNkZWZpbmUgUkFERU9O X0lORk9fVkNFX0ZXX1ZFUlNJT04JMHgxYgogLyogdmVyc2lvbiBvZiBWQ0UgZmVlZGJhY2sgKi8K ICNkZWZpbmUgUkFERU9OX0lORk9fVkNFX0ZCX1ZFUlNJT04JMHgxYworI2RlZmluZSBSQURFT05f SU5GT19OVU1fQllURVNfTU9WRUQJMHgxZAorI2RlZmluZSBSQURFT05fSU5GT19WUkFNX1VTQUdF CQkweDFlCisjZGVmaW5lIFJBREVPTl9JTkZPX0dUVF9VU0FHRQkJMHgxZgogCiAKIHN0cnVjdCBk cm1fcmFkZW9uX2luZm8gewotLSAKMS44LjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK