From: David Weinehall Subject: [PATCH] Revert "drm/i915: Add heuristic to determine better way to adjust brightness" Date: Mon, 10 Jul 2017 17:23:44 +0300 Message-ID: <20170710142344.29450-1-david.weinehall@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C3DD89F8B for ; Mon, 10 Jul 2017 14:23:36 +0000 (UTC) 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 Cc: jani.nikula@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyByZXZlcnRzIGNvbW1pdCA1NjBhNzU4ZDM5YzYxNmY4M2FjMjVmZjZlMDgxNmE0OWViZTY0 MDFjLgoKVGhpcyBwYXRjaCBoYXMgYmVlbiBpZGVudGlmaWVkIHRvIGludHJvZHVjZSBhIGJhY2ts aWdodCByZWdyZXNzaW9uCm9uIGF0IGxlYXN0IHR3byBkaWZmZXJlbnQgcGxhdGZvcm1zOyBlaXRo ZXIgdGhlIGhldXJpc3RpYyBpcyBicm9rZW4KKGlmIHNvIHRoZSBwYXRjaCBuZWVkcyB0byBiZSBy ZXdvcmtlZCkgb3IgdGhlIGluLWtlcm5lbCBEUENEIGJhY2tsaWdodApzdXBwb3J0IGlzIGJyb2tl biAoaWYgc28gaXQncyBwcmVtYXR1cmUgdG8gZW5hYmxlIERQQ0QgYmFja2xpZ2h0CmV2ZW4gaWYg dGhlIHBsYXRmb3JtcyBzdXBwb3J0IGl0KS4KClNpZ25lZC1vZmYtYnk6IERhdmlkIFdlaW5laGFs bCA8ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BhcmFtcy5jICAgICAgICAgICAgfCAgNyArKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcGFyYW1zLmggICAgICAgICAgICB8ICAxIC0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwX2F1eF9iYWNrbGlnaHQuYyB8IDYxICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQogMyBmaWxlcyBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDYzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCmluZGV4IDg4YjlkM2U2NzEzYS4uYmVjNWFkZTM3MWIw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmMKQEAgLTYzLDcgKzYzLDcgQEAgc3RydWN0 IGk5MTVfcGFyYW1zIGk5MTUgX19yZWFkX21vc3RseSA9IHsKIAkuaHVjX2Zpcm13YXJlX3BhdGgg PSBOVUxMLAogCS5lbmFibGVfZHBfbXN0ID0gdHJ1ZSwKIAkuaW5qZWN0X2xvYWRfZmFpbHVyZSA9 IDAsCi0JLmVuYWJsZV9kcGNkX2JhY2tsaWdodCA9IC0xLAorCS5lbmFibGVfZHBjZF9iYWNrbGln aHQgPSBmYWxzZSwKIAkuZW5hYmxlX2d2dCA9IGZhbHNlLAogCS5lbmFibGVfZGJjID0gdHJ1ZSwK IH07CkBAIC0yNDcsMTAgKzI0Nyw5IEBAIE1PRFVMRV9QQVJNX0RFU0MoZW5hYmxlX2RwX21zdCwK IG1vZHVsZV9wYXJhbV9uYW1lZF91bnNhZmUoaW5qZWN0X2xvYWRfZmFpbHVyZSwgaTkxNS5pbmpl Y3RfbG9hZF9mYWlsdXJlLCB1aW50LCAwNDAwKTsKIE1PRFVMRV9QQVJNX0RFU0MoaW5qZWN0X2xv YWRfZmFpbHVyZSwKIAkiRm9yY2UgYW4gZXJyb3IgYWZ0ZXIgYSBudW1iZXIgb2YgZmFpbHVyZSBj aGVjayBwb2ludHMgKDA6ZGlzYWJsZWQgKGRlZmF1bHQpLCBOOmZvcmNlIGZhaWx1cmUgYXQgdGhl IE50aCBmYWlsdXJlIGNoZWNrIHBvaW50KSIpOwotbW9kdWxlX3BhcmFtX25hbWVkX3Vuc2FmZShl bmFibGVfZHBjZF9iYWNrbGlnaHQsIGk5MTUuZW5hYmxlX2RwY2RfYmFja2xpZ2h0LCBpbnQsIDA2 MDApOworbW9kdWxlX3BhcmFtX25hbWVkKGVuYWJsZV9kcGNkX2JhY2tsaWdodCwgaTkxNS5lbmFi bGVfZHBjZF9iYWNrbGlnaHQsIGJvb2wsIDA2MDApOwogTU9EVUxFX1BBUk1fREVTQyhlbmFibGVf ZHBjZF9iYWNrbGlnaHQsCi0JIkVuYWJsZSBzdXBwb3J0IGZvciBEUENEIGJhY2tsaWdodCBjb250 cm9sICIKLQkiKC0xOmF1dG8gKGRlZmF1bHQpLCAwOmZvcmNlIGRpc2FibGUsIDE6Zm9yY2UgZW5h YmxlZCBpZiBzdXBwb3J0ZWQiKTsKKwkiRW5hYmxlIHN1cHBvcnQgZm9yIERQQ0QgYmFja2xpZ2h0 IGNvbnRyb2wgKGRlZmF1bHQ6ZmFsc2UpIik7CiAKIG1vZHVsZV9wYXJhbV9uYW1lZChlbmFibGVf Z3Z0LCBpOTE1LmVuYWJsZV9ndnQsIGJvb2wsIDA0MDApOwogTU9EVUxFX1BBUk1fREVTQyhlbmFi bGVfZ3Z0LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1zLmgKaW5kZXggMDU3ZTIwM2U2YmRhLi42 YTg4Yzc2NjY0ZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGFyYW1z LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaApAQCAtNTMsNyArNTMs NiBAQAogCWZ1bmMoaW50LCBlZHBfdnN3aW5nKTsgXAogCWZ1bmMoaW50LCByZXNldCk7IFwKIAlm dW5jKHVuc2lnbmVkIGludCwgaW5qZWN0X2xvYWRfZmFpbHVyZSk7IFwKLQlmdW5jKGludCwgZW5h YmxlX2RwY2RfYmFja2xpZ2h0KTsgXAogCS8qIGxlYXZlIGJvb2xzIGF0IHRoZSBlbmQgdG8gbm90 IGNyZWF0ZSBob2xlcyAqLyBcCiAJZnVuYyhib29sLCBhbHBoYV9zdXBwb3J0KTsgXAogCWZ1bmMo Ym9vbCwgZW5hYmxlX2NtZF9wYXJzZXIpOyBcCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcF9hdXhfYmFja2xpZ2h0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcF9hdXhfYmFja2xpZ2h0LmMKaW5kZXggYjI1Y2Q4OGZjMWM1Li5mMzJkZWMwMmU1NDAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwX2F1eF9iYWNrbGlnaHQuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcF9hdXhfYmFja2xpZ2h0LmMKQEAgLTI3 Nyw2NiArMjc3LDE1IEBAIGludGVsX2RwX2F1eF9kaXNwbGF5X2NvbnRyb2xfY2FwYWJsZShzdHJ1 Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJLyogQ2hlY2sgdGhlIGVEUCBEaXNwbGF5 IGNvbnRyb2wgY2FwYWJpbGl0aWVzIHJlZ2lzdGVycyB0byBkZXRlcm1pbmUgaWYKIAkgKiB0aGUg cGFuZWwgY2FuIHN1cHBvcnQgYmFja2xpZ2h0IGNvbnRyb2wgb3ZlciB0aGUgYXV4IGNoYW5uZWwK IAkgKi8KLQlpZiAoKGludGVsX2RwLT5lZHBfZHBjZFsxXSAmIERQX0VEUF9UQ09OX0JBQ0tMSUdI VF9BREpVU1RNRU5UX0NBUCkgJiYKLQkgICAgKGludGVsX2RwLT5lZHBfZHBjZFsyXSAmIERQX0VE UF9CQUNLTElHSFRfQlJJR0hUTkVTU19BVVhfU0VUX0NBUCkpIHsKKwlpZiAoaW50ZWxfZHAtPmVk cF9kcGNkWzFdICYgRFBfRURQX1RDT05fQkFDS0xJR0hUX0FESlVTVE1FTlRfQ0FQICYmCisJICAg IChpbnRlbF9kcC0+ZWRwX2RwY2RbMl0gJiBEUF9FRFBfQkFDS0xJR0hUX0JSSUdIVE5FU1NfQVVY X1NFVF9DQVApICYmCisJICAgICEoaW50ZWxfZHAtPmVkcF9kcGNkWzJdICYgRFBfRURQX0JBQ0tM SUdIVF9CUklHSFRORVNTX1BXTV9QSU5fQ0FQKSkgewogCQlEUk1fREVCVUdfS01TKCJBVVggQmFj a2xpZ2h0IENvbnRyb2wgU3VwcG9ydGVkIVxuIik7CiAJCXJldHVybiB0cnVlOwogCX0KIAlyZXR1 cm4gZmFsc2U7CiB9CiAKLS8qCi0gKiBIZXVyaXN0aWMgZnVuY3Rpb24gd2hldGhlciB3ZSBzaG91 bGQgdXNlIEFVWCBmb3IgYmFja2xpZ2h0IGFkanVzdG1lbnQgb3Igbm90LgotICoKLSAqIFdlIHNo b3VsZCB1c2UgQVVYIGZvciBiYWNrbGlnaHQgYnJpZ2h0bmVzcyBhZGp1c3RtZW50IGlmIHBhbmVs IGRvZXNuJ3QgdGhpcwotICogdmlhIFBXTSBwaW4gb3IgdXNpbmcgQVVYIGlzIGJldHRlciB0aGFu IHVzaW5nIFBXTSBwaW4uCi0gKgotICogVGhlIGhldXJpc3RpYyB0byBkZXRlcm1pbmUgdGhhdCB1 c2luZyBBVVggcGluIGlzIGJldHRlciB0aGFuIHVzaW5nIFBXTSBwaW4gaXMKLSAqIHRoYXQgdGhl IHBhbmVsIHN1cHBvcnQgYW55IG9mIHRoZSBmZWF0dXJlIGxpc3QgaGVyZS4KLSAqIC0gUmVnaW9u YWwgYmFja2xpZ2h0IGJyaWdodG5lc3MgYWRqdXN0bWVudAotICogLSBCYWNrbGlnaHQgUFdNIGZy ZXF1ZW5jeSBzZXQKLSAqIC0gTW9yZSB0aGFuIDggYml0cyByZXNvbHV0aW9uIG9mIGJyaWdodG5l c3MgbGV2ZWwKLSAqIC0gQmFja2xpZ2h0IGVuYWJsZW1lbnQgdmlhIEFVWCBhbmQgbm90IGJ5IEJM X0VOQUJMRSBwaW4KLSAqCi0gKiBJZiBhbGwgYWJvdmUgYXJlIG5vdCB0cnVlLCBhc3N1bWUgdGhh dCB1c2luZyBQV00gcGluIGlzIGJldHRlci4KLSAqLwotc3RhdGljIGJvb2wKLWludGVsX2RwX2F1 eF9kaXNwbGF5X2NvbnRyb2xfaGV1cmlzdGljKHN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmNvbm5l Y3RvcikKLXsKLQlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gZW5jX3RvX2ludGVsX2RwKCZj b25uZWN0b3ItPmVuY29kZXItPmJhc2UpOwotCXVpbnQ4X3QgcmVnX3ZhbDsKLQotCS8qIFBhbmVs IGRvZXNuJ3Qgc3VwcG9ydCBhZGp1c3RpbmcgYmFja2xpZ2h0IGJyaWdodG5lc3MgdmlhIFBXTiBw aW4gKi8KLQlpZiAoIShpbnRlbF9kcC0+ZWRwX2RwY2RbMl0gJiBEUF9FRFBfQkFDS0xJR0hUX0JS SUdIVE5FU1NfUFdNX1BJTl9DQVApKQotCQlyZXR1cm4gdHJ1ZTsKLQotCS8qIFBhbmVsIHN1cHBv cnRzIHJlZ2lvbmFsIGJhY2tsaWdodCBicmlnaHRuZXNzIGFkanVzdG1lbnQgKi8KLQlpZiAoZHJt X2RwX2RwY2RfcmVhZGIoJmludGVsX2RwLT5hdXgsIERQX0VEUF9HRU5FUkFMX0NBUF8zLAotCQkJ ICAgICAgJnJlZ192YWwpICE9IDEpIHsKLQkJRFJNX0RFQlVHX0tNUygiRmFpbGVkIHRvIHJlYWQg RFBDRCByZWdpc3RlciAweCV4XG4iLAotCQkJICAgICAgIERQX0VEUF9HRU5FUkFMX0NBUF8zKTsK LQkJcmV0dXJuIGZhbHNlOwotCX0KLQlpZiAocmVnX3ZhbCA+IDApCi0JCXJldHVybiB0cnVlOwot Ci0JLyogUGFuZWwgc3VwcG9ydHMgYmFja2xpZ2h0IFBXTSBmcmVxdWVuY3kgc2V0ICovCi0JaWYg KGludGVsX2RwLT5lZHBfZHBjZFsyXSAmIERQX0VEUF9CQUNLTElHSFRfRlJFUV9BVVhfU0VUX0NB UCkKLQkJcmV0dXJuIHRydWU7Ci0KLQkvKiBQYW5lbCBzdXBwb3J0cyBtb3JlIHRoYW4gOCBiaXRz IHJlc29sdXRpb24gb2YgYnJpZ2h0bmVzcyBsZXZlbCAqLwotCWlmIChpbnRlbF9kcC0+ZWRwX2Rw Y2RbMl0gJiBEUF9FRFBfQkFDS0xJR0hUX0JSSUdIVE5FU1NfQllURV9DT1VOVCkKLQkJcmV0dXJu IHRydWU7Ci0KLQkvKiBQYW5lbCBzdXBwb3J0cyBlbmFibGluZyBiYWNrbGlnaHQgdmlhIEFVWCBi dXQgbm90IGJ5IEJMX0VOQUJMRSBwaW4gKi8KLQlpZiAoKGludGVsX2RwLT5lZHBfZHBjZFsxXSAm IERQX0VEUF9CQUNLTElHSFRfQVVYX0VOQUJMRV9DQVApICYmCi0JICAgICEoaW50ZWxfZHAtPmVk cF9kcGNkWzFdICYgRFBfRURQX0JBQ0tMSUdIVF9QSU5fRU5BQkxFX0NBUCkpCi0JCXJldHVybiB0 cnVlOwotCi0JcmV0dXJuIGZhbHNlOwotCi19Ci0KIGludCBpbnRlbF9kcF9hdXhfaW5pdF9iYWNr bGlnaHRfZnVuY3Moc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yKQogewog CXN0cnVjdCBpbnRlbF9wYW5lbCAqcGFuZWwgPSAmaW50ZWxfY29ubmVjdG9yLT5wYW5lbDsKQEAg LTM0NywxMCArMjk2LDYgQEAgaW50IGludGVsX2RwX2F1eF9pbml0X2JhY2tsaWdodF9mdW5jcyhz dHJ1Y3QgaW50ZWxfY29ubmVjdG9yICppbnRlbF9jb25uZWN0b3IpCiAJaWYgKCFpbnRlbF9kcF9h dXhfZGlzcGxheV9jb250cm9sX2NhcGFibGUoaW50ZWxfY29ubmVjdG9yKSkKIAkJcmV0dXJuIC1F Tk9ERVY7CiAKLQlpZiAoaTkxNS5lbmFibGVfZHBjZF9iYWNrbGlnaHQgPT0gLTEgJiYKLQkgICAg IWludGVsX2RwX2F1eF9kaXNwbGF5X2NvbnRyb2xfaGV1cmlzdGljKGludGVsX2Nvbm5lY3Rvcikp Ci0JCXJldHVybiAtRU5PREVWOwotCiAJcGFuZWwtPmJhY2tsaWdodC5zZXR1cCA9IGludGVsX2Rw X2F1eF9zZXR1cF9iYWNrbGlnaHQ7CiAJcGFuZWwtPmJhY2tsaWdodC5lbmFibGUgPSBpbnRlbF9k cF9hdXhfZW5hYmxlX2JhY2tsaWdodDsKIAlwYW5lbC0+YmFja2xpZ2h0LmRpc2FibGUgPSBpbnRl bF9kcF9hdXhfZGlzYWJsZV9iYWNrbGlnaHQ7Ci0tIAoyLjEzLjIKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=