From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: [PATCH v3] drm/print: add drm_debug_enabled() Date: Tue, 1 Oct 2019 17:06:14 +0300 Message-ID: <20191001140614.26909-1-jani.nikula@intel.com> References: <4829bf92dd2a5630ebdf22682517de1f89b81ad0.1569329774.git.jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <4829bf92dd2a5630ebdf22682517de1f89b81ad0.1569329774.git.jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , dri-devel@lists.freedesktop.org Cc: Alex Deucher , intel-gfx@lists.freedesktop.org, Eric Engestrom List-Id: dri-devel@lists.freedesktop.org QWRkIGhlbHBlciB0byBjaGVjayBpZiBhIGRybSBkZWJ1ZyBjYXRlZ29yeSBpcyBlbmFibGVkLiBD b252ZXJ0IGRybSBjb3JlCnRvIHVzZSBpdC4gTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgoKdjI6IE1v dmUgdW5saWtlbHkoKSB0byBkcm1fZGVidWdfZW5hYmxlZCgpIChFcmljKQoKdjM6IEtlZXAgdW5s aWtlbHkoKSB3aGVuIGNvbWJpbmVkIHdpdGggb3RoZXIgY29uZGl0aW9ucyAoRXJpYykKCkNjOiBF cmljIEVuZ2VzdHJvbSA8ZXJpY0Blbmdlc3Ryb20uY2g+CkFja2VkLWJ5OiBBbGV4IERldWNoZXIg PGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxq YW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfdWFw aS5jICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMgfCA2 ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkLmMgICAgICAgICAgICB8IDIgKy0KIGRy aXZlcnMvZ3B1L2RybS9kcm1fZWRpZF9sb2FkLmMgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9k cm0vZHJtX21pcGlfZGJpLmMgICAgICAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3By aW50LmMgICAgICAgICAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3ZibGFuay5jICAg ICAgICAgIHwgNiArKystLS0KIGluY2x1ZGUvZHJtL2RybV9wcmludC5oICAgICAgICAgICAgICAg fCA1ICsrKysrCiA4IGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX3VhcGkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX3VhcGkuYwppbmRleCA3YTI2YmZiNTMyOWMuLjBkNDY2 ZDNiMDgwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfdWFwaS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX3VhcGkuYwpAQCAtMTQwNSw3ICsxNDA1LDcg QEAgaW50IGRybV9tb2RlX2F0b21pY19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0g ZWxzZSBpZiAoYXJnLT5mbGFncyAmIERSTV9NT0RFX0FUT01JQ19OT05CTE9DSykgewogCQlyZXQg PSBkcm1fYXRvbWljX25vbmJsb2NraW5nX2NvbW1pdChzdGF0ZSk7CiAJfSBlbHNlIHsKLQkJaWYg KHVubGlrZWx5KGRybV9kZWJ1ZyAmIERSTV9VVF9TVEFURSkpCisJCWlmIChkcm1fZGVidWdfZW5h YmxlZChEUk1fVVRfU1RBVEUpKQogCQkJZHJtX2F0b21pY19wcmludF9zdGF0ZShzdGF0ZSk7CiAK IAkJcmV0ID0gZHJtX2F0b21pY19jb21taXQoc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2RybV9kcF9tc3RfdG9wb2xvZ3kuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0 X3RvcG9sb2d5LmMKaW5kZXggZTY4MDFkYjU0ZDBmLi42YjE0YjYzYjhkNjIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fZHBfbXN0X3RvcG9sb2d5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9kcF9tc3RfdG9wb2xvZ3kuYwpAQCAtMTE3OSw3ICsxMTc5LDcgQEAgc3RhdGljIGlu dCBkcm1fZHBfbXN0X3dhaXRfdHhfcmVwbHkoc3RydWN0IGRybV9kcF9tc3RfYnJhbmNoICptc3Ri LAogCQl9CiAJfQogb3V0OgotCWlmICh1bmxpa2VseShyZXQgPT0gLUVJTyAmJiBkcm1fZGVidWcg JiBEUk1fVVRfRFApKSB7CisJaWYgKHVubGlrZWx5KHJldCA9PSAtRUlPKSAmJiBkcm1fZGVidWdf ZW5hYmxlZChEUk1fVVRfRFApKSB7CiAJCXN0cnVjdCBkcm1fcHJpbnRlciBwID0gZHJtX2RlYnVn X3ByaW50ZXIoREJHX1BSRUZJWCk7CiAKIAkJZHJtX2RwX21zdF9kdW1wX3NpZGViYW5kX21zZ190 eCgmcCwgdHhtc2cpOwpAQCAtMjMyMiw3ICsyMzIyLDcgQEAgc3RhdGljIGludCBwcm9jZXNzX3Np bmdsZV90eF9xbG9jayhzdHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKIAlpZHgg Kz0gdG9zZW5kICsgMTsKIAogCXJldCA9IGRybV9kcF9zZW5kX3NpZGViYW5kX21zZyhtZ3IsIHVw LCBjaHVuaywgaWR4KTsKLQlpZiAodW5saWtlbHkocmV0ICYmIGRybV9kZWJ1ZyAmIERSTV9VVF9E UCkpIHsKKwlpZiAodW5saWtlbHkocmV0KSAmJiBkcm1fZGVidWdfZW5hYmxlZChEUk1fVVRfRFAp KSB7CiAJCXN0cnVjdCBkcm1fcHJpbnRlciBwID0gZHJtX2RlYnVnX3ByaW50ZXIoREJHX1BSRUZJ WCk7CiAKIAkJZHJtX3ByaW50ZigmcCwgInNpZGViYW5kIG1zZyBmYWlsZWQgdG8gc2VuZFxuIik7 CkBAIC0yMzg5LDcgKzIzODksNyBAQCBzdGF0aWMgdm9pZCBkcm1fZHBfcXVldWVfZG93bl90eChz dHJ1Y3QgZHJtX2RwX21zdF90b3BvbG9neV9tZ3IgKm1nciwKIAltdXRleF9sb2NrKCZtZ3ItPnFs b2NrKTsKIAlsaXN0X2FkZF90YWlsKCZ0eG1zZy0+bmV4dCwgJm1nci0+dHhfbXNnX2Rvd25xKTsK IAotCWlmICh1bmxpa2VseShkcm1fZGVidWcgJiBEUk1fVVRfRFApKSB7CisJaWYgKGRybV9kZWJ1 Z19lbmFibGVkKERSTV9VVF9EUCkpIHsKIAkJc3RydWN0IGRybV9wcmludGVyIHAgPSBkcm1fZGVi dWdfcHJpbnRlcihEQkdfUFJFRklYKTsKIAogCQlkcm1fZHBfbXN0X2R1bXBfc2lkZWJhbmRfbXNn X3R4KCZwLCB0eG1zZyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZC5jCmluZGV4IDNjOTcwM2IwODQ5MS4uMDU1MjE3NTMx M2NiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX2VkaWQuYwpAQCAtMTY1MSw3ICsxNjUxLDcgQEAgc3RhdGljIHZvaWQgY29u bmVjdG9yX2JhZF9lZGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiB7CiAJaW50 IGk7CiAKLQlpZiAoY29ubmVjdG9yLT5iYWRfZWRpZF9jb3VudGVyKysgJiYgIShkcm1fZGVidWcg JiBEUk1fVVRfS01TKSkKKwlpZiAoY29ubmVjdG9yLT5iYWRfZWRpZF9jb3VudGVyKysgJiYgIWRy bV9kZWJ1Z19lbmFibGVkKERSTV9VVF9LTVMpKQogCQlyZXR1cm47CiAKIAlkZXZfd2Fybihjb25u ZWN0b3ItPmRldi0+ZGV2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkX2xv YWQuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZF9sb2FkLmMKaW5kZXggZDM4YjNiMjU1OTI2 Li4zN2Q4YmEzZGRiNDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZF9sb2Fk LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9lZGlkX2xvYWQuYwpAQCAtMTc1LDcgKzE3NSw3 IEBAIHN0YXRpYyB2b2lkICplZGlkX2xvYWQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv ciwgY29uc3QgY2hhciAqbmFtZSwKIAl1OCAqZWRpZDsKIAlpbnQgZndzaXplLCBidWlsdGluOwog CWludCBpLCB2YWxpZF9leHRlbnNpb25zID0gMDsKLQlib29sIHByaW50X2JhZF9lZGlkID0gIWNv bm5lY3Rvci0+YmFkX2VkaWRfY291bnRlciB8fCAoZHJtX2RlYnVnICYgRFJNX1VUX0tNUyk7CisJ Ym9vbCBwcmludF9iYWRfZWRpZCA9ICFjb25uZWN0b3ItPmJhZF9lZGlkX2NvdW50ZXIgfHwgZHJt X2RlYnVnX2VuYWJsZWQoRFJNX1VUX0tNUyk7CiAKIAlidWlsdGluID0gbWF0Y2hfc3RyaW5nKGdl bmVyaWNfZWRpZF9uYW1lLCBHRU5FUklDX0VESURTLCBuYW1lKTsKIAlpZiAoYnVpbHRpbiA+PSAw KSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX21pcGlfZGJpLmMgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX21pcGlfZGJpLmMKaW5kZXggZjgxNTQzMTZhM2IwLi5jY2ZiNWIzM2M1ZTMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbWlwaV9kYmkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX21pcGlfZGJpLmMKQEAgLTc4Myw3ICs3ODMsNyBAQCBzdGF0aWMgaW50IG1p cGlfZGJpX3NwaTFlX3RyYW5zZmVyKHN0cnVjdCBtaXBpX2RiaSAqZGJpLCBpbnQgZGMsCiAJaW50 IGksIHJldDsKIAl1OCAqZHN0OwogCi0JaWYgKGRybV9kZWJ1ZyAmIERSTV9VVF9EUklWRVIpCisJ aWYgKGRybV9kZWJ1Z19lbmFibGVkKERSTV9VVF9EUklWRVIpKQogCQlwcl9kZWJ1ZygiW2RybTol c10gZGM9JWQsIG1heF9jaHVuaz0lenUsIHRyYW5zZmVyczpcbiIsCiAJCQkgX19mdW5jX18sIGRj LCBtYXhfY2h1bmspOwogCkBAIC05MDcsNyArOTA3LDcgQEAgc3RhdGljIGludCBtaXBpX2RiaV9z cGkxX3RyYW5zZmVyKHN0cnVjdCBtaXBpX2RiaSAqZGJpLCBpbnQgZGMsCiAJbWF4X2NodW5rID0g ZGJpLT50eF9idWY5X2xlbjsKIAlkc3QxNiA9IGRiaS0+dHhfYnVmOTsKIAotCWlmIChkcm1fZGVi dWcgJiBEUk1fVVRfRFJJVkVSKQorCWlmIChkcm1fZGVidWdfZW5hYmxlZChEUk1fVVRfRFJJVkVS KSkKIAkJcHJfZGVidWcoIltkcm06JXNdIGRjPSVkLCBtYXhfY2h1bms9JXp1LCB0cmFuc2ZlcnM6 XG4iLAogCQkJIF9fZnVuY19fLCBkYywgbWF4X2NodW5rKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2RybV9wcmludC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcmludC5jCmluZGV4 IDFhZGUzYTkxN2MxMC4uOWEyNWQ3M2MxNTVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v ZHJtX3ByaW50LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcmludC5jCkBAIC0yNjIsNyAr MjYyLDcgQEAgdm9pZCBkcm1fZGV2X2RiZyhjb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYsIHVuc2ln bmVkIGludCBjYXRlZ29yeSwKIAlzdHJ1Y3QgdmFfZm9ybWF0IHZhZjsKIAl2YV9saXN0IGFyZ3M7 CiAKLQlpZiAoIShkcm1fZGVidWcgJiBjYXRlZ29yeSkpCisJaWYgKCFkcm1fZGVidWdfZW5hYmxl ZChjYXRlZ29yeSkpCiAJCXJldHVybjsKIAogCXZhX3N0YXJ0KGFyZ3MsIGZvcm1hdCk7CkBAIC0y ODUsNyArMjg1LDcgQEAgdm9pZCBkcm1fZGJnKHVuc2lnbmVkIGludCBjYXRlZ29yeSwgY29uc3Qg Y2hhciAqZm9ybWF0LCAuLi4pCiAJc3RydWN0IHZhX2Zvcm1hdCB2YWY7CiAJdmFfbGlzdCBhcmdz OwogCi0JaWYgKCEoZHJtX2RlYnVnICYgY2F0ZWdvcnkpKQorCWlmICghZHJtX2RlYnVnX2VuYWJs ZWQoY2F0ZWdvcnkpKQogCQlyZXR1cm47CiAKIAl2YV9zdGFydChhcmdzLCBmb3JtYXQpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV92YmxhbmsuYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fdmJsYW5rLmMKaW5kZXggOWM2ODk5NzU4YmM5Li40Zjc5NjJiNjQyN2IgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fdmJsYW5rLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV92 YmxhbmsuYwpAQCAtMzMyLDcgKzMzMiw3IEBAIHU2NCBkcm1fY3J0Y19hY2N1cmF0ZV92Ymxhbmtf Y291bnQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXU2NCB2Ymxhbms7CiAJdW5zaWduZWQgbG9u ZyBmbGFnczsKIAotCVdBUk5fT05DRShkcm1fZGVidWcgJiBEUk1fVVRfVkJMICYmICFkZXYtPmRy aXZlci0+Z2V0X3ZibGFua190aW1lc3RhbXAsCisJV0FSTl9PTkNFKGRybV9kZWJ1Z19lbmFibGVk KERSTV9VVF9WQkwpICYmICFkZXYtPmRyaXZlci0+Z2V0X3ZibGFua190aW1lc3RhbXAsCiAJCSAg IlRoaXMgZnVuY3Rpb24gcmVxdWlyZXMgc3VwcG9ydCBmb3IgYWNjdXJhdGUgdmJsYW5rIHRpbWVz dGFtcHMuIik7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2LT52YmxhbmtfdGltZV9sb2NrLCBm bGFncyk7CkBAIC03MDYsNyArNzA2LDcgQEAgYm9vbCBkcm1fY2FsY192Ymx0aW1lc3RhbXBfZnJv bV9zY2Fub3V0cG9zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICovCiAJKnZibGFua190aW1l ID0ga3RpbWVfc3ViX25zKGV0aW1lLCBkZWx0YV9ucyk7CiAKLQlpZiAoKGRybV9kZWJ1ZyAmIERS TV9VVF9WQkwpID09IDApCisJaWYgKCFkcm1fZGVidWdfZW5hYmxlZChEUk1fVVRfVkJMKSkKIAkJ cmV0dXJuIHRydWU7CiAKIAl0c19ldGltZSA9IGt0aW1lX3RvX3RpbWVzcGVjNjQoZXRpbWUpOwpA QCAtMTM1Miw3ICsxMzUyLDcgQEAgdm9pZCBkcm1fdmJsYW5rX3Jlc3RvcmUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IHBpcGUpCiAJYXNzZXJ0X3NwaW5fbG9ja2VkKCZkZXYt PnZibGFua190aW1lX2xvY2spOwogCiAJdmJsYW5rID0gJmRldi0+dmJsYW5rW3BpcGVdOwotCVdB Uk5fT05DRSgoZHJtX2RlYnVnICYgRFJNX1VUX1ZCTCkgJiYgIXZibGFuay0+ZnJhbWVkdXJfbnMs CisJV0FSTl9PTkNFKGRybV9kZWJ1Z19lbmFibGVkKERSTV9VVF9WQkwpICYmICF2YmxhbmstPmZy YW1lZHVyX25zLAogCQkgICJDYW5ub3QgY29tcHV0ZSBtaXNzZWQgdmJsYW5rcyB3aXRob3V0IGZy YW1lIGR1cmF0aW9uXG4iKTsKIAlmcmFtZWR1cl9ucyA9IHZibGFuay0+ZnJhbWVkdXJfbnM7CiAK ZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9wcmludC5oIGIvaW5jbHVkZS9kcm0vZHJtX3By aW50LmgKaW5kZXggZmM5ZjIxOGFiNzE1Li41YjgwNDk5OTJjMjQgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvZHJtL2RybV9wcmludC5oCisrKyBiL2luY2x1ZGUvZHJtL2RybV9wcmludC5oCkBAIC0yOTMs NiArMjkzLDExIEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IGRybV9wcmludGVyIGRybV9lcnJfcHJp bnRlcihjb25zdCBjaGFyICpwcmVmaXgpCiAjZGVmaW5lIERSTV9VVF9MRUFTRQkJMHg4MAogI2Rl ZmluZSBEUk1fVVRfRFAJCTB4MTAwCiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBkcm1fZGVidWdfZW5h YmxlZCh1bnNpZ25lZCBpbnQgY2F0ZWdvcnkpCit7CisJcmV0dXJuIHVubGlrZWx5KGRybV9kZWJ1 ZyAmIGNhdGVnb3J5KTsKK30KKwogX19wcmludGYoMywgNCkKIHZvaWQgZHJtX2Rldl9wcmludGso Y29uc3Qgc3RydWN0IGRldmljZSAqZGV2LCBjb25zdCBjaGFyICpsZXZlbCwKIAkJICAgIGNvbnN0 IGNoYXIgKmZvcm1hdCwgLi4uKTsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4