From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alastair Bridgewater Subject: [PATCH v3 01/10] drm/nouveau: Clean up nv50_head_atomic_check_mode() and fix blankus calculation Date: Tue, 11 Apr 2017 13:11:16 -0400 Message-ID: <20170411171125.10496-2-alastair.bridgewater@gmail.com> References: <20170117224204.27516-1-alastair.bridgewater@gmail.com> <20170411171125.10496-1-alastair.bridgewater@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170411171125.10496-1-alastair.bridgewater-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org ZHJtX21vZGVfc2V0X2NydGNpbmZvKCkgZG9lcyBjb21wZW5zYXRpb24gZm9yIGludGVybGFjZSBh bmQKZG91Ymxlc2NhbiB0aW1pbmcgZWZmZWN0cyBhbHJlYWR5LCBzbyBkbyBpdCBmaXJzdCBhbmQg dXNlIHRoZQpjb21wZW5zYXRlZCBmaWd1cmVzIGluc3RlYWQgb2YgdGhlIGNvbnN0YW50ICJ2c2Nh biAvIGlsYWNlIiB0ZXJtcwp0aGF0IHdlIGhhZCBiZWZvcmUuCgpBbmQgdGhlbiBpdCB0dXJucyBv dXQgdGhhdCB0aGUgaGFyZHdhcmUgbW9kZWwgZm9yIGhvdyB0aGUgdGltaW5nCnBhcmFtZXRlcnMg YXJlIGNvbmZpZ3VyZWQgaXMgYmFzaWNhbGx5IHRoZSBzdGFuZGFyZCBtb2RlbCwgYnV0CnN0YXJ0 aW5nIG9uZSBjbG9jayBiZWZvcmUgdGhlIHN5bmMgcHVsc2UgcmF0aGVyIHRoYW4gYXQgdGhlIHN0 YXJ0Cm9mIHRoZSBkaXNwbGF5IGFyZWEsIHdoaWNoIGxldHMgdXMgZHJhc3RpY2FsbHkgc2ltcGxp ZnkgdGhlCm92ZXJhbGwgdGltaW5nIGNhbGN1bGF0aW9ucyAodmVyaWZ5aW5nIHRoZSBjaGFuZ2Vz IGJ5IGFsZ2VicmFpYwpvcGVyYXRpb25zIGlzIGxlZnQgYXMgYW4gZXhlcmNpc2UgZm9yIHRoZSBy ZWFkZXIpLgoKRmluYWxseSwgdGhlcmUgd2VyZSBhIGNvdXBsZSBvZiBpc3N1ZXMgd2l0aCB0aGUg Y29tcHV0YXRpb24gb2YKbS0+di5ibGFua3VzIHRoYXQgYXJlIGFkZHJlc3NlZCBoZXJlLiAgSW50 ZXJsYWNlZCBtb2RlcyB3b3VsZApnZW5lcmF0ZSBhIG5lZ2F0aXZlIGludGVybWVkaWF0ZSByZXN1 bHQuICBEb3VibGUgc2NhbiBtb2RlcyB3b3VsZApnZW5lcmF0ZSBhbiBvdmVyZXN0aW1hdGUgcmF0 aGVyIHRoYW4gYW4gdW5kZXJlc3RpbWF0ZS4gIEFuZCB3aGVuCmVuYWJsaW5nIGZyYW1lLXBhY2tp bmcgbW9kZXMsIGEgcmF0aGVyIGV4dHJlbWUgb3ZlcmVzdGltYXRlIHdvdWxkCmJlIGdlbmVyYXRl ZC4gIEZpeGVkLCBieSB1c2luZyB0aGUgdGltaW5ncyBhcyBhZGp1c3RlZCBmb3IgdGhlCkNSVEMg dG8gZmluZCB0aGUgbGVuZ3RoIG9mIHRoZSB2ZXJ0aWNhbCBibGFua2luZyBwZXJpb2QgaW5zdGVh ZCBvZgptaXhpbmcgYWRqdXN0ZWQgYW5kIHByZS1hZGp1c3RtZW50IHRpbWluZyBwYXJhbWV0ZXJz LgoKU2lnbmVkLW9mZi1ieTogQWxhc3RhaXIgQnJpZGdld2F0ZXIgPGFsYXN0YWlyLmJyaWRnZXdh dGVyQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXku YyB8IDQ0ICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyMyBpbnNlcnRpb25zKCspLCAyMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9udjUwX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L252NTBfZGlzcGxheS5jCmluZGV4IGM5OTEwYzguLmM5MDFmMzIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L252NTBfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L252NTBfZGlzcGxheS5jCkBAIC0yMDM1LDM0ICsyMDM1LDM3IEBAIHN0YXRpYyB2b2lk CiBudjUwX2hlYWRfYXRvbWljX2NoZWNrX21vZGUoc3RydWN0IG52NTBfaGVhZCAqaGVhZCwgc3Ry dWN0IG52NTBfaGVhZF9hdG9tICphc3loKQogewogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpt b2RlID0gJmFzeWgtPnN0YXRlLmFkanVzdGVkX21vZGU7Ci0JdTMyIGlsYWNlICAgPSAobW9kZS0+ ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSkgPyAyIDogMTsKLQl1MzIgdnNjYW4gICA9 IChtb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfREJMU0NBTikgPyAyIDogMTsKLQl1MzIgaGJh Y2twICA9ICBtb2RlLT5odG90YWwgLSBtb2RlLT5oc3luY19lbmQ7Ci0JdTMyIHZiYWNrcCAgPSAo bW9kZS0+dnRvdGFsIC0gbW9kZS0+dnN5bmNfZW5kKSAqIHZzY2FuIC8gaWxhY2U7Ci0JdTMyIGhm cm9udHAgPSAgbW9kZS0+aHN5bmNfc3RhcnQgLSBtb2RlLT5oZGlzcGxheTsKLQl1MzIgdmZyb250 cCA9IChtb2RlLT52c3luY19zdGFydCAtIG1vZGUtPnZkaXNwbGF5KSAqIHZzY2FuIC8gaWxhY2U7 Ci0JdTMyIGJsYW5rdXM7CiAJc3RydWN0IG52NTBfaGVhZF9tb2RlICptID0gJmFzeWgtPm1vZGU7 CisJdTMyIGJsYW5rdXM7CiAKLQltLT5oLmFjdGl2ZSA9IG1vZGUtPmh0b3RhbDsKLQltLT5oLnN5 bmNlICA9IG1vZGUtPmhzeW5jX2VuZCAtIG1vZGUtPmhzeW5jX3N0YXJ0IC0gMTsKLQltLT5oLmJs YW5rZSA9IG0tPmguc3luY2UgKyBoYmFja3A7Ci0JbS0+aC5ibGFua3MgPSBtb2RlLT5odG90YWwg LSBoZnJvbnRwIC0gMTsKKwlkcm1fbW9kZV9zZXRfY3J0Y2luZm8obW9kZSwgQ1JUQ19JTlRFUkxB Q0VfSEFMVkVfVik7CiAKLQltLT52LmFjdGl2ZSA9IG1vZGUtPnZ0b3RhbCAqIHZzY2FuIC8gaWxh Y2U7Ci0JbS0+di5zeW5jZSAgPSAoKG1vZGUtPnZzeW5jX2VuZCAtIG1vZGUtPnZzeW5jX3N0YXJ0 KSAqIHZzY2FuIC8gaWxhY2UpIC0gMTsKLQltLT52LmJsYW5rZSA9IG0tPnYuc3luY2UgKyB2YmFj a3A7Ci0JbS0+di5ibGFua3MgPSBtLT52LmFjdGl2ZSAtIHZmcm9udHAgLSAxOworCS8qCisJICog RFJNIG1vZGVzIGFyZSBkZWZpbmVkIGluIHRlcm1zIG9mIGEgcmVwZWF0aW5nIGludGVydmFsCisJ ICogc3RhcnRpbmcgd2l0aCB0aGUgYWN0aXZlIGRpc3BsYXkgYXJlYS4gIFRoZSBoYXJkd2FyZSBt b2RlcworCSAqIGFyZSBkZWZpbmVkIGluIHRlcm1zIG9mIGEgcmVwZWF0aW5nIGludGVydmFsIHN0 YXJ0aW5nIG9uZQorCSAqIHVuaXQgKHBpeGVsIG9yIGxpbmUpIGludG8gdGhlIHN5bmMgcHVsc2Uu ICBTbywgYWRkIGJpYXMuCisJICovCisKKwltLT5oLmFjdGl2ZSA9IG1vZGUtPmNydGNfaHRvdGFs OworCW0tPmguc3luY2UgID0gbW9kZS0+Y3J0Y19oc3luY19lbmQgLSBtb2RlLT5jcnRjX2hzeW5j X3N0YXJ0IC0gMTsKKwltLT5oLmJsYW5rZSA9IG1vZGUtPmNydGNfaGJsYW5rX2VuZCAtIG1vZGUt PmNydGNfaHN5bmNfc3RhcnQgLSAxOworCW0tPmguYmxhbmtzID0gbS0+aC5ibGFua2UgKyBtb2Rl LT5jcnRjX2hkaXNwbGF5OworCisJbS0+di5hY3RpdmUgPSBtb2RlLT5jcnRjX3Z0b3RhbDsKKwlt LT52LnN5bmNlICA9IG1vZGUtPmNydGNfdnN5bmNfZW5kIC0gbW9kZS0+Y3J0Y192c3luY19zdGFy dCAtIDE7CisJbS0+di5ibGFua2UgPSBtb2RlLT5jcnRjX3ZibGFua19lbmQgLSBtb2RlLT5jcnRj X3ZzeW5jX3N0YXJ0IC0gMTsKKwltLT52LmJsYW5rcyA9IG0tPnYuYmxhbmtlICsgbW9kZS0+Y3J0 Y192ZGlzcGxheTsKIAogCS8qWFhYOiBTYWZlIHVuZGVyZXN0aW1hdGUsIGV2ZW4gIjAiIHdvcmtz ICovCi0JYmxhbmt1cyA9IChtLT52LmFjdGl2ZSAtIG1vZGUtPnZkaXNwbGF5IC0gMikgKiBtLT5o LmFjdGl2ZTsKKwlibGFua3VzID0gKG0tPnYuYWN0aXZlIC0gbW9kZS0+Y3J0Y192ZGlzcGxheSAt IDIpICogbS0+aC5hY3RpdmU7CiAJYmxhbmt1cyAqPSAxMDAwOwotCWJsYW5rdXMgLz0gbW9kZS0+ Y2xvY2s7CisJYmxhbmt1cyAvPSBtb2RlLT5jcnRjX2Nsb2NrOwogCW0tPnYuYmxhbmt1cyA9IGJs YW5rdXM7CiAKIAlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0lOVEVSTEFDRSkgewot CQltLT52LmJsYW5rMmUgPSAgbS0+di5hY3RpdmUgKyBtLT52LnN5bmNlICsgdmJhY2twOwotCQlt LT52LmJsYW5rMnMgPSAgbS0+di5ibGFuazJlICsgKG1vZGUtPnZkaXNwbGF5ICogdnNjYW4gLyBp bGFjZSk7CisJCW0tPnYuYmxhbmsyZSA9ICBtLT52LmFjdGl2ZSArIG0tPnYuYmxhbmtlOworCQlt LT52LmJsYW5rMnMgPSAgbS0+di5ibGFuazJlICsgbW9kZS0+Y3J0Y192ZGlzcGxheTsKIAkJbS0+ di5hY3RpdmUgID0gKG0tPnYuYWN0aXZlICogMikgKyAxOwogCQltLT5pbnRlcmxhY2UgPSB0cnVl OwogCX0gZWxzZSB7CkBAIC0yMDcwLDkgKzIwNzMsOCBAQCBudjUwX2hlYWRfYXRvbWljX2NoZWNr X21vZGUoc3RydWN0IG52NTBfaGVhZCAqaGVhZCwgc3RydWN0IG52NTBfaGVhZF9hdG9tICphc3lo KQogCQltLT52LmJsYW5rMnMgPSAxOwogCQltLT5pbnRlcmxhY2UgPSBmYWxzZTsKIAl9Ci0JbS0+ Y2xvY2sgPSBtb2RlLT5jbG9jazsKKwltLT5jbG9jayA9IG1vZGUtPmNydGNfY2xvY2s7CiAKLQlk cm1fbW9kZV9zZXRfY3J0Y2luZm8obW9kZSwgQ1JUQ19JTlRFUkxBQ0VfSEFMVkVfVik7CiAJYXN5 aC0+c2V0Lm1vZGUgPSB0cnVlOwogfQogCi0tIAoyLjEwLjIKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZlYXVA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vbm91dmVhdQo=