From: Tina Zhang Subject: [PATCH v1 1/4] drm/i915/gvt: reorder the shadow ppgtt update process by adding entry first Date: Thu, 11 May 2017 10:33:01 +0800 Message-ID: <1494469984-3486-2-git-send-email-tina.zhang@intel.com> References: <1494469984-3486-1-git-send-email-tina.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1494469984-3486-1-git-send-email-tina.zhang@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gvt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org R3Vlc3QgaTkxNSBkcml2ZXIgbWF5IHVwZGF0ZSB0aGUgcHBndHQgdGFibGUganVzdCBiZWZvcmUg dGhpcyB3b3JrbG9hZAppcyBnb2luZyB0byBiZSBzdWJtaXR0ZWQgdG8gdGhlIGhhcmR3YXJlIGJ5 IGRldmljZSBtb2RlbC4gVGhpcyBjYXNlCndhc24ndCBoYW5kbGVkIHdlbGwgYnkgZGV2aWNlIG1v ZGVsIGJlZm9yZSwgZHVlIHRvIHRoZSBzbWFsbCB0aW1lCndpbmRvdyBiZXR3ZWVuIHJlbW92aW5n IG9sZCBwcGd0dCBlbnRyeSBhbmQgYWRkaW5nIHRoZSBuZXcgb25lLiBFcnJvcnMKb2NjdXIgd2hl biB0aGUgd29ya2xvYWQgaXMgZXhlY3V0ZWQgYnkgaGFyZHdhcmUgZHVyaW5nIHRoYXQgc21hbGwg dGltZQp3aW5kb3cuIFRoaXMgcGF0Y2ggaXMgdG8gcmVtb3ZlIHRoaXMgdGltZSB3aW5kb3cgYnkg YWRkaW5nIHRoZSBuZXcgcHBndHQKZW50cnkgZmlyc3QgYW5kIHRoZW4gcmVtb3ZlIHRoZSBvbGQg b25lLgoKU2lnbmVkLW9mZi1ieTogVGluYSBaaGFuZyA8dGluYS56aGFuZ0BpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jIHwgNDUgKysrKysrKysrKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygr KSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0 L2d0dC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3Z0L2d0dC5jCmluZGV4IGM2ZjAwNzcuLjhj YWFkODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d2dC9ndHQuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9ndnQvZ3R0LmMKQEAgLTk3NSwyOSArOTc1LDI2IEBAIHN0YXRp YyBpbnQgcHBndHRfcG9wdWxhdGVfc2hhZG93X3BhZ2Uoc3RydWN0IGludGVsX3ZncHVfcHBndHRf c3B0ICpzcHQpCiB9CiAKIHN0YXRpYyBpbnQgcHBndHRfaGFuZGxlX2d1ZXN0X2VudHJ5X3JlbW92 YWwoc3RydWN0IGludGVsX3ZncHVfZ3Vlc3RfcGFnZSAqZ3B0LAotCQl1bnNpZ25lZCBsb25nIGlu ZGV4KQorCQlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSAqc2UsIHVuc2lnbmVkIGxvbmcgaW5k ZXgpCiB7CiAJc3RydWN0IGludGVsX3ZncHVfcHBndHRfc3B0ICpzcHQgPSBndWVzdF9wYWdlX3Rv X3BwZ3R0X3NwdChncHQpOwogCXN0cnVjdCBpbnRlbF92Z3B1X3NoYWRvd19wYWdlICpzcCA9ICZz cHQtPnNoYWRvd19wYWdlOwogCXN0cnVjdCBpbnRlbF92Z3B1ICp2Z3B1ID0gc3B0LT52Z3B1Owog CXN0cnVjdCBpbnRlbF9ndnRfZ3R0X3B0ZV9vcHMgKm9wcyA9IHZncHUtPmd2dC0+Z3R0LnB0ZV9v cHM7Ci0Jc3RydWN0IGludGVsX2d2dF9ndHRfZW50cnkgZTsKIAlpbnQgcmV0OwogCi0JcHBndHRf Z2V0X3NoYWRvd19lbnRyeShzcHQsICZlLCBpbmRleCk7Ci0KLQl0cmFjZV9ncHRfY2hhbmdlKHNw dC0+dmdwdS0+aWQsICJyZW1vdmUiLCBzcHQsIHNwLT50eXBlLCBlLnZhbDY0LAorCXRyYWNlX2dw dF9jaGFuZ2Uoc3B0LT52Z3B1LT5pZCwgInJlbW92ZSIsIHNwdCwgc3AtPnR5cGUsIHNlLT52YWw2 NCwKIAkJCSBpbmRleCk7CiAKLQlpZiAoIW9wcy0+dGVzdF9wcmVzZW50KCZlKSkKKwlpZiAoIW9w cy0+dGVzdF9wcmVzZW50KHNlKSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAob3BzLT5nZXRfcGZuKCZl KSA9PSB2Z3B1LT5ndHQuc2NyYXRjaF9wdFtzcC0+dHlwZV0ucGFnZV9tZm4pCisJaWYgKG9wcy0+ Z2V0X3BmbihzZSkgPT0gdmdwdS0+Z3R0LnNjcmF0Y2hfcHRbc3AtPnR5cGVdLnBhZ2VfbWZuKQog CQlyZXR1cm4gMDsKIAotCWlmIChndHRfdHlwZV9pc19wdChnZXRfbmV4dF9wdF90eXBlKGUudHlw ZSkpKSB7CisJaWYgKGd0dF90eXBlX2lzX3B0KGdldF9uZXh0X3B0X3R5cGUoc2UtPnR5cGUpKSkg ewogCQlzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnMgPQotCQkJcHBndHRfZmluZF9zaGFk b3dfcGFnZSh2Z3B1LCBvcHMtPmdldF9wZm4oJmUpKTsKKwkJCXBwZ3R0X2ZpbmRfc2hhZG93X3Bh Z2UodmdwdSwgb3BzLT5nZXRfcGZuKHNlKSk7CiAJCWlmICghcykgewogCQkJZ3Z0X3ZncHVfZXJy KCJmYWlsIHRvIGZpbmQgZ3Vlc3QgcGFnZVxuIik7CiAJCQlyZXQgPSAtRU5YSU87CkBAIC0xMDA3 LDEyICsxMDA0LDEwIEBAIHN0YXRpYyBpbnQgcHBndHRfaGFuZGxlX2d1ZXN0X2VudHJ5X3JlbW92 YWwoc3RydWN0IGludGVsX3ZncHVfZ3Vlc3RfcGFnZSAqZ3B0LAogCQlpZiAocmV0KQogCQkJZ290 byBmYWlsOwogCX0KLQlvcHMtPnNldF9wZm4oJmUsIHZncHUtPmd0dC5zY3JhdGNoX3B0W3NwLT50 eXBlXS5wYWdlX21mbik7Ci0JcHBndHRfc2V0X3NoYWRvd19lbnRyeShzcHQsICZlLCBpbmRleCk7 CiAJcmV0dXJuIDA7CiBmYWlsOgogCWd2dF92Z3B1X2VycigiZmFpbDogc2hhZG93IHBhZ2UgJXAg Z3Vlc3QgZW50cnkgMHglbGx4IHR5cGUgJWRcbiIsCi0JCQlzcHQsIGUudmFsNjQsIGUudHlwZSk7 CisJCQlzcHQsIHNlLT52YWw2NCwgc2UtPnR5cGUpOwogCXJldHVybiByZXQ7CiB9CiAKQEAgLTEy MzIsMjIgKzEyMjcsMzcgQEAgc3RhdGljIGludCBwcGd0dF9oYW5kbGVfZ3Vlc3Rfd3JpdGVfcGFn ZV90YWJsZSgKIHsKIAlzdHJ1Y3QgaW50ZWxfdmdwdV9wcGd0dF9zcHQgKnNwdCA9IGd1ZXN0X3Bh Z2VfdG9fcHBndHRfc3B0KGdwdCk7CiAJc3RydWN0IGludGVsX3ZncHUgKnZncHUgPSBzcHQtPnZn cHU7CisJaW50IHR5cGUgPSBzcHQtPnNoYWRvd19wYWdlLnR5cGU7CiAJc3RydWN0IGludGVsX2d2 dF9ndHRfcHRlX29wcyAqb3BzID0gdmdwdS0+Z3Z0LT5ndHQucHRlX29wczsKKwlzdHJ1Y3QgaW50 ZWxfZ3Z0X2d0dF9lbnRyeSBzZTsKIAogCWludCByZXQ7CiAJaW50IG5ld19wcmVzZW50OwogCiAJ bmV3X3ByZXNlbnQgPSBvcHMtPnRlc3RfcHJlc2VudCh3ZSk7CiAKLQlyZXQgPSBwcGd0dF9oYW5k bGVfZ3Vlc3RfZW50cnlfcmVtb3ZhbChncHQsIGluZGV4KTsKLQlpZiAocmV0KQotCQlnb3RvIGZh aWw7CisJLyoKKwkgKiBBZGRpbmcgdGhlIG5ldyBlbnRyeSBmaXJzdCBhbmQgdGhlbiByZW1vdmlu ZyB0aGUgb2xkIG9uZSwgdGhhdCBjYW4KKwkgKiBndWFyYW50ZWUgdGhlIHBwZ3R0IHRhYmxlIGlz IHZhbGlkYXRlZCBkdXJpbmcgdGhlIHdpbmRvdyBiZXR3ZWVuCisJICogYWRkaW5nIGFuZCByZW1v dmFsLgorCSAqLworCXBwZ3R0X2dldF9zaGFkb3dfZW50cnkoc3B0LCAmc2UsIGluZGV4KTsKIAog CWlmIChuZXdfcHJlc2VudCkgewogCQlyZXQgPSBwcGd0dF9oYW5kbGVfZ3Vlc3RfZW50cnlfYWRk KGdwdCwgd2UsIGluZGV4KTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIAl9CisKKwlyZXQg PSBwcGd0dF9oYW5kbGVfZ3Vlc3RfZW50cnlfcmVtb3ZhbChncHQsICZzZSwgaW5kZXgpOworCWlm IChyZXQpCisJCWdvdG8gZmFpbDsKKworCWlmICghbmV3X3ByZXNlbnQpIHsKKwkJb3BzLT5zZXRf cGZuKCZzZSwgdmdwdS0+Z3R0LnNjcmF0Y2hfcHRbdHlwZV0ucGFnZV9tZm4pOworCQlwcGd0dF9z ZXRfc2hhZG93X2VudHJ5KHNwdCwgJnNlLCBpbmRleCk7CisJfQorCiAJcmV0dXJuIDA7CiBmYWls OgogCWd2dF92Z3B1X2VycigiZmFpbDogc2hhZG93IHBhZ2UgJXAgZ3Vlc3QgZW50cnkgMHglbGx4 IHR5cGUgJWQuXG4iLApAQCAtMTMxOSw3ICsxMzI5LDcgQEAgc3RhdGljIGludCBwcGd0dF9oYW5k bGVfZ3Vlc3Rfd3JpdGVfcGFnZV90YWJsZV9ieXRlcyh2b2lkICpncCwKIAlzdHJ1Y3QgaW50ZWxf dmdwdSAqdmdwdSA9IHNwdC0+dmdwdTsKIAlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9wdGVfb3BzICpv cHMgPSB2Z3B1LT5ndnQtPmd0dC5wdGVfb3BzOwogCWNvbnN0IHN0cnVjdCBpbnRlbF9ndnRfZGV2 aWNlX2luZm8gKmluZm8gPSAmdmdwdS0+Z3Z0LT5kZXZpY2VfaW5mbzsKLQlzdHJ1Y3QgaW50ZWxf Z3Z0X2d0dF9lbnRyeSB3ZTsKKwlzdHJ1Y3QgaW50ZWxfZ3Z0X2d0dF9lbnRyeSB3ZSwgc2U7CiAJ dW5zaWduZWQgbG9uZyBpbmRleDsKIAlpbnQgcmV0OwogCkBAIC0xMzM1LDcgKzEzNDUsOCBAQCBz dGF0aWMgaW50IHBwZ3R0X2hhbmRsZV9ndWVzdF93cml0ZV9wYWdlX3RhYmxlX2J5dGVzKHZvaWQg KmdwLAogCQkJcmV0dXJuIHJldDsKIAl9IGVsc2UgewogCQlpZiAoIXRlc3RfYml0KGluZGV4LCBz cHQtPnBvc3Rfc2hhZG93X2JpdG1hcCkpIHsKLQkJCXJldCA9IHBwZ3R0X2hhbmRsZV9ndWVzdF9l bnRyeV9yZW1vdmFsKGdwdCwgaW5kZXgpOworCQkJcHBndHRfZ2V0X3NoYWRvd19lbnRyeShzcHQs ICZzZSwgaW5kZXgpOworCQkJcmV0ID0gcHBndHRfaGFuZGxlX2d1ZXN0X2VudHJ5X3JlbW92YWwo Z3B0LCAmc2UsIGluZGV4KTsKIAkJCWlmIChyZXQpCiAJCQkJcmV0dXJuIHJldDsKIAkJfQotLSAK Mi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=