From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: [PATCH 6/6] drm/nouveau: Program aperture field where necessary Date: Mon, 16 Sep 2019 17:17:57 +0200 Message-ID: <20190916151757.10953-7-thierry.reding@gmail.com> References: <20190916151757.10953-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190916151757.10953-1-thierry.reding@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ben Skeggs Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClNvbWUgcmVnaXN0ZXJz IGFuZCBpbnN0YW5jZSBibG9jayBlbnRyaWVzIG5lZWQgdGhlIGFwZXJ0dXJlIHRvIGJlCnByb2dy YW1tZWQgY29ycmVjdGx5LiBUaGlzIGlzIGltcG9ydGFudCBvbiByZWNlbnQgVGVncmEgR1BVcyB3 aGVyZQp0aGUgR1BVIGFjdHVhbGx5IGNoZWNrcyB0aGUgdmFsdWUgb2YgdGhpcyBmaWVsZCBhbmQg ZmF1bHRzIGlmIGFuCmludmFsaWQgYXBlcnR1cmUgaXMgcHJvZ3JhbW1lZC4KCkZvciBleGFtcGxl IEdWMTFCIG5vIGxvbmdlciBzdXBwb3J0cyBWUkFNIGFuZCBhbGwgbWVtb3J5IGlzIGFscmVhZHkK YWxsb2NhdGVkIGZyb20gc3lzdGVtIChjb2hlcmVudCBvciBub24tY29oZXJlbnQpLCBzbyBtYWtl IHN1cmUgdG8KYWxzbyBwcm9ncmFtIHRoZSByaWdodCBhcGVydHVyZS4KClNpZ25lZC1vZmYtYnk6 IFRoaWVycnkgUmVkaW5nIDx0cmVkaW5nQG52aWRpYS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L25vdXZlYXUvbnZrbS9lbmdpbmUvZmlmby9ncGZpZm9nazEwNC5jIHwgNyArKysrKy0tCiBkcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9maWZvL2dwZmlmb2d2MTAwLmMgfCA1ICsr Ky0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9maWZvL2d2MTAwLmMgICAg ICAgfCA3ICsrKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2Jhci9n ZjEwMC5jICAgICAgICB8IDMgKystCiA0IGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyks IDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZr bS9lbmdpbmUvZmlmby9ncGZpZm9nazEwNC5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZr bS9lbmdpbmUvZmlmby9ncGZpZm9nazEwNC5jCmluZGV4IDcyOGExZWRiZjk4Yy4uODQzZWJiNDFk YmM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL2VuZ2luZS9maWZv L2dwZmlmb2drMTA0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUv Zmlmby9ncGZpZm9nazEwNC5jCkBAIC0yMDEsNiArMjAxLDcgQEAgZ2sxMDRfZmlmb19ncGZpZm9f ZmluaShzdHJ1Y3QgbnZrbV9maWZvX2NoYW4gKmJhc2UpCiB2b2lkCiBnazEwNF9maWZvX2dwZmlm b19pbml0KHN0cnVjdCBudmttX2ZpZm9fY2hhbiAqYmFzZSkKIHsKKwl1MzIgYXBlcnR1cmUgPSBu dmttX21lbW9yeV9hcGVydHVyZShiYXNlLT5pbnN0LT5tZW1vcnkpIDw8IDI4OwogCXN0cnVjdCBn azEwNF9maWZvX2NoYW4gKmNoYW4gPSBnazEwNF9maWZvX2NoYW4oYmFzZSk7CiAJc3RydWN0IGdr MTA0X2ZpZm8gKmZpZm8gPSBjaGFuLT5maWZvOwogCXN0cnVjdCBudmttX2RldmljZSAqZGV2aWNl ID0gZmlmby0+YmFzZS5lbmdpbmUuc3ViZGV2LmRldmljZTsKQEAgLTIwOCw3ICsyMDksNyBAQCBn azEwNF9maWZvX2dwZmlmb19pbml0KHN0cnVjdCBudmttX2ZpZm9fY2hhbiAqYmFzZSkKIAl1MzIg Y29mZiA9IGNoYW4tPmJhc2UuY2hpZCAqIDg7CiAKIAludmttX21hc2soZGV2aWNlLCAweDgwMDAw NCArIGNvZmYsIDB4MDAwZjAwMDAsIGNoYW4tPnJ1bmwgPDwgMTYpOwotCW52a21fd3IzMihkZXZp Y2UsIDB4ODAwMDAwICsgY29mZiwgMHg4MDAwMDAwMCB8IGFkZHIpOworCW52a21fd3IzMihkZXZp Y2UsIDB4ODAwMDAwICsgY29mZiwgMHg4MDAwMDAwMCB8IGFwZXJ0dXJlIHwgYWRkcik7CiAKIAlp ZiAobGlzdF9lbXB0eSgmY2hhbi0+aGVhZCkgJiYgIWNoYW4tPmtpbGxlZCkgewogCQlnazEwNF9m aWZvX3J1bmxpc3RfaW5zZXJ0KGZpZm8sIGNoYW4pOwpAQCAtMjUwLDYgKzI1MSw3IEBAIGdrMTA0 X2ZpZm9fZ3BmaWZvX25ld18oc3RydWN0IGdrMTA0X2ZpZm8gKmZpZm8sIHU2NCAqcnVubGlzdHMs IHUxNiAqY2hpZCwKIAl1bnNpZ25lZCBsb25nIGVuZ207CiAJdTY0IHN1YmRldnMgPSAwOwogCXU2 NCB1c2VybWVtOworCXUzMiB0YXJnZXQ7CiAKIAlpZiAoIXZtbSB8fCBydW5saXN0IDwgMCB8fCBy dW5saXN0ID49IGZpZm8tPnJ1bmxpc3RfbnIpCiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMzAzLDEw ICszMDUsMTEgQEAgZ2sxMDRfZmlmb19ncGZpZm9fbmV3XyhzdHJ1Y3QgZ2sxMDRfZmlmbyAqZmlm bywgdTY0ICpydW5saXN0cywgdTE2ICpjaGlkLAogCQludmttX3dvMzIoZmlmby0+dXNlci5tZW0s IHVzZXJtZW0gKyBpLCAweDAwMDAwMDAwKTsKIAludmttX2RvbmUoZmlmby0+dXNlci5tZW0pOwog CXVzZXJtZW0gPSBudmttX21lbW9yeV9hZGRyKGZpZm8tPnVzZXIubWVtKSArIHVzZXJtZW07CisJ dGFyZ2V0ID0gbnZrbV9tZW1vcnlfYXBlcnR1cmUoZmlmby0+dXNlci5tZW0pOwogCiAJLyogUkFN RkMgKi8KIAludmttX2ttYXAoY2hhbi0+YmFzZS5pbnN0KTsKLQludmttX3dvMzIoY2hhbi0+YmFz ZS5pbnN0LCAweDA4LCBsb3dlcl8zMl9iaXRzKHVzZXJtZW0pKTsKKwludmttX3dvMzIoY2hhbi0+ YmFzZS5pbnN0LCAweDA4LCBsb3dlcl8zMl9iaXRzKHVzZXJtZW0pIHwgdGFyZ2V0KTsKIAludmtt X3dvMzIoY2hhbi0+YmFzZS5pbnN0LCAweDBjLCB1cHBlcl8zMl9iaXRzKHVzZXJtZW0pKTsKIAlu dmttX3dvMzIoY2hhbi0+YmFzZS5pbnN0LCAweDEwLCAweDAwMDBmYWNlKTsKIAludmttX3dvMzIo Y2hhbi0+YmFzZS5pbnN0LCAweDMwLCAweGZmZmZmOTAyKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L252a20vZW5naW5lL2ZpZm8vZ3BmaWZvZ3YxMDAuYyBiL2RyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L252a20vZW5naW5lL2ZpZm8vZ3BmaWZvZ3YxMDAuYwppbmRleCBhNzQ2 MmNmNTlkNjUuLjk3ZDA4NGZmY2ZkNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZl YXUvbnZrbS9lbmdpbmUvZmlmby9ncGZpZm9ndjEwMC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L252a20vZW5naW5lL2ZpZm8vZ3BmaWZvZ3YxMDAuYwpAQCAtMTMyLDcgKzEzMiw3IEBA IGd2MTAwX2ZpZm9fZ3BmaWZvX25ld18oY29uc3Qgc3RydWN0IG52a21fZmlmb19jaGFuX2Z1bmMg KmZ1bmMsCiAJdW5zaWduZWQgbG9uZyBlbmdtOwogCXU2NCBzdWJkZXZzID0gMDsKIAl1NjQgdXNl cm1lbSwgbXRoZDsKLQl1MzIgc2l6ZTsKKwl1MzIgc2l6ZSwgdGFyZ2V0OwogCiAJaWYgKCF2bW0g fHwgcnVubGlzdCA8IDAgfHwgcnVubGlzdCA+PSBmaWZvLT5ydW5saXN0X25yKQogCQlyZXR1cm4g LUVJTlZBTDsKQEAgLTE4Myw2ICsxODMsNyBAQCBndjEwMF9maWZvX2dwZmlmb19uZXdfKGNvbnN0 IHN0cnVjdCBudmttX2ZpZm9fY2hhbl9mdW5jICpmdW5jLAogCQludmttX3dvMzIoZmlmby0+dXNl ci5tZW0sIHVzZXJtZW0gKyBpLCAweDAwMDAwMDAwKTsKIAludmttX2RvbmUoZmlmby0+dXNlci5t ZW0pOwogCXVzZXJtZW0gPSBudmttX21lbW9yeV9hZGRyKGZpZm8tPnVzZXIubWVtKSArIHVzZXJt ZW07CisJdGFyZ2V0ID0gbnZrbV9tZW1vcnlfdGFyZ2V0KGZpZm8tPnVzZXIubWVtKTsKIAogCS8q IEFsbG9jYXRlIGZhdWx0IG1ldGhvZCBidWZmZXIgKG1hZ2ljcyBjb21lIGZyb20gbnZncHUpLiAq LwogCXNpemUgPSBudmttX3JkMzIoZGV2aWNlLCAweDEwNDAyOCk7IC8qIE5WX1BDRV9QQ0VfTUFQ ICovCkBAIC0yMDAsNyArMjAxLDcgQEAgZ3YxMDBfZmlmb19ncGZpZm9fbmV3Xyhjb25zdCBzdHJ1 Y3QgbnZrbV9maWZvX2NoYW5fZnVuYyAqZnVuYywKIAogCS8qIFJBTUZDICovCiAJbnZrbV9rbWFw KGNoYW4tPmJhc2UuaW5zdCk7Ci0JbnZrbV93bzMyKGNoYW4tPmJhc2UuaW5zdCwgMHgwMDgsIGxv d2VyXzMyX2JpdHModXNlcm1lbSkpOworCW52a21fd28zMihjaGFuLT5iYXNlLmluc3QsIDB4MDA4 LCBsb3dlcl8zMl9iaXRzKHVzZXJtZW0pIHwgdGFyZ2V0KTsKIAludmttX3dvMzIoY2hhbi0+YmFz ZS5pbnN0LCAweDAwYywgdXBwZXJfMzJfYml0cyh1c2VybWVtKSk7CiAJbnZrbV93bzMyKGNoYW4t PmJhc2UuaW5zdCwgMHgwMTAsIDB4MDAwMGZhY2UpOwogCW52a21fd28zMihjaGFuLT5iYXNlLmlu c3QsIDB4MDMwLCAweDdmZmZmOTAyKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2 ZWF1L252a20vZW5naW5lL2ZpZm8vZ3YxMDAuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252 a20vZW5naW5lL2ZpZm8vZ3YxMDAuYwppbmRleCA2ZWUxYmIzMmEwNzEuLjQ0OWY2NjlmNDNiMCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9lbmdpbmUvZmlmby9ndjEw MC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vZW5naW5lL2ZpZm8vZ3YxMDAu YwpAQCAtMzIsMTEgKzMyLDE2IEBAIHZvaWQKIGd2MTAwX2ZpZm9fcnVubGlzdF9jaGFuKHN0cnVj dCBnazEwNF9maWZvX2NoYW4gKmNoYW4sCiAJCQlzdHJ1Y3QgbnZrbV9tZW1vcnkgKm1lbW9yeSwg dTMyIG9mZnNldCkKIHsKKwlzdHJ1Y3QgbnZrbV9tZW1vcnkgKmluc3RtZW0gPSBjaGFuLT5iYXNl Lmluc3QtPm1lbW9yeTsKIAlzdHJ1Y3QgbnZrbV9tZW1vcnkgKnVzZXJtZW0gPSBjaGFuLT5maWZv LT51c2VyLm1lbTsKIAljb25zdCB1NjQgdXNlciA9IG52a21fbWVtb3J5X2FkZHIodXNlcm1lbSkg KyAoY2hhbi0+YmFzZS5jaGlkICogMHgyMDApOwogCWNvbnN0IHU2NCBpbnN0ID0gY2hhbi0+YmFz ZS5pbnN0LT5hZGRyOworCXU2NCB0YXJnZXQ7CiAKLQludmttX3dvMzIobWVtb3J5LCBvZmZzZXQg KyAweDAsIGxvd2VyXzMyX2JpdHModXNlcikpOworCXRhcmdldCA9ICh1NjQpbnZrbV9tZW1vcnlf YXBlcnR1cmUodXNlcm1lbSkgPDwgNiB8CisJCSAodTY0KW52a21fbWVtb3J5X2FwZXJ0dXJlKGlu c3RtZW0pIDw8IDQ7CisKKwludmttX3dvMzIobWVtb3J5LCBvZmZzZXQgKyAweDAsIGxvd2VyXzMy X2JpdHModXNlcikgfCB0YXJnZXQpOwogCW52a21fd28zMihtZW1vcnksIG9mZnNldCArIDB4NCwg dXBwZXJfMzJfYml0cyh1c2VyKSk7CiAJbnZrbV93bzMyKG1lbW9yeSwgb2Zmc2V0ICsgMHg4LCBs b3dlcl8zMl9iaXRzKGluc3QpIHwgY2hhbi0+YmFzZS5jaGlkKTsKIAludmttX3dvMzIobWVtb3J5 LCBvZmZzZXQgKyAweGMsIHVwcGVyXzMyX2JpdHMoaW5zdCkpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvYmFyL2dmMTAwLmMgYi9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9udmttL3N1YmRldi9iYXIvZ2YxMDAuYwppbmRleCBhM2RjYjA5YTQwZWUuLjVi MTkzYTdiZjVkZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJk ZXYvYmFyL2dmMTAwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYv YmFyL2dmMTAwLmMKQEAgLTU0LDcgKzU0LDggQEAgZ2YxMDBfYmFyX2JhcjFfaW5pdChzdHJ1Y3Qg bnZrbV9iYXIgKmJhc2UpCiAJc3RydWN0IG52a21fZGV2aWNlICpkZXZpY2UgPSBiYXNlLT5zdWJk ZXYuZGV2aWNlOwogCXN0cnVjdCBnZjEwMF9iYXIgKmJhciA9IGdmMTAwX2JhcihiYXNlKTsKIAlj b25zdCB1MzIgYWRkciA9IG52a21fbWVtb3J5X2FkZHIoYmFyLT5iYXJbMV0uaW5zdCkgPj4gMTI7 Ci0JbnZrbV93cjMyKGRldmljZSwgMHgwMDE3MDQsIDB4ODAwMDAwMDAgfCBhZGRyKTsKKwl1MzIg dGFyZ2V0ID0gbnZrbV9tZW1vcnlfYXBlcnR1cmUoYmFyLT5iYXJbMV0uaW5zdCkgPDwgMjg7CisJ bnZrbV93cjMyKGRldmljZSwgMHgwMDE3MDQsIDB4ODAwMDAwMDAgfCB0YXJnZXQgfCBhZGRyKTsK IH0KIAogc3RydWN0IG52a21fdm1tICoKLS0gCjIuMjMuMAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVs