From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger He Subject: [PATCH 1/2] drm/ttm: don't update global memory count for some special cases Date: Fri, 12 Jan 2018 14:14:16 +0800 Message-ID: <1515737657-2983-1-git-send-email-Hongbo.He@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0077.outbound.protection.outlook.com [104.47.37.77]) by gabe.freedesktop.org (Postfix) with ESMTPS id EED0C6E6E3 for ; Fri, 12 Jan 2018 06:14:25 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Roger He , Christian.Koenig@amd.com List-Id: dri-devel@lists.freedesktop.org YWRkIGlucHV0IHBhcmFtZXRlciBmb3IgdHRtX2RtYV91bnBvcHVsYXRlLgp3aGVuIHR0bV9kbWFf cG9vbF9nZXRfcGFnZXMgb3IgdHRtX21lbV9nbG9iYWxfYWxsb2NfcGFnZSBmYWlsLCBkb24ndApj YWxsIHR0bV9tZW1fZ2xvYmFsX2ZyZWVfcGFnZSB0byB1cGRhdGUgZ2xvYmFsIG1lbW9yeSBjb3Vu dC4KClNpZ25lZC1vZmYtYnk6IFJvZ2VyIEhlIDxIb25nYm8uSGVAYW1kLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdHRtLmMgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYyAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL3Jh ZGVvbi9yYWRlb25fdHRtLmMgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV9w YWdlX2FsbG9jX2RtYS5jIHwgMTkgKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L3Ztd2dmeC92bXdnZnhfYnVmZmVyLmMgICB8ICAyICstCiBpbmNsdWRlL2RybS90dG0vdHRtX3Bh Z2VfYWxsb2MuaCAgICAgICAgIHwgIDUgKysrLS0KIDYgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0 aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X3R0bS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X3R0bS5jCmluZGV4IGU0YmI0MzUuLjcyM2NjZjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV90dG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfdHRtLmMKQEAgLTEwNDYsNyArMTA0Niw3IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV90 dG1fdHRfdW5wb3B1bGF0ZShzdHJ1Y3QgdHRtX3R0ICp0dG0pCiAKICNpZmRlZiBDT05GSUdfU1dJ T1RMQgogCWlmIChzd2lvdGxiX25yX3RibCgpKSB7Ci0JCXR0bV9kbWFfdW5wb3B1bGF0ZSgmZ3R0 LT50dG0sIGFkZXYtPmRldik7CisJCXR0bV9kbWFfdW5wb3B1bGF0ZSgmZ3R0LT50dG0sIGFkZXYt PmRldiwgdHJ1ZSk7CiAJCXJldHVybjsKIAl9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25v dXZlYXVfYm8uYwppbmRleCBjZTMyOGVkLi4zZjdjMzBmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bm91dmVhdV9iby5jCkBAIC0xNjMyLDcgKzE2MzIsNyBAQCBub3V2ZWF1X3R0bV90dF91bnBvcHVs YXRlKHN0cnVjdCB0dG1fdHQgKnR0bSkKIAogI2lmIElTX0VOQUJMRUQoQ09ORklHX1NXSU9UTEIp ICYmIElTX0VOQUJMRUQoQ09ORklHX1g4NikKIAlpZiAoc3dpb3RsYl9ucl90YmwoKSkgewotCQl0 dG1fZG1hX3VucG9wdWxhdGUoKHZvaWQgKil0dG0sIGRldik7CisJCXR0bV9kbWFfdW5wb3B1bGF0 ZSgodm9pZCAqKXR0bSwgZGV2LCB0cnVlKTsKIAkJcmV0dXJuOwogCX0KICNlbmRpZgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3JhZGVvbi9yYWRlb25fdHRtLmMgYi9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbl90dG0uYwppbmRleCBhMGE4MzliLi40NDljYzY1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vcmFkZW9uL3JhZGVvbl90dG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vcmFkZW9uL3JhZGVvbl90dG0uYwpAQCAtNzg5LDcgKzc4OSw3IEBAIHN0YXRpYyB2b2lkIHJh ZGVvbl90dG1fdHRfdW5wb3B1bGF0ZShzdHJ1Y3QgdHRtX3R0ICp0dG0pCiAKICNpZmRlZiBDT05G SUdfU1dJT1RMQgogCWlmIChzd2lvdGxiX25yX3RibCgpKSB7Ci0JCXR0bV9kbWFfdW5wb3B1bGF0 ZSgmZ3R0LT50dG0sIHJkZXYtPmRldik7CisJCXR0bV9kbWFfdW5wb3B1bGF0ZSgmZ3R0LT50dG0s IHJkZXYtPmRldiwgdHJ1ZSk7CiAJCXJldHVybjsKIAl9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2NfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0v dHRtL3R0bV9wYWdlX2FsbG9jX2RtYS5jCmluZGV4IGM3ZjAxYTQuLjRjZGE3NjQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3BhZ2VfYWxsb2NfZG1hLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3R0bS90dG1fcGFnZV9hbGxvY19kbWEuYwpAQCAtOTY5LDcgKzk2OSw3IEBAIGlu dCB0dG1fZG1hX3BvcHVsYXRlKHN0cnVjdCB0dG1fZG1hX3R0ICp0dG1fZG1hLCBzdHJ1Y3QgZGV2 aWNlICpkZXYsCiAJCXJldCA9IHR0bV9tZW1fZ2xvYmFsX2FsbG9jX3BhZ2UobWVtX2dsb2IsIHR0 bS0+cGFnZXNbaV0sCiAJCQkJCQlwb29sLT5zaXplLCBjdHgpOwogCQlpZiAodW5saWtlbHkocmV0 ICE9IDApKSB7Ci0JCQl0dG1fZG1hX3VucG9wdWxhdGUodHRtX2RtYSwgZGV2KTsKKwkJCXR0bV9k bWFfdW5wb3B1bGF0ZSh0dG1fZG1hLCBkZXYsIGZhbHNlKTsKIAkJCXJldHVybiAtRU5PTUVNOwog CQl9CiAKQEAgLTk5OCwxNCArOTk4LDE0IEBAIGludCB0dG1fZG1hX3BvcHVsYXRlKHN0cnVjdCB0 dG1fZG1hX3R0ICp0dG1fZG1hLCBzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJd2hpbGUgKG51bV9wYWdl cykgewogCQlyZXQgPSB0dG1fZG1hX3Bvb2xfZ2V0X3BhZ2VzKHBvb2wsIHR0bV9kbWEsIGkpOwog CQlpZiAocmV0ICE9IDApIHsKLQkJCXR0bV9kbWFfdW5wb3B1bGF0ZSh0dG1fZG1hLCBkZXYpOwor CQkJdHRtX2RtYV91bnBvcHVsYXRlKHR0bV9kbWEsIGRldiwgZmFsc2UpOwogCQkJcmV0dXJuIC1F Tk9NRU07CiAJCX0KIAogCQlyZXQgPSB0dG1fbWVtX2dsb2JhbF9hbGxvY19wYWdlKG1lbV9nbG9i LCB0dG0tPnBhZ2VzW2ldLAogCQkJCQkJcG9vbC0+c2l6ZSwgY3R4KTsKIAkJaWYgKHVubGlrZWx5 KHJldCAhPSAwKSkgewotCQkJdHRtX2RtYV91bnBvcHVsYXRlKHR0bV9kbWEsIGRldik7CisJCQl0 dG1fZG1hX3VucG9wdWxhdGUodHRtX2RtYSwgZGV2LCBmYWxzZSk7CiAJCQlyZXR1cm4gLUVOT01F TTsKIAkJfQogCkBAIC0xMDE2LDcgKzEwMTYsNyBAQCBpbnQgdHRtX2RtYV9wb3B1bGF0ZShzdHJ1 Y3QgdHRtX2RtYV90dCAqdHRtX2RtYSwgc3RydWN0IGRldmljZSAqZGV2LAogCWlmICh1bmxpa2Vs eSh0dG0tPnBhZ2VfZmxhZ3MgJiBUVE1fUEFHRV9GTEFHX1NXQVBQRUQpKSB7CiAJCXJldCA9IHR0 bV90dF9zd2FwaW4odHRtKTsKIAkJaWYgKHVubGlrZWx5KHJldCAhPSAwKSkgewotCQkJdHRtX2Rt YV91bnBvcHVsYXRlKHR0bV9kbWEsIGRldik7CisJCQl0dG1fZG1hX3VucG9wdWxhdGUodHRtX2Rt YSwgZGV2LCB0cnVlKTsKIAkJCXJldHVybiByZXQ7CiAJCX0KIAl9CkBAIC0xMDI3LDcgKzEwMjcs OCBAQCBpbnQgdHRtX2RtYV9wb3B1bGF0ZShzdHJ1Y3QgdHRtX2RtYV90dCAqdHRtX2RtYSwgc3Ry dWN0IGRldmljZSAqZGV2LAogRVhQT1JUX1NZTUJPTF9HUEwodHRtX2RtYV9wb3B1bGF0ZSk7CiAK IC8qIFB1dCBhbGwgcGFnZXMgaW4gcGFnZXMgbGlzdCB0byBjb3JyZWN0IHBvb2wgdG8gd2FpdCBm b3IgcmV1c2UgKi8KLXZvaWQgdHRtX2RtYV91bnBvcHVsYXRlKHN0cnVjdCB0dG1fZG1hX3R0ICp0 dG1fZG1hLCBzdHJ1Y3QgZGV2aWNlICpkZXYpCit2b2lkIHR0bV9kbWFfdW5wb3B1bGF0ZShzdHJ1 Y3QgdHRtX2RtYV90dCAqdHRtX2RtYSwgc3RydWN0IGRldmljZSAqZGV2LAorCQkJYm9vbCB1cGRh dGVfZ2xvYl9jb3VudCkKIHsKIAlzdHJ1Y3QgdHRtX3R0ICp0dG0gPSAmdHRtX2RtYS0+dHRtOwog CXN0cnVjdCBkbWFfcG9vbCAqcG9vbDsKQEAgLTEwNDksNyArMTA1MCw4IEBAIHZvaWQgdHRtX2Rt YV91bnBvcHVsYXRlKHN0cnVjdCB0dG1fZG1hX3R0ICp0dG1fZG1hLCBzdHJ1Y3QgZGV2aWNlICpk ZXYpCiAJCQkJY29udGludWU7CiAKIAkJCWNvdW50Kys7Ci0JCQl0dG1fbWVtX2dsb2JhbF9mcmVl X3BhZ2UodHRtLT5nbG9iLT5tZW1fZ2xvYiwKKwkJCWlmICh1cGRhdGVfZ2xvYl9jb3VudCkKKwkJ CQl0dG1fbWVtX2dsb2JhbF9mcmVlX3BhZ2UodHRtLT5nbG9iLT5tZW1fZ2xvYiwKIAkJCQkJCSBk X3BhZ2UtPnAsIHBvb2wtPnNpemUpOwogCQkJdHRtX2RtYV9wYWdlX3B1dChwb29sLCBkX3BhZ2Up OwogCQl9CkBAIC0xMDk0LDExICsxMDk2LDEyIEBAIHZvaWQgdHRtX2RtYV91bnBvcHVsYXRlKHN0 cnVjdCB0dG1fZG1hX3R0ICp0dG1fZG1hLCBzdHJ1Y3QgZGV2aWNlICpkZXYpCiAKIAlpZiAoaXNf Y2FjaGVkKSB7CiAJCWxpc3RfZm9yX2VhY2hfZW50cnlfc2FmZShkX3BhZ2UsIG5leHQsICZ0dG1f ZG1hLT5wYWdlc19saXN0LCBwYWdlX2xpc3QpIHsKLQkJCXR0bV9tZW1fZ2xvYmFsX2ZyZWVfcGFn ZSh0dG0tPmdsb2ItPm1lbV9nbG9iLAorCQkJaWYgKHVwZGF0ZV9nbG9iX2NvdW50KQorCQkJCXR0 bV9tZW1fZ2xvYmFsX2ZyZWVfcGFnZSh0dG0tPmdsb2ItPm1lbV9nbG9iLAogCQkJCQkJIGRfcGFn ZS0+cCwgcG9vbC0+c2l6ZSk7CiAJCQl0dG1fZG1hX3BhZ2VfcHV0KHBvb2wsIGRfcGFnZSk7CiAJ CX0KLQl9IGVsc2UgeworCX0gZWxzZSBpZiAodXBkYXRlX2dsb2JfY291bnQpIHsKIAkJZm9yIChp ID0gMDsgaSA8IGNvdW50OyBpKyspIHsKIAkJCXR0bV9tZW1fZ2xvYmFsX2ZyZWVfcGFnZSh0dG0t Pmdsb2ItPm1lbV9nbG9iLAogCQkJCQkJIHR0bS0+cGFnZXNbaV0sIHBvb2wtPnNpemUpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfYnVmZmVyLmMgYi9kcml2ZXJz L2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9idWZmZXIuYwppbmRleCAyMjIzMWJjLi4zOGRmMDVkIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9idWZmZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9idWZmZXIuYwpAQCAtNjgxLDcgKzY4MSw3IEBA IHN0YXRpYyB2b2lkIHZtd190dG1fdW5wb3B1bGF0ZShzdHJ1Y3QgdHRtX3R0ICp0dG0pCiAJCXNp emVfdCBzaXplID0KIAkJCXR0bV9yb3VuZF9wb3QodHRtLT5udW1fcGFnZXMgKiBzaXplb2YoZG1h X2FkZHJfdCkpOwogCi0JCXR0bV9kbWFfdW5wb3B1bGF0ZSgmdm13X3R0LT5kbWFfdHRtLCBkZXZf cHJpdi0+ZGV2LT5kZXYpOworCQl0dG1fZG1hX3VucG9wdWxhdGUoJnZtd190dC0+ZG1hX3R0bSwg ZGV2X3ByaXYtPmRldi0+ZGV2LCB0cnVlKTsKIAkJdHRtX21lbV9nbG9iYWxfZnJlZShnbG9iLCBz aXplKTsKIAl9IGVsc2UKIAkJdHRtX3Bvb2xfdW5wb3B1bGF0ZSh0dG0pOwpkaWZmIC0tZ2l0IGEv aW5jbHVkZS9kcm0vdHRtL3R0bV9wYWdlX2FsbG9jLmggYi9pbmNsdWRlL2RybS90dG0vdHRtX3Bh Z2VfYWxsb2MuaAppbmRleCA0ZDliMDE5Li44NTE4Y2Q1IDEwMDY0NAotLS0gYS9pbmNsdWRlL2Ry bS90dG0vdHRtX3BhZ2VfYWxsb2MuaAorKysgYi9pbmNsdWRlL2RybS90dG0vdHRtX3BhZ2VfYWxs b2MuaApAQCAtOTIsNyArOTIsOCBAQCBpbnQgdHRtX2RtYV9wYWdlX2FsbG9jX2RlYnVnZnMoc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICpkYXRhKTsKIAogaW50IHR0bV9kbWFfcG9wdWxhdGUoc3Ry dWN0IHR0bV9kbWFfdHQgKnR0bV9kbWEsIHN0cnVjdCBkZXZpY2UgKmRldiwKIAkJCXN0cnVjdCB0 dG1fb3BlcmF0aW9uX2N0eCAqY3R4KTsKLXZvaWQgdHRtX2RtYV91bnBvcHVsYXRlKHN0cnVjdCB0 dG1fZG1hX3R0ICp0dG1fZG1hLCBzdHJ1Y3QgZGV2aWNlICpkZXYpOwordm9pZCB0dG1fZG1hX3Vu cG9wdWxhdGUoc3RydWN0IHR0bV9kbWFfdHQgKnR0bV9kbWEsIHN0cnVjdCBkZXZpY2UgKmRldiwK KwkJCWJvb2wgdXBkYXRlX2dsb2JfY291bnQpOwogCiAjZWxzZQogc3RhdGljIGlubGluZSBpbnQg dHRtX2RtYV9wYWdlX2FsbG9jX2luaXQoc3RydWN0IHR0bV9tZW1fZ2xvYmFsICpnbG9iLApAQCAt MTE0LDcgKzExNSw3IEBAIHN0YXRpYyBpbmxpbmUgaW50IHR0bV9kbWFfcG9wdWxhdGUoc3RydWN0 IHR0bV9kbWFfdHQgKnR0bV9kbWEsCiAJcmV0dXJuIC1FTk9NRU07CiB9CiBzdGF0aWMgaW5saW5l IHZvaWQgdHRtX2RtYV91bnBvcHVsYXRlKHN0cnVjdCB0dG1fZG1hX3R0ICp0dG1fZG1hLAotCQkJ CSAgICAgIHN0cnVjdCBkZXZpY2UgKmRldikKKwkJc3RydWN0IGRldmljZSAqZGV2LCBib29sIHVw ZGF0ZV9nbG9iX2NvdW50KTsKIHsKIH0KICNlbmRpZgotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=