From: Michel Thierry Subject: [PATCH v2 24/24] drm/i915/bdw: Dynamic page table allocations in lrc mode Date: Tue, 23 Dec 2014 17:16:27 +0000 Message-ID: <1419354987-4622-25-git-send-email-michel.thierry@intel.com> References: <1418922621-25818-1-git-send-email-michel.thierry@intel.com> <1419354987-4622-1-git-send-email-michel.thierry@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 922716E4F0 for ; Tue, 23 Dec 2014 09:16:33 -0800 (PST) In-Reply-To: <1419354987-4622-1-git-send-email-michel.thierry@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-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org TG9naWMgcmluZyBjb250ZXh0cyBuZWVkIHRvIGtub3cgdGhlIFBEUHMgd2hlbiB0aGV5IGFyZSBw b3B1bGF0ZWQuIFdpdGgKZHluYW1pYyBwYWdlIHRhYmxlIGFsbG9jYXRpb25zLCB0aGVzZSBQRFBz IG1heSBub3QgZXhpc3QgeWV0LgoKQ2hlY2sgaWYgUERQcyBoYXZlIGJlZW4gYWxsb2NhdGVkIGFu ZCB1c2UgdGhlIHNjcmF0Y2ggcGFnZSBpZiB0aGV5IGRvCm5vdCBleGlzdCB5ZXQuCgpCZWZvcmUg c3VibWlzc2lvbiwgdXBkYXRlIHRoZSBQRFBzIGluIHRoZSBsb2dpYyByaW5nIGNvbnRleHQgYXMg UERQcwpoYXZlIGJlZW4gYWxsb2NhdGVkLgoKU2lnbmVkLW9mZi1ieTogTWljaGVsIFRoaWVycnkg PG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9scmMuYyB8IDgwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA3MCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCmluZGV4IDU0Njg4NGIuLjZhYmU0YmMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCkBAIC0zNTgsNiArMzU4LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2Vsc3Bf d3JpdGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAogc3RhdGljIGludCBleGVjbGlz dHNfdXBkYXRlX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmosCiAJ CQkJICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpyaW5nX29iaiwKKwkJCQkgICAgc3Ry dWN0IGk5MTVfaHdfcHBndHQgKnBwZ3R0LAogCQkJCSAgICB1MzIgdGFpbCkKIHsKIAlzdHJ1Y3Qg cGFnZSAqcGFnZTsKQEAgLTM2OSw2ICszNzAsNDAgQEAgc3RhdGljIGludCBleGVjbGlzdHNfdXBk YXRlX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmosCiAJcmVnX3N0 YXRlW0NUWF9SSU5HX1RBSUwrMV0gPSB0YWlsOwogCXJlZ19zdGF0ZVtDVFhfUklOR19CVUZGRVJf U1RBUlQrMV0gPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQocmluZ19vYmopOwogCisJLyogVHJ1 ZSBQUEdUVCB3aXRoIGR5bmFtaWMgcGFnZSBhbGxvY2F0aW9uOiB1cGRhdGUgUERQIHJlZ2lzdGVy cyBhbmQKKwkgKiBwb2ludCB0aGUgdW5hbGxvY2F0ZWQgUERQcyB0byB0aGUgc2NyYXRjaCBwYWdl CisJICovCisJaWYgKHBwZ3R0KSB7CisJCWlmICh0ZXN0X2JpdCgzLCBwcGd0dC0+cGRwLnVzZWRf cGRwZXMpKSB7CisJCQlyZWdfc3RhdGVbQ1RYX1BEUDNfVURXKzFdID0gdXBwZXJfMzJfYml0cyhw cGd0dC0+cGRwLnBhZ2VkaXJbM10tPmRhZGRyKTsKKwkJCXJlZ19zdGF0ZVtDVFhfUERQM19MRFcr MV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclszXS0+ZGFkZHIpOworCQl9IGVs c2UgeworCQkJcmVnX3N0YXRlW0NUWF9QRFAzX1VEVysxXSA9IHVwcGVyXzMyX2JpdHMocHBndHQt PnNjcmF0Y2hfcGQtPmRhZGRyKTsKKwkJCXJlZ19zdGF0ZVtDVFhfUERQM19MRFcrMV0gPSBsb3dl cl8zMl9iaXRzKHBwZ3R0LT5zY3JhdGNoX3BkLT5kYWRkcik7CisJCX0KKwkJaWYgKHRlc3RfYml0 KDIsIHBwZ3R0LT5wZHAudXNlZF9wZHBlcykpIHsKKwkJCXJlZ19zdGF0ZVtDVFhfUERQMl9VRFcr MV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclsyXS0+ZGFkZHIpOworCQkJcmVn X3N0YXRlW0NUWF9QRFAyX0xEVysxXSA9IGxvd2VyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGly WzJdLT5kYWRkcik7CisJCX0gZWxzZSB7CisJCQlyZWdfc3RhdGVbQ1RYX1BEUDJfVURXKzFdID0g dXBwZXJfMzJfYml0cyhwcGd0dC0+c2NyYXRjaF9wZC0+ZGFkZHIpOworCQkJcmVnX3N0YXRlW0NU WF9QRFAyX0xEVysxXSA9IGxvd2VyXzMyX2JpdHMocHBndHQtPnNjcmF0Y2hfcGQtPmRhZGRyKTsK KwkJfQorCQlpZiAodGVzdF9iaXQoMSwgcHBndHQtPnBkcC51c2VkX3BkcGVzKSkgeworCQkJcmVn X3N0YXRlW0NUWF9QRFAxX1VEVysxXSA9IHVwcGVyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGly WzFdLT5kYWRkcik7CisJCQlyZWdfc3RhdGVbQ1RYX1BEUDFfTERXKzFdID0gbG93ZXJfMzJfYml0 cyhwcGd0dC0+cGRwLnBhZ2VkaXJbMV0tPmRhZGRyKTsKKwkJfSBlbHNlIHsKKwkJCXJlZ19zdGF0 ZVtDVFhfUERQMV9VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5zY3JhdGNoX3BkLT5kYWRk cik7CisJCQlyZWdfc3RhdGVbQ1RYX1BEUDFfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+ c2NyYXRjaF9wZC0+ZGFkZHIpOworCQl9CisJCWlmICh0ZXN0X2JpdCgwLCBwcGd0dC0+cGRwLnVz ZWRfcGRwZXMpKSB7CisJCQlyZWdfc3RhdGVbQ1RYX1BEUDBfVURXKzFdID0gdXBwZXJfMzJfYml0 cyhwcGd0dC0+cGRwLnBhZ2VkaXJbMF0tPmRhZGRyKTsKKwkJCXJlZ19zdGF0ZVtDVFhfUERQMF9M RFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclswXS0+ZGFkZHIpOworCQl9 IGVsc2UgeworCQkJcmVnX3N0YXRlW0NUWF9QRFAwX1VEVysxXSA9IHVwcGVyXzMyX2JpdHMocHBn dHQtPnNjcmF0Y2hfcGQtPmRhZGRyKTsKKwkJCXJlZ19zdGF0ZVtDVFhfUERQMF9MRFcrMV0gPSBs b3dlcl8zMl9iaXRzKHBwZ3R0LT5zY3JhdGNoX3BkLT5kYWRkcik7CisJCX0KKwl9CisKIAlrdW5t YXBfYXRvbWljKHJlZ19zdGF0ZSk7CiAKIAlyZXR1cm4gMDsKQEAgLTM4Nyw3ICs0MjIsNyBAQCBz dGF0aWMgdm9pZCBleGVjbGlzdHNfc3VibWl0X2NvbnRleHRzKHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCiAJV0FSTl9PTighaTkxNV9nZW1fb2JqX2lzX3Bpbm5lZChjdHhfb2JqMCkpOwog CVdBUk5fT04oIWk5MTVfZ2VtX29ial9pc19waW5uZWQocmluZ2J1ZjAtPm9iaikpOwogCi0JZXhl Y2xpc3RzX3VwZGF0ZV9jb250ZXh0KGN0eF9vYmowLCByaW5nYnVmMC0+b2JqLCB0YWlsMCk7CisJ ZXhlY2xpc3RzX3VwZGF0ZV9jb250ZXh0KGN0eF9vYmowLCByaW5nYnVmMC0+b2JqLCB0bzAtPnBw Z3R0LCB0YWlsMCk7CiAKIAlpZiAodG8xKSB7CiAJCXJpbmdidWYxID0gdG8xLT5lbmdpbmVbcmlu Zy0+aWRdLnJpbmdidWY7CkBAIC0zOTYsNyArNDMxLDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3Rz X3N1Ym1pdF9jb250ZXh0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlXQVJOX09O KCFpOTE1X2dlbV9vYmpfaXNfcGlubmVkKGN0eF9vYmoxKSk7CiAJCVdBUk5fT04oIWk5MTVfZ2Vt X29ial9pc19waW5uZWQocmluZ2J1ZjEtPm9iaikpOwogCi0JCWV4ZWNsaXN0c191cGRhdGVfY29u dGV4dChjdHhfb2JqMSwgcmluZ2J1ZjEtPm9iaiwgdGFpbDEpOworCQlleGVjbGlzdHNfdXBkYXRl X2NvbnRleHQoY3R4X29iajEsIHJpbmdidWYxLT5vYmosIHRvMS0+cHBndHQsIHRhaWwxKTsKIAl9 CiAKIAlleGVjbGlzdHNfZWxzcF93cml0ZShyaW5nLCBjdHhfb2JqMCwgY3R4X29iajEpOwpAQCAt MTczMSwxNCArMTc2NiwzOSBAQCBwb3B1bGF0ZV9scl9jb250ZXh0KHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgsIHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfbwogCXJlZ19zdGF0ZVtD VFhfUERQMV9MRFddID0gR0VOOF9SSU5HX1BEUF9MRFcocmluZywgMSk7CiAJcmVnX3N0YXRlW0NU WF9QRFAwX1VEV10gPSBHRU44X1JJTkdfUERQX1VEVyhyaW5nLCAwKTsKIAlyZWdfc3RhdGVbQ1RY X1BEUDBfTERXXSA9IEdFTjhfUklOR19QRFBfTERXKHJpbmcsIDApOwotCXJlZ19zdGF0ZVtDVFhf UERQM19VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclszXS0+ZGFkZHIp OwotCXJlZ19zdGF0ZVtDVFhfUERQM19MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZHAu cGFnZWRpclszXS0+ZGFkZHIpOwotCXJlZ19zdGF0ZVtDVFhfUERQMl9VRFcrMV0gPSB1cHBlcl8z Ml9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclsyXS0+ZGFkZHIpOwotCXJlZ19zdGF0ZVtDVFhfUERQ Ml9MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclsyXS0+ZGFkZHIpOwot CXJlZ19zdGF0ZVtDVFhfUERQMV9VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFn ZWRpclsxXS0+ZGFkZHIpOwotCXJlZ19zdGF0ZVtDVFhfUERQMV9MRFcrMV0gPSBsb3dlcl8zMl9i aXRzKHBwZ3R0LT5wZHAucGFnZWRpclsxXS0+ZGFkZHIpOwotCXJlZ19zdGF0ZVtDVFhfUERQMF9V RFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclswXS0+ZGFkZHIpOwotCXJl Z19zdGF0ZVtDVFhfUERQMF9MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRp clswXS0+ZGFkZHIpOworCisJLyogV2l0aCBkeW5hbWljIHBhZ2UgYWxsb2NhdGlvbiwgUERQcyBt YXkgbm90IGJlIGFsbG9jYXRlZCBhdCB0aGlzIHBvaW50LAorCSAqIFBvaW50IHRoZSB1bmFsbG9j YXRlZCBQRFBzIHRvIHRoZSBzY3JhdGNoIHBhZ2UKKwkgKi8KKwlpZiAodGVzdF9iaXQoMywgcHBn dHQtPnBkcC51c2VkX3BkcGVzKSkgeworCQlyZWdfc3RhdGVbQ1RYX1BEUDNfVURXKzFdID0gdXBw ZXJfMzJfYml0cyhwcGd0dC0+cGRwLnBhZ2VkaXJbM10tPmRhZGRyKTsKKwkJcmVnX3N0YXRlW0NU WF9QRFAzX0xEVysxXSA9IGxvd2VyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGlyWzNdLT5kYWRk cik7CisJfSBlbHNlIHsKKwkJcmVnX3N0YXRlW0NUWF9QRFAzX1VEVysxXSA9IHVwcGVyXzMyX2Jp dHMocHBndHQtPnNjcmF0Y2hfcGQtPmRhZGRyKTsKKwkJcmVnX3N0YXRlW0NUWF9QRFAzX0xEVysx XSA9IGxvd2VyXzMyX2JpdHMocHBndHQtPnNjcmF0Y2hfcGQtPmRhZGRyKTsKKwl9CisJaWYgKHRl c3RfYml0KDIsIHBwZ3R0LT5wZHAudXNlZF9wZHBlcykpIHsKKwkJcmVnX3N0YXRlW0NUWF9QRFAy X1VEVysxXSA9IHVwcGVyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGlyWzJdLT5kYWRkcik7CisJ CXJlZ19zdGF0ZVtDVFhfUERQMl9MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFn ZWRpclsyXS0+ZGFkZHIpOworCX0gZWxzZSB7CisJCXJlZ19zdGF0ZVtDVFhfUERQMl9VRFcrMV0g PSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5zY3JhdGNoX3BkLT5kYWRkcik7CisJCXJlZ19zdGF0ZVtD VFhfUERQMl9MRFcrMV0gPSBsb3dlcl8zMl9iaXRzKHBwZ3R0LT5zY3JhdGNoX3BkLT5kYWRkcik7 CisJfQorCWlmICh0ZXN0X2JpdCgxLCBwcGd0dC0+cGRwLnVzZWRfcGRwZXMpKSB7CisJCXJlZ19z dGF0ZVtDVFhfUERQMV9VRFcrMV0gPSB1cHBlcl8zMl9iaXRzKHBwZ3R0LT5wZHAucGFnZWRpclsx XS0+ZGFkZHIpOworCQlyZWdfc3RhdGVbQ1RYX1BEUDFfTERXKzFdID0gbG93ZXJfMzJfYml0cyhw cGd0dC0+cGRwLnBhZ2VkaXJbMV0tPmRhZGRyKTsKKwl9IGVsc2UgeworCQlyZWdfc3RhdGVbQ1RY X1BEUDFfVURXKzFdID0gdXBwZXJfMzJfYml0cyhwcGd0dC0+c2NyYXRjaF9wZC0+ZGFkZHIpOwor CQlyZWdfc3RhdGVbQ1RYX1BEUDFfTERXKzFdID0gbG93ZXJfMzJfYml0cyhwcGd0dC0+c2NyYXRj aF9wZC0+ZGFkZHIpOworCX0KKwlpZiAodGVzdF9iaXQoMCwgcHBndHQtPnBkcC51c2VkX3BkcGVz KSkgeworCQlyZWdfc3RhdGVbQ1RYX1BEUDBfVURXKzFdID0gdXBwZXJfMzJfYml0cyhwcGd0dC0+ cGRwLnBhZ2VkaXJbMF0tPmRhZGRyKTsKKwkJcmVnX3N0YXRlW0NUWF9QRFAwX0xEVysxXSA9IGxv d2VyXzMyX2JpdHMocHBndHQtPnBkcC5wYWdlZGlyWzBdLT5kYWRkcik7CisJfSBlbHNlIHsKKwkJ cmVnX3N0YXRlW0NUWF9QRFAwX1VEVysxXSA9IHVwcGVyXzMyX2JpdHMocHBndHQtPnNjcmF0Y2hf cGQtPmRhZGRyKTsKKwkJcmVnX3N0YXRlW0NUWF9QRFAwX0xEVysxXSA9IGxvd2VyXzMyX2JpdHMo cHBndHQtPnNjcmF0Y2hfcGQtPmRhZGRyKTsKKwl9CisKIAlpZiAocmluZy0+aWQgPT0gUkNTKSB7 CiAJCXJlZ19zdGF0ZVtDVFhfTFJJX0hFQURFUl8yXSA9IE1JX0xPQURfUkVHSVNURVJfSU1NKDEp OwogCQlyZWdfc3RhdGVbQ1RYX1JfUFdSX0NMS19TVEFURV0gPSAweDIwYzg7Ci0tIAoyLjEuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK