From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 07/16] drm/i915: don't call shmem_read_mapping unnecessarily Date: Sun, 25 Mar 2012 19:47:34 +0200 Message-ID: <1332697663-31256-7-git-send-email-daniel.vetter@ffwll.ch> References: <1332697663-31256-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FA359F001 for ; Sun, 25 Mar 2012 11:51:41 -0700 (PDT) Received: by mail-wi0-f177.google.com with SMTP id hj13so2851113wib.12 for ; Sun, 25 Mar 2012 11:51:41 -0700 (PDT) In-Reply-To: <1332697663-31256-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhpcyBzcGVlZHMgdXAgcHdyaXRlIGFuZCBwcmVhZCBmcm9tIH4xMjAgwrVzIHJvIH4xMDAgwrVz IGZvcgpyZWFkaW5nL3dyaXRpbmcgMW1iIG9uIG15IHNuYiAoaWYgdGhlIGJhY2tpbmcgc3RvcmFn ZSBwYWdlcwphcmUgYWxyZWFkeSBwaW5uZWQsIG9mIGNvdXJzZSkuCgp2MjogQ2hyaXMgV2lsc29u IHBvaW50ZWQgb3V0IGEgY2xhcmluZyBwYWdlIHJlZmVyZW5jZSBidWcgLSBJJ3ZlCnVuY29uZGl0 aW9uYWxseSBkcm9wcGVkIHRoZSByZWZlcmVuY2UuIFdpdGggdGhhdCBmaXhlZCAoYW5kIHRoZQph c3NvY2lhdGVkIHJlZHVjdGlvbiBvZiBkaXJ0IGluIGRtZXNnKSBpdCdzIG5vdyBldmVuIGEgbm90 Y2ggZmFzdGVyLgoKdjM6IFVuY29uZGl0aW9uYWx5IGdyYWIgYSBwYWdlIHJlZmVyZW5jZSB3aGVu IGRyb3BwaW5nCmRldi0+c3RydWN0X211dGV4IHRvIHNpbXBsaWZ5IHRoZSBjb2RlLWZsb3cuCgpT aWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAgIDQyICsrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyks IDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGM1YjI1MGMuLjEx N2ZkYTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzIxLDYgKzMyMSw3IEBAIGk5MTVf Z2VtX3NobWVtX3ByZWFkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50IG9ial9kb19iaXQx N19zd2l6emxpbmcsIHBhZ2VfZG9fYml0MTdfc3dpenpsaW5nOwogCWludCBoaXRfc2xvd3BhdGgg PSAwOwogCWludCBuZWVkc19jbGZsdXNoID0gMDsKKwlpbnQgcmVsZWFzZV9wYWdlOwogCiAJdXNl cl9kYXRhID0gKGNoYXIgX191c2VyICopICh1aW50cHRyX3QpIGFyZ3MtPmRhdGFfcHRyOwogCXJl bWFpbiA9IGFyZ3MtPnNpemU7CkBAIC0zNTUsMTAgKzM1NiwxNiBAQCBpOTE1X2dlbV9zaG1lbV9w cmVhZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpZiAoKHNobWVtX3BhZ2Vfb2Zmc2V0ICsg cGFnZV9sZW5ndGgpID4gUEFHRV9TSVpFKQogCQkJcGFnZV9sZW5ndGggPSBQQUdFX1NJWkUgLSBz aG1lbV9wYWdlX29mZnNldDsKIAotCQlwYWdlID0gc2htZW1fcmVhZF9tYXBwaW5nX3BhZ2UobWFw cGluZywgb2Zmc2V0ID4+IFBBR0VfU0hJRlQpOwotCQlpZiAoSVNfRVJSKHBhZ2UpKSB7Ci0JCQly ZXQgPSBQVFJfRVJSKHBhZ2UpOwotCQkJZ290byBvdXQ7CisJCWlmIChvYmotPnBhZ2VzKSB7CisJ CQlwYWdlID0gb2JqLT5wYWdlc1tvZmZzZXQgPj4gUEFHRV9TSElGVF07CisJCQlyZWxlYXNlX3Bh Z2UgPSAwOworCQl9IGVsc2UgeworCQkJcGFnZSA9IHNobWVtX3JlYWRfbWFwcGluZ19wYWdlKG1h cHBpbmcsIG9mZnNldCA+PiBQQUdFX1NISUZUKTsKKwkJCWlmIChJU19FUlIocGFnZSkpIHsKKwkJ CQlyZXQgPSBQVFJfRVJSKHBhZ2UpOworCQkJCWdvdG8gb3V0OworCQkJfQorCQkJcmVsZWFzZV9w YWdlID0gMTsKIAkJfQogCiAJCXBhZ2VfZG9fYml0MTdfc3dpenpsaW5nID0gb2JqX2RvX2JpdDE3 X3N3aXp6bGluZyAmJgpAQCAtMzc4LDcgKzM4NSw3IEBAIGk5MTVfZ2VtX3NobWVtX3ByZWFkKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCX0KIAogCQloaXRfc2xvd3BhdGggPSAxOwotCisJCXBh Z2VfY2FjaGVfZ2V0KHBhZ2UpOwogCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsK IAogCQl2YWRkciA9IGttYXAocGFnZSk7CkBAIC0zOTcsOSArNDA0LDExIEBAIGk5MTVfZ2VtX3No bWVtX3ByZWFkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWt1bm1hcChwYWdlKTsKIAogCQlt dXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CisJCXBhZ2VfY2FjaGVfcmVsZWFzZShwYWdl KTsKIG5leHRfcGFnZToKIAkJbWFya19wYWdlX2FjY2Vzc2VkKHBhZ2UpOwotCQlwYWdlX2NhY2hl X3JlbGVhc2UocGFnZSk7CisJCWlmIChyZWxlYXNlX3BhZ2UpCisJCQlwYWdlX2NhY2hlX3JlbGVh c2UocGFnZSk7CiAKIAkJaWYgKHJldCkgewogCQkJcmV0ID0gLUVGQVVMVDsKQEAgLTY4MCw2ICs2 ODksNyBAQCBpOTE1X2dlbV9zaG1lbV9wd3JpdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlp bnQgc2htZW1fcGFnZV9vZmZzZXQsIHBhZ2VfbGVuZ3RoLCByZXQgPSAwOwogCWludCBvYmpfZG9f Yml0MTdfc3dpenpsaW5nLCBwYWdlX2RvX2JpdDE3X3N3aXp6bGluZzsKIAlpbnQgaGl0X3Nsb3dw YXRoID0gMDsKKwlpbnQgcmVsZWFzZV9wYWdlOwogCiAJdXNlcl9kYXRhID0gKGNoYXIgX191c2Vy ICopICh1aW50cHRyX3QpIGFyZ3MtPmRhdGFfcHRyOwogCXJlbWFpbiA9IGFyZ3MtPnNpemU7CkBA IC03MDQsMTAgKzcxNCwxNiBAQCBpOTE1X2dlbV9zaG1lbV9wd3JpdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJaWYgKChzaG1lbV9wYWdlX29mZnNldCArIHBhZ2VfbGVuZ3RoKSA+IFBBR0Vf U0laRSkKIAkJCXBhZ2VfbGVuZ3RoID0gUEFHRV9TSVpFIC0gc2htZW1fcGFnZV9vZmZzZXQ7CiAK LQkJcGFnZSA9IHNobWVtX3JlYWRfbWFwcGluZ19wYWdlKG1hcHBpbmcsIG9mZnNldCA+PiBQQUdF X1NISUZUKTsKLQkJaWYgKElTX0VSUihwYWdlKSkgewotCQkJcmV0ID0gUFRSX0VSUihwYWdlKTsK LQkJCWdvdG8gb3V0OworCQlpZiAob2JqLT5wYWdlcykgeworCQkJcGFnZSA9IG9iai0+cGFnZXNb b2Zmc2V0ID4+IFBBR0VfU0hJRlRdOworCQkJcmVsZWFzZV9wYWdlID0gMDsKKwkJfSBlbHNlIHsK KwkJCXBhZ2UgPSBzaG1lbV9yZWFkX21hcHBpbmdfcGFnZShtYXBwaW5nLCBvZmZzZXQgPj4gUEFH RV9TSElGVCk7CisJCQlpZiAoSVNfRVJSKHBhZ2UpKSB7CisJCQkJcmV0ID0gUFRSX0VSUihwYWdl KTsKKwkJCQlnb3RvIG91dDsKKwkJCX0KKwkJCXJlbGVhc2VfcGFnZSA9IDE7CiAJCX0KIAogCQlw YWdlX2RvX2JpdDE3X3N3aXp6bGluZyA9IG9ial9kb19iaXQxN19zd2l6emxpbmcgJiYKQEAgLTcy NSw3ICs3NDEsNyBAQCBpOTE1X2dlbV9zaG1lbV9wd3JpdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJfQogCiAJCWhpdF9zbG93cGF0aCA9IDE7Ci0KKwkJcGFnZV9jYWNoZV9nZXQocGFnZSk7 CiAJCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiAJCXZhZGRyID0ga21hcChw YWdlKTsKQEAgLTc0MCwxMCArNzU2LDEyIEBAIGk5MTVfZ2VtX3NobWVtX3B3cml0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCQlrdW5tYXAocGFnZSk7CiAKIAkJbXV0ZXhfbG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOworCQlwYWdlX2NhY2hlX3JlbGVhc2UocGFnZSk7CiBuZXh0X3BhZ2U6CiAJ CXNldF9wYWdlX2RpcnR5KHBhZ2UpOwogCQltYXJrX3BhZ2VfYWNjZXNzZWQocGFnZSk7Ci0JCXBh Z2VfY2FjaGVfcmVsZWFzZShwYWdlKTsKKwkJaWYgKHJlbGVhc2VfcGFnZSkKKwkJCXBhZ2VfY2Fj aGVfcmVsZWFzZShwYWdlKTsKIAogCQlpZiAocmV0KSB7CiAJCQlyZXQgPSAtRUZBVUxUOwotLSAK MS43LjcuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK