From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH 2/7] drm/i915: Replace the aux ddc name switch statement with kasprintf() Date: Wed, 11 Nov 2015 20:34:11 +0200 Message-ID: <1447266856-30249-3-git-send-email-ville.syrjala@linux.intel.com> References: <1447266856-30249-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id B6CB56EABE for ; Wed, 11 Nov 2015 10:35:06 -0800 (PST) In-Reply-To: <1447266856-30249-1-git-send-email-ville.syrjala@linux.intel.com> 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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSBrYXNwcmludGYoKSB0byBnZW5lcmF0ZSB0aGUgIkRQRERDLTxwb3J0PiIgbmFtZSBmb3IgdGhl IGF1eCBoZWxwZXIuCgpUbyBkZWFsIHdpdGggZXJyb3JzIHByb3Blcmx5IG1ha2UgaW50ZWxfZHBf YXV4X2luaXQoKSByZXR1cm4gc29tZXRoaW5nLAphbmQgYWRqdXN0IHRoZSBjYWxsZXIgdG8gbWF0 Y2guIEl0IHNlZW1zIHdlIHdlcmUgYWxzbyBtaXNzaW5nIGEKaW50ZWxfZHBfbXN0X2VuY29kZXJf Y2xlYW51cCgpIGNhbGwgb24gZWRwIChub24tcG9ydCBBKSBpbml0IGZhaWx1cmVzLApzbyBhZGQg dGhhdCB0b28uCgpUaGUgd2hvbGUgZXJyb3IvY2xlYW51cCBvcmRlcmluZyBkb2Vzbid0IGZlZWwg ZW50aXJlbHkgc2FuZSB0byBtZSwgYnV0CkknbGwgbGVhdmUgdGhhdCBwYXJ0IGFsb25lIGZvciBu b3cuCgp2MjogVXNlIGthc3ByaW50ZigpIGluc3RlYWQgb2YgYSB0YWJsZSwgcmVvcmRlciBwYXRj aGVzIChDaGlzKQoKQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgfCA3NSArKysrKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ2IGluc2Vy dGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDg5 MWE3ZjguLmRmMmEyZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rw LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTAwOSw2ICsxMDA5 LDEzIEBAIGludGVsX2RwX2F1eF90cmFuc2ZlcihzdHJ1Y3QgZHJtX2RwX2F1eCAqYXV4LCBzdHJ1 Y3QgZHJtX2RwX2F1eF9tc2cgKm1zZykKIH0KIAogc3RhdGljIHZvaWQKK2ludGVsX2RwX2F1eF9m aW5pKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCit7CisJZHJtX2RwX2F1eF91bnJlZ2lzdGVy KCZpbnRlbF9kcC0+YXV4KTsKKwlrZnJlZShpbnRlbF9kcC0+YXV4Lm5hbWUpOworfQorCitzdGF0 aWMgaW50CiBpbnRlbF9kcF9hdXhfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBzdHJ1 Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRl diA9IGludGVsX2RwX3RvX2RldihpbnRlbF9kcCk7CkBAIC0xMDE2LDcgKzEwMjMsNiBAQCBpbnRl bF9kcF9hdXhfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwLCBzdHJ1Y3QgaW50ZWxfY29u bmVjdG9yICpjb25uZWN0b3IpCiAJc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGln X3BvcnQgPSBkcF90b19kaWdfcG9ydChpbnRlbF9kcCk7CiAJZW51bSBwb3J0IHBvcnQgPSBpbnRl bF9kaWdfcG9ydC0+cG9ydDsKIAlzdHJ1Y3QgZGRpX3ZidF9wb3J0X2luZm8gKmluZm8gPSAmZGV2 X3ByaXYtPnZidC5kZGlfcG9ydF9pbmZvW3BvcnRdOwotCWNvbnN0IGNoYXIgKm5hbWUgPSBOVUxM OwogCXVpbnQzMl90IHBvcnRlX2F1eF9jdGxfcmVnID0gRFBBX0FVWF9DSF9DVEw7CiAJaW50IHJl dDsKIApAQCAtMTA0MywyMyArMTA0OSwxOCBAQCBpbnRlbF9kcF9hdXhfaW5pdChzdHJ1Y3QgaW50 ZWxfZHAgKmludGVsX2RwLCBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJc3dp dGNoIChwb3J0KSB7CiAJY2FzZSBQT1JUX0E6CiAJCWludGVsX2RwLT5hdXhfY2hfY3RsX3JlZyA9 IERQQV9BVVhfQ0hfQ1RMOwotCQluYW1lID0gIkRQRERDLUEiOwogCQlicmVhazsKIAljYXNlIFBP UlRfQjoKIAkJaW50ZWxfZHAtPmF1eF9jaF9jdGxfcmVnID0gUENIX0RQQl9BVVhfQ0hfQ1RMOwot CQluYW1lID0gIkRQRERDLUIiOwogCQlicmVhazsKIAljYXNlIFBPUlRfQzoKIAkJaW50ZWxfZHAt PmF1eF9jaF9jdGxfcmVnID0gUENIX0RQQ19BVVhfQ0hfQ1RMOwotCQluYW1lID0gIkRQRERDLUMi OwogCQlicmVhazsKIAljYXNlIFBPUlRfRDoKIAkJaW50ZWxfZHAtPmF1eF9jaF9jdGxfcmVnID0g UENIX0RQRF9BVVhfQ0hfQ1RMOwotCQluYW1lID0gIkRQRERDLUQiOwogCQlicmVhazsKIAljYXNl IFBPUlRfRToKIAkJaW50ZWxfZHAtPmF1eF9jaF9jdGxfcmVnID0gcG9ydGVfYXV4X2N0bF9yZWc7 Ci0JCW5hbWUgPSAiRFBEREMtRSI7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CiAJCUJVRygpOwpAQCAt MTA3NywyNyArMTA3OCwzNiBAQCBpbnRlbF9kcF9hdXhfaW5pdChzdHJ1Y3QgaW50ZWxfZHAgKmlu dGVsX2RwLCBzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpjb25uZWN0b3IpCiAJaWYgKCFJU19IQVNX RUxMKGRldikgJiYgIUlTX0JST0FEV0VMTChkZXYpICYmIHBvcnQgIT0gUE9SVF9FKQogCQlpbnRl bF9kcC0+YXV4X2NoX2N0bF9yZWcgPSBpbnRlbF9kcC0+b3V0cHV0X3JlZyArIDB4MTA7CiAKLQlp bnRlbF9kcC0+YXV4Lm5hbWUgPSBuYW1lOworCWludGVsX2RwLT5hdXgubmFtZSA9IGthc3ByaW50 ZihHRlBfS0VSTkVMLCAiRFBEREMtJWMiLCBwb3J0X25hbWUocG9ydCkpOworCWlmICghaW50ZWxf ZHAtPmF1eC5uYW1lKQorCQlyZXR1cm4gLUVOT01FTTsKKwogCWludGVsX2RwLT5hdXguZGV2ID0g ZGV2LT5kZXY7CiAJaW50ZWxfZHAtPmF1eC50cmFuc2ZlciA9IGludGVsX2RwX2F1eF90cmFuc2Zl cjsKIAotCURSTV9ERUJVR19LTVMoInJlZ2lzdGVyaW5nICVzIGJ1cyBmb3IgJXNcbiIsIG5hbWUs CisJRFJNX0RFQlVHX0tNUygicmVnaXN0ZXJpbmcgJXMgYnVzIGZvciAlc1xuIiwKKwkJICAgICAg aW50ZWxfZHAtPmF1eC5uYW1lLAogCQkgICAgICBjb25uZWN0b3ItPmJhc2Uua2Rldi0+a29iai5u YW1lKTsKIAogCXJldCA9IGRybV9kcF9hdXhfcmVnaXN0ZXIoJmludGVsX2RwLT5hdXgpOwogCWlm IChyZXQgPCAwKSB7CiAJCURSTV9FUlJPUigiZHJtX2RwX2F1eF9yZWdpc3RlcigpIGZvciAlcyBm YWlsZWQgKCVkKVxuIiwKLQkJCSAgbmFtZSwgcmV0KTsKLQkJcmV0dXJuOworCQkJICBpbnRlbF9k cC0+YXV4Lm5hbWUsIHJldCk7CisJCWtmcmVlKGludGVsX2RwLT5hdXgubmFtZSk7CisJCXJldHVy biByZXQ7CiAJfQogCiAJcmV0ID0gc3lzZnNfY3JlYXRlX2xpbmsoJmNvbm5lY3Rvci0+YmFzZS5r ZGV2LT5rb2JqLAogCQkJCSZpbnRlbF9kcC0+YXV4LmRkYy5kZXYua29iaiwKIAkJCQlpbnRlbF9k cC0+YXV4LmRkYy5kZXYua29iai5uYW1lKTsKIAlpZiAocmV0IDwgMCkgewotCQlEUk1fRVJST1Io InN5c2ZzX2NyZWF0ZV9saW5rKCkgZm9yICVzIGZhaWxlZCAoJWQpXG4iLCBuYW1lLCByZXQpOwot CQlkcm1fZHBfYXV4X3VucmVnaXN0ZXIoJmludGVsX2RwLT5hdXgpOworCQlEUk1fRVJST1IoInN5 c2ZzX2NyZWF0ZV9saW5rKCkgZm9yICVzIGZhaWxlZCAoJWQpXG4iLAorCQkJICBpbnRlbF9kcC0+ YXV4Lm5hbWUsIHJldCk7CisJCWludGVsX2RwX2F1eF9maW5pKGludGVsX2RwKTsKKwkJcmV0dXJu IHJldDsKIAl9CisKKwlyZXR1cm4gMDsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTQ3NzEsNyArNDc4 MSw3IEBAIHZvaWQgaW50ZWxfZHBfZW5jb2Rlcl9kZXN0cm95KHN0cnVjdCBkcm1fZW5jb2RlciAq ZW5jb2RlcikKIAlzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCA9IGVu Y190b19kaWdfcG9ydChlbmNvZGVyKTsKIAlzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwID0gJmlu dGVsX2RpZ19wb3J0LT5kcDsKIAotCWRybV9kcF9hdXhfdW5yZWdpc3RlcigmaW50ZWxfZHAtPmF1 eCk7CisJaW50ZWxfZHBfYXV4X2ZpbmkoaW50ZWxfZHApOwogCWludGVsX2RwX21zdF9lbmNvZGVy X2NsZWFudXAoaW50ZWxfZGlnX3BvcnQpOwogCWlmIChpc19lZHAoaW50ZWxfZHApKSB7CiAJCWNh bmNlbF9kZWxheWVkX3dvcmtfc3luYygmaW50ZWxfZHAtPnBhbmVsX3ZkZF93b3JrKTsKQEAgLTU3 NTIsNyArNTc2Miw3IEBAIGludGVsX2RwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdp dGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBpbnRl bF9lbmNvZGVyLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBkZXYtPmRldl9wcml2YXRlOwogCWVudW0gcG9ydCBwb3J0ID0gaW50ZWxfZGlnX3BvcnQtPnBv cnQ7Ci0JaW50IHR5cGU7CisJaW50IHR5cGUsIHJldDsKIAogCWludGVsX2RwLT5wcHNfcGlwZSA9 IElOVkFMSURfUElQRTsKIApAQCAtNTg1Myw3ICs1ODYzLDkgQEAgaW50ZWxfZHBfaW5pdF9jb25u ZWN0b3Ioc3RydWN0IGludGVsX2RpZ2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAJCXBwc191 bmxvY2soaW50ZWxfZHApOwogCX0KIAotCWludGVsX2RwX2F1eF9pbml0KGludGVsX2RwLCBpbnRl bF9jb25uZWN0b3IpOworCXJldCA9IGludGVsX2RwX2F1eF9pbml0KGludGVsX2RwLCBpbnRlbF9j b25uZWN0b3IpOworCWlmIChyZXQpCisJCWdvdG8gZmFpbDsKIAogCS8qIGluaXQgTVNUIG9uIHBv cnRzIHRoYXQgY2FuIHN1cHBvcnQgaXQgKi8KIAlpZiAoSEFTX0RQX01TVChkZXYpICYmCkBAIC01 ODYyLDIwICs1ODc0LDkgQEAgaW50ZWxfZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2Rp Z2l0YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsCiAJCQkJCSAgaW50ZWxfY29ubmVjdG9yLT5iYXNl LmJhc2UuaWQpOwogCiAJaWYgKCFpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3IoaW50ZWxfZHAsIGlu dGVsX2Nvbm5lY3RvcikpIHsKLQkJZHJtX2RwX2F1eF91bnJlZ2lzdGVyKCZpbnRlbF9kcC0+YXV4 KTsKLQkJaWYgKGlzX2VkcChpbnRlbF9kcCkpIHsKLQkJCWNhbmNlbF9kZWxheWVkX3dvcmtfc3lu YygmaW50ZWxfZHAtPnBhbmVsX3ZkZF93b3JrKTsKLQkJCS8qCi0JCQkgKiB2ZGQgbWlnaHQgc3Rp bGwgYmUgZW5hYmxlZCBkbyB0byB0aGUgZGVsYXllZCB2ZGQgb2ZmLgotCQkJICogTWFrZSBzdXJl IHZkZCBpcyBhY3R1YWxseSB0dXJuZWQgb2ZmIGhlcmUuCi0JCQkgKi8KLQkJCXBwc19sb2NrKGlu dGVsX2RwKTsKLQkJCWVkcF9wYW5lbF92ZGRfb2ZmX3N5bmMoaW50ZWxfZHApOwotCQkJcHBzX3Vu bG9jayhpbnRlbF9kcCk7Ci0JCX0KLQkJZHJtX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyKGNvbm5lY3Rv cik7Ci0JCWRybV9jb25uZWN0b3JfY2xlYW51cChjb25uZWN0b3IpOwotCQlyZXR1cm4gZmFsc2U7 CisJCWludGVsX2RwX2F1eF9maW5pKGludGVsX2RwKTsKKwkJaW50ZWxfZHBfbXN0X2VuY29kZXJf Y2xlYW51cChpbnRlbF9kaWdfcG9ydCk7CisJCWdvdG8gZmFpbDsKIAl9CiAKIAlpbnRlbF9kcF9h ZGRfcHJvcGVydGllcyhpbnRlbF9kcCwgY29ubmVjdG9yKTsKQEAgLTU4OTIsNiArNTg5MywyMiBA QCBpbnRlbF9kcF9pbml0X2Nvbm5lY3RvcihzdHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRl bF9kaWdfcG9ydCwKIAlpOTE1X2RlYnVnZnNfY29ubmVjdG9yX2FkZChjb25uZWN0b3IpOwogCiAJ cmV0dXJuIHRydWU7CisKK2ZhaWw6CisJaWYgKGlzX2VkcChpbnRlbF9kcCkpIHsKKwkJY2FuY2Vs X2RlbGF5ZWRfd29ya19zeW5jKCZpbnRlbF9kcC0+cGFuZWxfdmRkX3dvcmspOworCQkvKgorCQkg KiB2ZGQgbWlnaHQgc3RpbGwgYmUgZW5hYmxlZCBkbyB0byB0aGUgZGVsYXllZCB2ZGQgb2ZmLgor CQkgKiBNYWtlIHN1cmUgdmRkIGlzIGFjdHVhbGx5IHR1cm5lZCBvZmYgaGVyZS4KKwkJICovCisJ CXBwc19sb2NrKGludGVsX2RwKTsKKwkJZWRwX3BhbmVsX3ZkZF9vZmZfc3luYyhpbnRlbF9kcCk7 CisJCXBwc191bmxvY2soaW50ZWxfZHApOworCX0KKwlkcm1fY29ubmVjdG9yX3VucmVnaXN0ZXIo Y29ubmVjdG9yKTsKKwlkcm1fY29ubmVjdG9yX2NsZWFudXAoY29ubmVjdG9yKTsKKworCXJldHVy biBmYWxzZTsKIH0KIAogdm9pZAotLSAKMi40LjEwCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=