From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63E0AC47095 for ; Wed, 9 Jun 2021 08:56:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2891F61040 for ; Wed, 9 Jun 2021 08:56:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2891F61040 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C82166E408; Wed, 9 Jun 2021 08:56:42 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D1DB6E48F for ; Wed, 9 Jun 2021 08:56:42 +0000 (UTC) IronPort-SDR: u/DJgDVFg71zqOJ8dsrhd8BMHCOhJmFz0MREkY8DyIzQXrusTIcfameUZ4ctfYl62D9H3mro/w 4Nm+82rW+LVA== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="185407130" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="185407130" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 01:56:41 -0700 IronPort-SDR: XJm/CIQePWCpCtESRfJXiIySEraNEmI4bkTEkf2zGziWsV9GbTzPdmPyqzWQIlSVeMBtcaUw+U N/mXQCGxck9g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="476894865" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by FMSMGA003.fm.intel.com with SMTP; 09 Jun 2021 01:56:39 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 09 Jun 2021 11:56:38 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Jun 2021 11:56:28 +0300 Message-Id: <20210609085632.22026-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609085632.22026-1-ville.syrjala@linux.intel.com> References: <20210609085632.22026-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/6] drm/i915: Clean up intel_get_load_detect_pipe() a bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClNv cnQgb3V0IHRoZSBtZXNzIHdpdGggdGhlIGxvY2FsIHZhcmlhYmxlcyBpbgppbnRlbF9nZXRfbG9h ZF9kZXRlY3RfcGlwZSgpLiBHZXQgcmlkIG9mIGFsbCBhbGlhc2luZyBwb2ludGVycwphbmQgdXNl IHN0YW5kYXJkIG5hbWluZy90eXBlcy4KClNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8 dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv ZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgfCA0MSArKysrKysrKystLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNjJhZDRjZmFlMDczLi43 ODgxNWExYWMwY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlz cGxheS5jCkBAIC02NDczLDEzICs2NDczLDExIEBAIGludCBpbnRlbF9nZXRfbG9hZF9kZXRlY3Rf cGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJICAgICAgIHN0cnVjdCBp bnRlbF9sb2FkX2RldGVjdF9waXBlICpvbGQsCiAJCQkgICAgICAgc3RydWN0IGRybV9tb2Rlc2V0 X2FjcXVpcmVfY3R4ICpjdHgpCiB7Ci0Jc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGM7Ci0J c3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPQorCXN0cnVjdCBpbnRlbF9lbmNv ZGVyICplbmNvZGVyID0KIAkJaW50ZWxfYXR0YWNoZWRfZW5jb2Rlcih0b19pbnRlbF9jb25uZWN0 b3IoY29ubmVjdG9yKSk7Ci0Jc3RydWN0IGRybV9jcnRjICpwb3NzaWJsZV9jcnRjOwotCXN0cnVj dCBkcm1fZW5jb2RlciAqZW5jb2RlciA9ICZpbnRlbF9lbmNvZGVyLT5iYXNlOwotCXN0cnVjdCBk cm1fY3J0YyAqY3J0YyA9IE5VTEw7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXIt PmRldjsKKwlzdHJ1Y3QgaW50ZWxfY3J0YyAqcG9zc2libGVfY3J0YzsKKwlzdHJ1Y3QgaW50ZWxf Y3J0YyAqY3J0YyA9IE5VTEw7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGVuY29kZXItPmJh c2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2 KTsKIAlzdHJ1Y3QgZHJtX21vZGVfY29uZmlnICpjb25maWcgPSAmZGV2LT5tb2RlX2NvbmZpZzsK IAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUgPSBOVUxMLCAqcmVzdG9yZV9zdGF0ZSA9 IE5VTEw7CkBAIC02NDg5LDcgKzY0ODcsNyBAQCBpbnQgaW50ZWxfZ2V0X2xvYWRfZGV0ZWN0X3Bp cGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAogCWRybV9kYmdfa21zKCZkZXZf cHJpdi0+ZHJtLCAiW0NPTk5FQ1RPUjolZDolc10sIFtFTkNPREVSOiVkOiVzXVxuIiwKIAkJICAg IGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yLT5uYW1lLAotCQkgICAgZW5jb2Rlci0+YmFz ZS5pZCwgZW5jb2Rlci0+bmFtZSk7CisJCSAgICBlbmNvZGVyLT5iYXNlLmJhc2UuaWQsIGVuY29k ZXItPmJhc2UubmFtZSk7CiAKIAlvbGQtPnJlc3RvcmVfc3RhdGUgPSBOVUxMOwogCkBAIC02NTA3 LDkgKzY1MDUsOSBAQCBpbnQgaW50ZWxfZ2V0X2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9j b25uZWN0b3IgKmNvbm5lY3RvciwKIAogCS8qIFNlZSBpZiB3ZSBhbHJlYWR5IGhhdmUgYSBDUlRD IGZvciB0aGlzIGNvbm5lY3RvciAqLwogCWlmIChjb25uZWN0b3ItPnN0YXRlLT5jcnRjKSB7Ci0J CWNydGMgPSBjb25uZWN0b3ItPnN0YXRlLT5jcnRjOworCQljcnRjID0gdG9faW50ZWxfY3J0Yyhj b25uZWN0b3ItPnN0YXRlLT5jcnRjKTsKIAotCQlyZXQgPSBkcm1fbW9kZXNldF9sb2NrKCZjcnRj LT5tdXRleCwgY3R4KTsKKwkJcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmY3J0Yy0+YmFzZS5tdXRl eCwgY3R4KTsKIAkJaWYgKHJldCkKIAkJCWdvdG8gZmFpbDsKIApAQCAtNjUxOCwxNiArNjUxNiwx NyBAQCBpbnQgaW50ZWxfZ2V0X2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciwKIAl9CiAKIAkvKiBGaW5kIGFuIHVudXNlZCBvbmUgKGlmIHBvc3NpYmxlKSAq LwotCWZvcl9lYWNoX2NydGMoZGV2LCBwb3NzaWJsZV9jcnRjKSB7Ci0JCWlmICghKGVuY29kZXIt PnBvc3NpYmxlX2NydGNzICYgZHJtX2NydGNfbWFzayhwb3NzaWJsZV9jcnRjKSkpCisJZm9yX2Vh Y2hfaW50ZWxfY3J0YyhkZXYsIHBvc3NpYmxlX2NydGMpIHsKKwkJaWYgKCEoZW5jb2Rlci0+YmFz ZS5wb3NzaWJsZV9jcnRjcyAmCisJCSAgICAgIGRybV9jcnRjX21hc2soJnBvc3NpYmxlX2NydGMt PmJhc2UpKSkKIAkJCWNvbnRpbnVlOwogCi0JCXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJnBvc3Np YmxlX2NydGMtPm11dGV4LCBjdHgpOworCQlyZXQgPSBkcm1fbW9kZXNldF9sb2NrKCZwb3NzaWJs ZV9jcnRjLT5iYXNlLm11dGV4LCBjdHgpOwogCQlpZiAocmV0KQogCQkJZ290byBmYWlsOwogCi0J CWlmIChwb3NzaWJsZV9jcnRjLT5zdGF0ZS0+ZW5hYmxlKSB7Ci0JCQlkcm1fbW9kZXNldF91bmxv Y2soJnBvc3NpYmxlX2NydGMtPm11dGV4KTsKKwkJaWYgKHBvc3NpYmxlX2NydGMtPmJhc2Uuc3Rh dGUtPmVuYWJsZSkgeworCQkJZHJtX21vZGVzZXRfdW5sb2NrKCZwb3NzaWJsZV9jcnRjLT5iYXNl Lm11dGV4KTsKIAkJCWNvbnRpbnVlOwogCQl9CiAKQEAgLTY1NDYsOCArNjU0NSw2IEBAIGludCBp bnRlbF9nZXRfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCX0KIAogZm91bmQ6Ci0JaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0KIAlz dGF0ZSA9IGRybV9hdG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKIAlyZXN0b3JlX3N0YXRlID0gZHJt X2F0b21pY19zdGF0ZV9hbGxvYyhkZXYpOwogCWlmICghc3RhdGUgfHwgIXJlc3RvcmVfc3RhdGUp IHsKQEAgLTY1NjQsMTEgKzY1NjEsMTEgQEAgaW50IGludGVsX2dldF9sb2FkX2RldGVjdF9waXBl KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCWdvdG8gZmFpbDsKIAl9CiAKLQly ZXQgPSBkcm1fYXRvbWljX3NldF9jcnRjX2Zvcl9jb25uZWN0b3IoY29ubmVjdG9yX3N0YXRlLCBj cnRjKTsKKwlyZXQgPSBkcm1fYXRvbWljX3NldF9jcnRjX2Zvcl9jb25uZWN0b3IoY29ubmVjdG9y X3N0YXRlLCAmY3J0Yy0+YmFzZSk7CiAJaWYgKHJldCkKIAkJZ290byBmYWlsOwogCi0JY3J0Y19z dGF0ZSA9IGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgaW50ZWxfY3J0Yyk7CisJ Y3J0Y19zdGF0ZSA9IGludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CiAJ aWYgKElTX0VSUihjcnRjX3N0YXRlKSkgewogCQlyZXQgPSBQVFJfRVJSKGNydGNfc3RhdGUpOwog CQlnb3RvIGZhaWw7CkBAIC02NTgxLDE1ICs2NTc4LDE1IEBAIGludCBpbnRlbF9nZXRfbG9hZF9k ZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCWlmIChyZXQpCiAJ CWdvdG8gZmFpbDsKIAotCXJldCA9IGludGVsX21vZGVzZXRfZGlzYWJsZV9wbGFuZXMoc3RhdGUs IGNydGMpOworCXJldCA9IGludGVsX21vZGVzZXRfZGlzYWJsZV9wbGFuZXMoc3RhdGUsICZjcnRj LT5iYXNlKTsKIAlpZiAocmV0KQogCQlnb3RvIGZhaWw7CiAKIAlyZXQgPSBQVFJfRVJSX09SX1pF Uk8oZHJtX2F0b21pY19nZXRfY29ubmVjdG9yX3N0YXRlKHJlc3RvcmVfc3RhdGUsIGNvbm5lY3Rv cikpOwogCWlmICghcmV0KQotCQlyZXQgPSBQVFJfRVJSX09SX1pFUk8oZHJtX2F0b21pY19nZXRf Y3J0Y19zdGF0ZShyZXN0b3JlX3N0YXRlLCBjcnRjKSk7CisJCXJldCA9IFBUUl9FUlJfT1JfWkVS Tyhkcm1fYXRvbWljX2dldF9jcnRjX3N0YXRlKHJlc3RvcmVfc3RhdGUsICZjcnRjLT5iYXNlKSk7 CiAJaWYgKCFyZXQpCi0JCXJldCA9IGRybV9hdG9taWNfYWRkX2FmZmVjdGVkX3BsYW5lcyhyZXN0 b3JlX3N0YXRlLCBjcnRjKTsKKwkJcmV0ID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVz KHJlc3RvcmVfc3RhdGUsICZjcnRjLT5iYXNlKTsKIAlpZiAocmV0KSB7CiAJCWRybV9kYmdfa21z KCZkZXZfcHJpdi0+ZHJtLAogCQkJICAgICJGYWlsZWQgdG8gY3JlYXRlIGEgY29weSBvZiBvbGQg c3RhdGUgdG8gcmVzdG9yZTogJWlcbiIsCkBAIC02NjA4LDcgKzY2MDUsNyBAQCBpbnQgaW50ZWxf Z2V0X2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAlk cm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7CiAKIAkvKiBsZXQgdGhlIGNvbm5lY3RvciBnZXQg dGhyb3VnaCBvbmUgZnVsbCBjeWNsZSBiZWZvcmUgdGVzdGluZyAqLwotCWludGVsX3dhaXRfZm9y X3ZibGFuayhkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+cGlwZSk7CisJaW50ZWxfd2FpdF9mb3JfdmJs YW5rKGRldl9wcml2LCBjcnRjLT5waXBlKTsKIAlyZXR1cm4gdHJ1ZTsKIAogZmFpbDoKLS0gCjIu MzEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==