From mboxrd@z Thu Jan 1 00:00:00 1970 From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 07/12] drm: remove prime sg_table caching Date: Fri, 26 Apr 2019 14:36:33 +0200 Message-ID: <20190426123638.40221-7-christian.koenig@amd.com> References: <20190426123638.40221-1-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 367398926E for ; Fri, 26 Apr 2019 12:36:47 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id 4so3647536wmf.1 for ; Fri, 26 Apr 2019 05:36:47 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:5545:e552:48cc:b52f]) by smtp.gmail.com with ESMTPSA id y125sm37196159wmc.39.2019.04.26.05.36.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Apr 2019 05:36:44 -0700 (PDT) In-Reply-To: <20190426123638.40221-1-christian.koenig@amd.com> 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 List-Id: dri-devel@lists.freedesktop.org VGhhdCBpcyBub3cgZG9uZSBieSB0aGUgRE1BLWJ1ZiBoZWxwZXJzIGluc3RlYWQuCgpTaWduZWQt b2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jIHwgNzYgKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDYwIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fcHJpbWUuYwppbmRleCAxZmFkZjVkNWVkMzMuLjdlNDM5ZWEzNTQ2YSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fcHJpbWUuYwpAQCAtODYsMTEgKzg2LDYgQEAgc3RydWN0IGRybV9wcmltZV9tZW1i ZXIgewogCXN0cnVjdCByYl9ub2RlIGhhbmRsZV9yYjsKIH07CiAKLXN0cnVjdCBkcm1fcHJpbWVf YXR0YWNobWVudCB7Ci0Jc3RydWN0IHNnX3RhYmxlICpzZ3Q7Ci0JZW51bSBkbWFfZGF0YV9kaXJl Y3Rpb24gZGlyOwotfTsKLQogc3RhdGljIGludCBkcm1fcHJpbWVfYWRkX2J1Zl9oYW5kbGUoc3Ry dWN0IGRybV9wcmltZV9maWxlX3ByaXZhdGUgKnByaW1lX2Zwcml2LAogCQkJCSAgICBzdHJ1Y3Qg ZG1hX2J1ZiAqZG1hX2J1ZiwgdWludDMyX3QgaGFuZGxlKQogewpAQCAtMTg4LDI1ICsxODMsMTYg QEAgc3RhdGljIGludCBkcm1fcHJpbWVfbG9va3VwX2J1Zl9oYW5kbGUoc3RydWN0IGRybV9wcmlt ZV9maWxlX3ByaXZhdGUgKnByaW1lX2ZwcmkKICAqIEBkbWFfYnVmOiBidWZmZXIgdG8gYXR0YWNo IGRldmljZSB0bwogICogQGF0dGFjaDogYnVmZmVyIGF0dGFjaG1lbnQgZGF0YQogICoKLSAqIEFs bG9jYXRlcyAmZHJtX3ByaW1lX2F0dGFjaG1lbnQgYW5kIGNhbGxzICZkcm1fZHJpdmVyLmdlbV9w cmltZV9waW4gZm9yCi0gKiBkZXZpY2Ugc3BlY2lmaWMgYXR0YWNobWVudC4gVGhpcyBjYW4gYmUg dXNlZCBhcyB0aGUgJmRtYV9idWZfb3BzLmF0dGFjaAotICogY2FsbGJhY2suCisgKiBDYWxscyAm ZHJtX2RyaXZlci5nZW1fcHJpbWVfcGluIGZvciBkZXZpY2Ugc3BlY2lmaWMgaGFuZGxpbmcuIFRo aXMgY2FuIGJlCisgKiB1c2VkIGFzIHRoZSAmZG1hX2J1Zl9vcHMuYXR0YWNoIGNhbGxiYWNrLgog ICoKICAqIFJldHVybnMgMCBvbiBzdWNjZXNzLCBuZWdhdGl2ZSBlcnJvciBjb2RlIG9uIGZhaWx1 cmUuCiAgKi8KIGludCBkcm1fZ2VtX21hcF9hdHRhY2goc3RydWN0IGRtYV9idWYgKmRtYV9idWYs CiAJCSAgICAgICBzdHJ1Y3QgZG1hX2J1Zl9hdHRhY2htZW50ICphdHRhY2gpCiB7Ci0Jc3RydWN0 IGRybV9wcmltZV9hdHRhY2htZW50ICpwcmltZV9hdHRhY2g7CiAJc3RydWN0IGRybV9nZW1fb2Jq ZWN0ICpvYmogPSBkbWFfYnVmLT5wcml2OwogCi0JcHJpbWVfYXR0YWNoID0ga3phbGxvYyhzaXpl b2YoKnByaW1lX2F0dGFjaCksIEdGUF9LRVJORUwpOwotCWlmICghcHJpbWVfYXR0YWNoKQotCQly ZXR1cm4gLUVOT01FTTsKLQotCXByaW1lX2F0dGFjaC0+ZGlyID0gRE1BX05PTkU7Ci0JYXR0YWNo LT5wcml2ID0gcHJpbWVfYXR0YWNoOwotCiAJcmV0dXJuIGRybV9nZW1fcGluKG9iaik7CiB9CiBF WFBPUlRfU1lNQk9MKGRybV9nZW1fbWFwX2F0dGFjaCk7CkBAIC0yMjIsMjYgKzIwOCw4IEBAIEVY UE9SVF9TWU1CT0woZHJtX2dlbV9tYXBfYXR0YWNoKTsKIHZvaWQgZHJtX2dlbV9tYXBfZGV0YWNo KHN0cnVjdCBkbWFfYnVmICpkbWFfYnVmLAogCQkJc3RydWN0IGRtYV9idWZfYXR0YWNobWVudCAq YXR0YWNoKQogewotCXN0cnVjdCBkcm1fcHJpbWVfYXR0YWNobWVudCAqcHJpbWVfYXR0YWNoID0g YXR0YWNoLT5wcml2OwogCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqID0gZG1hX2J1Zi0+cHJp djsKIAotCWlmIChwcmltZV9hdHRhY2gpIHsKLQkJc3RydWN0IHNnX3RhYmxlICpzZ3QgPSBwcmlt ZV9hdHRhY2gtPnNndDsKLQotCQlpZiAoc2d0KSB7Ci0JCQlpZiAocHJpbWVfYXR0YWNoLT5kaXIg IT0gRE1BX05PTkUpCi0JCQkJZG1hX3VubWFwX3NnX2F0dHJzKGF0dGFjaC0+ZGV2LCBzZ3QtPnNn bCwKLQkJCQkJCSAgIHNndC0+bmVudHMsCi0JCQkJCQkgICBwcmltZV9hdHRhY2gtPmRpciwKLQkJ CQkJCSAgIERNQV9BVFRSX1NLSVBfQ1BVX1NZTkMpOwotCQkJc2dfZnJlZV90YWJsZShzZ3QpOwot CQl9Ci0KLQkJa2ZyZWUoc2d0KTsKLQkJa2ZyZWUocHJpbWVfYXR0YWNoKTsKLQkJYXR0YWNoLT5w cml2ID0gTlVMTDsKLQl9Ci0KIAlkcm1fZ2VtX3VucGluKG9iaik7CiB9CiBFWFBPUlRfU1lNQk9M KGRybV9nZW1fbWFwX2RldGFjaCk7CkBAIC0yODYsMzkgKzI1NCwyMiBAQCB2b2lkIGRybV9wcmlt ZV9yZW1vdmVfYnVmX2hhbmRsZV9sb2NrZWQoc3RydWN0IGRybV9wcmltZV9maWxlX3ByaXZhdGUg KnByaW1lX2Zwcgogc3RydWN0IHNnX3RhYmxlICpkcm1fZ2VtX21hcF9kbWFfYnVmKHN0cnVjdCBk bWFfYnVmX2F0dGFjaG1lbnQgKmF0dGFjaCwKIAkJCQkgICAgIGVudW0gZG1hX2RhdGFfZGlyZWN0 aW9uIGRpcikKIHsKLQlzdHJ1Y3QgZHJtX3ByaW1lX2F0dGFjaG1lbnQgKnByaW1lX2F0dGFjaCA9 IGF0dGFjaC0+cHJpdjsKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiA9IGF0dGFjaC0+ZG1h YnVmLT5wcml2OwogCXN0cnVjdCBzZ190YWJsZSAqc2d0OwogCi0JaWYgKFdBUk5fT04oZGlyID09 IERNQV9OT05FIHx8ICFwcmltZV9hdHRhY2gpKQorCWlmIChXQVJOX09OKGRpciA9PSBETUFfTk9O RSkpCiAJCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwogCi0JLyogcmV0dXJuIHRoZSBjYWNoZWQg bWFwcGluZyB3aGVuIHBvc3NpYmxlICovCi0JaWYgKHByaW1lX2F0dGFjaC0+ZGlyID09IGRpcikK LQkJcmV0dXJuIHByaW1lX2F0dGFjaC0+c2d0OwotCi0JLyoKLQkgKiB0d28gbWFwcGluZ3Mgd2l0 aCBkaWZmZXJlbnQgZGlyZWN0aW9ucyBmb3IgdGhlIHNhbWUgYXR0YWNobWVudCBhcmUKLQkgKiBu b3QgYWxsb3dlZAotCSAqLwotCWlmIChXQVJOX09OKHByaW1lX2F0dGFjaC0+ZGlyICE9IERNQV9O T05FKSkKLQkJcmV0dXJuIEVSUl9QVFIoLUVCVVNZKTsKLQogCWlmIChvYmotPmZ1bmNzKQogCQlz Z3QgPSBvYmotPmZ1bmNzLT5nZXRfc2dfdGFibGUob2JqKTsKIAllbHNlCiAJCXNndCA9IG9iai0+ ZGV2LT5kcml2ZXItPmdlbV9wcmltZV9nZXRfc2dfdGFibGUob2JqKTsKIAotCWlmICghSVNfRVJS KHNndCkpIHsKLQkJaWYgKCFkbWFfbWFwX3NnX2F0dHJzKGF0dGFjaC0+ZGV2LCBzZ3QtPnNnbCwg c2d0LT5uZW50cywgZGlyLAotCQkJCSAgICAgIERNQV9BVFRSX1NLSVBfQ1BVX1NZTkMpKSB7Ci0J CQlzZ19mcmVlX3RhYmxlKHNndCk7Ci0JCQlrZnJlZShzZ3QpOwotCQkJc2d0ID0gRVJSX1BUUigt RU5PTUVNKTsKLQkJfSBlbHNlIHsKLQkJCXByaW1lX2F0dGFjaC0+c2d0ID0gc2d0OwotCQkJcHJp bWVfYXR0YWNoLT5kaXIgPSBkaXI7Ci0JCX0KKwlpZiAoIWRtYV9tYXBfc2dfYXR0cnMoYXR0YWNo LT5kZXYsIHNndC0+c2dsLCBzZ3QtPm5lbnRzLCBkaXIsCisJCQkgICAgICBETUFfQVRUUl9TS0lQ X0NQVV9TWU5DKSkgeworCQlzZ19mcmVlX3RhYmxlKHNndCk7CisJCWtmcmVlKHNndCk7CisJCXNn dCA9IEVSUl9QVFIoLUVOT01FTSk7CiAJfQogCiAJcmV0dXJuIHNndDsKQEAgLTMzMSwxNCArMjgy LDE5IEBAIEVYUE9SVF9TWU1CT0woZHJtX2dlbV9tYXBfZG1hX2J1Zik7CiAgKiBAc2d0OiBzY2F0 dGVybGlzdCBpbmZvIG9mIHRoZSBidWZmZXIgdG8gdW5tYXAKICAqIEBkaXI6IGRpcmVjdGlvbiBv ZiBETUEgdHJhbnNmZXIKICAqCi0gKiBOb3QgaW1wbGVtZW50ZWQuIFRoZSB1bm1hcCBpcyBkb25l IGF0IGRybV9nZW1fbWFwX2RldGFjaCgpLiAgVGhpcyBjYW4gYmUKLSAqIHVzZWQgYXMgdGhlICZk bWFfYnVmX29wcy51bm1hcF9kbWFfYnVmIGNhbGxiYWNrLgorICogVGhpcyBjYW4gYmUgdXNlZCBh cyB0aGUgJmRtYV9idWZfb3BzLnVubWFwX2RtYV9idWYgY2FsbGJhY2suCiAgKi8KIHZvaWQgZHJt X2dlbV91bm1hcF9kbWFfYnVmKHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmF0dGFjaCwKIAkJ CSAgIHN0cnVjdCBzZ190YWJsZSAqc2d0LAogCQkJICAgZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24g ZGlyKQogewotCS8qIG5vdGhpbmcgdG8gYmUgZG9uZSBoZXJlICovCisJaWYgKCFzZ3QpCisJCXJl dHVybjsKKworCWRtYV91bm1hcF9zZ19hdHRycyhhdHRhY2gtPmRldiwgc2d0LT5zZ2wsIHNndC0+ bmVudHMsIGRpciwKKwkJCSAgIERNQV9BVFRSX1NLSVBfQ1BVX1NZTkMpOworCXNnX2ZyZWVfdGFi bGUoc2d0KTsKKwlrZnJlZShzZ3QpOwogfQogRVhQT1JUX1NZTUJPTChkcm1fZ2VtX3VubWFwX2Rt YV9idWYpOwogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2RyaS1kZXZlbA==