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=-14.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, 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 59915C48BCF for ; Wed, 9 Jun 2021 08:56:46 +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 20F47610A1 for ; Wed, 9 Jun 2021 08:56:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20F47610A1 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 C5A7A6E48F; Wed, 9 Jun 2021 08:56:45 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 327466E48F for ; Wed, 9 Jun 2021 08:56:44 +0000 (UTC) IronPort-SDR: yuoKtEPvuc1IzpFHEoXmMfkVL5KiPT62KecqGn5idwLWTOCZRYOlnsxOR99yAXkHeBF8ORLMmG Fekym+09N2uQ== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="290663385" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="290663385" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 01:56:43 -0700 IronPort-SDR: CNJzZWoMLp5MrPamuNo93FuRHvEssCz6rj5xjJGY/flrWKt3R4MRwrAycNkO6xxaWnWCrF2cm5 XcNFeVU4FRZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="402252629" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by orsmga006.jf.intel.com with SMTP; 09 Jun 2021 01:56:41 -0700 Received: by stinkbox (sSMTP sendmail emulation); Wed, 09 Jun 2021 11:56:41 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 9 Jun 2021 11:56:29 +0300 Message-Id: <20210609085632.22026-4-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 3/6] drm/i915: Clean up intel_find_initial_plane_obj() 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 cnQgb3V0IHRoZSBtZXNzIHdpdGggdGhlIGxvY2FsIHZhcmlhYmxlcyBpbgppbnRlbF9maW5kX2lu aXRpYWxfcGxhbmVfb2JqKCkuIEdldCByaWQgb2YgYWxsIGFsaWFzaW5nIHBvaW50ZXJzCmFuZCB1 c2Ugc3RhbmRhcmQgbmFtaW5nL3R5cGVzLgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOk IDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYyB8IDExMyArKysrKysrKysrLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgNjIgaW5zZXJ0aW9ucygrKSwgNTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3ODgxNWExYWMwY2Eu LjE2MTU1MDE2ODVjOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k aXNwbGF5LmMKQEAgLTE5MTQsMjAgKzE5MTQsNTAgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHB0X3Vu cGluKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCWk5MTVfdm1hX3B1dChkcHQtPnZt YSk7CiB9CiAKK3N0YXRpYyBib29sCitpbnRlbF9yZXVzZV9pbml0aWFsX3BsYW5lX29iaihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKKwkJCSAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9p bml0aWFsX3BsYW5lX2NvbmZpZyAqcGxhbmVfY29uZmlnLAorCQkJICAgICAgc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqKmZiLAorCQkJICAgICAgc3RydWN0IGk5MTVfdm1hICoqdm1hKQoreworCXN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjOworCisJZm9yX2VhY2hfaW50ZWxfY3J0YygmaTkxNS0+ZHJt LCBjcnRjKSB7CisJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KKwkJCXRv X2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+YmFzZS5zdGF0ZSk7CisJCXN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUgPQorCQkJdG9faW50ZWxfcGxhbmUoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKKwkJc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSA9CisJCQl0b19pbnRlbF9wbGFuZV9z dGF0ZShwbGFuZS0+YmFzZS5zdGF0ZSk7CisKKwkJaWYgKCFjcnRjX3N0YXRlLT51YXBpLmFjdGl2 ZSkKKwkJCWNvbnRpbnVlOworCisJCWlmICghcGxhbmVfc3RhdGUtPmdndHRfdm1hKQorCQkJY29u dGludWU7CisKKwkJaWYgKGludGVsX3BsYW5lX2dndHRfb2Zmc2V0KHBsYW5lX3N0YXRlKSA9PSBw bGFuZV9jb25maWctPmJhc2UpIHsKKwkJCSpmYiA9IHBsYW5lX3N0YXRlLT5ody5mYjsKKwkJCSp2 bWEgPSBwbGFuZV9zdGF0ZS0+Z2d0dF92bWE7CisJCQlyZXR1cm4gdHJ1ZTsKKwkJfQorCX0KKwor CXJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIHZvaWQKLWludGVsX2ZpbmRfaW5pdGlhbF9wbGFu ZV9vYmooc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCitpbnRlbF9maW5kX2luaXRpYWxf cGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICAgICBzdHJ1Y3QgaW50ZWxf aW5pdGlhbF9wbGFuZV9jb25maWcgKnBsYW5lX2NvbmZpZykKIHsKLQlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IGNydGMtPmJhc2UuZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRv X2k5MTUoZGV2KTsKLQlzdHJ1Y3QgZHJtX2NydGMgKmM7Ci0Jc3RydWN0IGRybV9wbGFuZSAqcHJp bWFyeSA9IGludGVsX2NydGMtPmJhc2UucHJpbWFyeTsKLQlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSA9IHByaW1hcnktPnN0YXRlOwotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50 ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwcmltYXJ5KTsKLQlzdHJ1Y3QgaW50ZWxfcGxhbmVf c3RhdGUgKmludGVsX3N0YXRlID0KLQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUp OwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KLQkJdG9faW50ZWxfY3J0 Y19zdGF0ZShpbnRlbF9jcnRjLT5iYXNlLnN0YXRlKTsKKwkJdG9faW50ZWxfY3J0Y19zdGF0ZShj cnRjLT5iYXNlLnN0YXRlKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lID0KKwkJdG9faW50 ZWxfcGxhbmUoY3J0Yy0+YmFzZS5wcmltYXJ5KTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlID0KKwkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPmJhc2Uuc3RhdGUp OwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwog CkBAIC0xOTM5LDcgKzE5NjksNyBAQCBpbnRlbF9maW5kX2luaXRpYWxfcGxhbmVfb2JqKHN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCWlmICghcGxhbmVfY29uZmlnLT5mYikKIAkJcmV0 dXJuOwogCi0JaWYgKGludGVsX2FsbG9jX2luaXRpYWxfcGxhbmVfb2JqKGludGVsX2NydGMsIHBs YW5lX2NvbmZpZykpIHsKKwlpZiAoaW50ZWxfYWxsb2NfaW5pdGlhbF9wbGFuZV9vYmooY3J0Yywg cGxhbmVfY29uZmlnKSkgewogCQlmYiA9ICZwbGFuZV9jb25maWctPmZiLT5iYXNlOwogCQl2bWEg PSBwbGFuZV9jb25maWctPnZtYTsKIAkJZ290byB2YWxpZF9mYjsKQEAgLTE5NDksMjUgKzE5Nzks OCBAQCBpbnRlbF9maW5kX2luaXRpYWxfcGxhbmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjLAogCSAqIEZhaWxlZCB0byBhbGxvYyB0aGUgb2JqLCBjaGVjayB0byBzZWUgaWYgd2Ug c2hvdWxkIHNoYXJlCiAJICogYW4gZmIgd2l0aCBhbm90aGVyIENSVEMgaW5zdGVhZAogCSAqLwot CWZvcl9lYWNoX2NydGMoZGV2LCBjKSB7Ci0JCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Rh dGU7Ci0KLQkJaWYgKGMgPT0gJmludGVsX2NydGMtPmJhc2UpCi0JCQljb250aW51ZTsKLQotCQlp ZiAoIXRvX2ludGVsX2NydGNfc3RhdGUoYy0+c3RhdGUpLT51YXBpLmFjdGl2ZSkKLQkJCWNvbnRp bnVlOwotCi0JCXN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoYy0+cHJpbWFyeS0+c3RhdGUp OwotCQlpZiAoIXN0YXRlLT5nZ3R0X3ZtYSkKLQkJCWNvbnRpbnVlOwotCi0JCWlmIChpbnRlbF9w bGFuZV9nZ3R0X29mZnNldChzdGF0ZSkgPT0gcGxhbmVfY29uZmlnLT5iYXNlKSB7Ci0JCQlmYiA9 IHN0YXRlLT5ody5mYjsKLQkJCXZtYSA9IHN0YXRlLT5nZ3R0X3ZtYTsKLQkJCWdvdG8gdmFsaWRf ZmI7Ci0JCX0KLQl9CisJaWYgKGludGVsX3JldXNlX2luaXRpYWxfcGxhbmVfb2JqKGRldl9wcml2 LCBwbGFuZV9jb25maWcsICZmYiwgJnZtYSkpCisJCWdvdG8gdmFsaWRfZmI7CiAKIAkvKgogCSAq IFdlJ3ZlIGZhaWxlZCB0byByZWNvbnN0cnVjdCB0aGUgQklPUyBGQi4gIEN1cnJlbnQgZGlzcGxh eSBzdGF0ZQpAQCAtMTk3Niw3ICsxOTg5LDcgQEAgaW50ZWxfZmluZF9pbml0aWFsX3BsYW5lX29i aihzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkgKiBzaW1wbGVzdCBzb2x1dGlvbiBp cyB0byBqdXN0IGRpc2FibGUgdGhlIHByaW1hcnkgcGxhbmUgbm93IGFuZAogCSAqIHByZXRlbmQg dGhlIEJJT1MgbmV2ZXIgaGFkIGl0IGVuYWJsZWQuCiAJICovCi0JaW50ZWxfcGxhbmVfZGlzYWJs ZV9ub2F0b21pYyhpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSk7CisJaW50ZWxfcGxhbmVfZGlzYWJs ZV9ub2F0b21pYyhjcnRjLCBwbGFuZSk7CiAJaWYgKGNydGNfc3RhdGUtPmJpZ2pvaW5lcikgewog CQlzdHJ1Y3QgaW50ZWxfY3J0YyAqc2xhdmUgPQogCQkJY3J0Y19zdGF0ZS0+Ymlnam9pbmVyX2xp bmtlZF9jcnRjOwpAQCAtMTk4Niw0MCArMTk5OSwzOCBAQCBpbnRlbF9maW5kX2luaXRpYWxfcGxh bmVfb2JqKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCXJldHVybjsKIAogdmFsaWRf ZmI6Ci0JcGxhbmVfc3RhdGUtPnJvdGF0aW9uID0gcGxhbmVfY29uZmlnLT5yb3RhdGlvbjsKLQlp bnRlbF9mYl9maWxsX3ZpZXcodG9faW50ZWxfZnJhbWVidWZmZXIoZmIpLCBwbGFuZV9zdGF0ZS0+ cm90YXRpb24sCi0JCQkgICAmaW50ZWxfc3RhdGUtPnZpZXcpOworCXBsYW5lX3N0YXRlLT51YXBp LnJvdGF0aW9uID0gcGxhbmVfY29uZmlnLT5yb3RhdGlvbjsKKwlpbnRlbF9mYl9maWxsX3ZpZXco dG9faW50ZWxfZnJhbWVidWZmZXIoZmIpLAorCQkJICAgcGxhbmVfc3RhdGUtPnVhcGkucm90YXRp b24sICZwbGFuZV9zdGF0ZS0+dmlldyk7CiAKIAlfX2k5MTVfdm1hX3Bpbih2bWEpOwotCWludGVs X3N0YXRlLT5nZ3R0X3ZtYSA9IGk5MTVfdm1hX2dldCh2bWEpOwotCWlmIChpbnRlbF9wbGFuZV91 c2VzX2ZlbmNlKGludGVsX3N0YXRlKSAmJiBpOTE1X3ZtYV9waW5fZmVuY2Uodm1hKSA9PSAwKQot CQlpZiAodm1hLT5mZW5jZSkKLQkJCWludGVsX3N0YXRlLT5mbGFncyB8PSBQTEFORV9IQVNfRkVO Q0U7CisJcGxhbmVfc3RhdGUtPmdndHRfdm1hID0gaTkxNV92bWFfZ2V0KHZtYSk7CisJaWYgKGlu dGVsX3BsYW5lX3VzZXNfZmVuY2UocGxhbmVfc3RhdGUpICYmCisJICAgIGk5MTVfdm1hX3Bpbl9m ZW5jZSh2bWEpID09IDAgJiYgdm1hLT5mZW5jZSkKKwkJcGxhbmVfc3RhdGUtPmZsYWdzIHw9IFBM QU5FX0hBU19GRU5DRTsKIAotCXBsYW5lX3N0YXRlLT5zcmNfeCA9IDA7Ci0JcGxhbmVfc3RhdGUt PnNyY195ID0gMDsKLQlwbGFuZV9zdGF0ZS0+c3JjX3cgPSBmYi0+d2lkdGggPDwgMTY7Ci0JcGxh bmVfc3RhdGUtPnNyY19oID0gZmItPmhlaWdodCA8PCAxNjsKKwlwbGFuZV9zdGF0ZS0+dWFwaS5z cmNfeCA9IDA7CisJcGxhbmVfc3RhdGUtPnVhcGkuc3JjX3kgPSAwOworCXBsYW5lX3N0YXRlLT51 YXBpLnNyY193ID0gZmItPndpZHRoIDw8IDE2OworCXBsYW5lX3N0YXRlLT51YXBpLnNyY19oID0g ZmItPmhlaWdodCA8PCAxNjsKIAotCXBsYW5lX3N0YXRlLT5jcnRjX3ggPSAwOwotCXBsYW5lX3N0 YXRlLT5jcnRjX3kgPSAwOwotCXBsYW5lX3N0YXRlLT5jcnRjX3cgPSBmYi0+d2lkdGg7Ci0JcGxh bmVfc3RhdGUtPmNydGNfaCA9IGZiLT5oZWlnaHQ7CisJcGxhbmVfc3RhdGUtPnVhcGkuY3J0Y194 ID0gMDsKKwlwbGFuZV9zdGF0ZS0+dWFwaS5jcnRjX3kgPSAwOworCXBsYW5lX3N0YXRlLT51YXBp LmNydGNfdyA9IGZiLT53aWR0aDsKKwlwbGFuZV9zdGF0ZS0+dWFwaS5jcnRjX2ggPSBmYi0+aGVp Z2h0OwogCiAJaWYgKHBsYW5lX2NvbmZpZy0+dGlsaW5nKQogCQlkZXZfcHJpdi0+cHJlc2VydmVf Ymlvc19zd2l6emxlID0gdHJ1ZTsKIAotCXBsYW5lX3N0YXRlLT5mYiA9IGZiOworCXBsYW5lX3N0 YXRlLT51YXBpLmZiID0gZmI7CiAJZHJtX2ZyYW1lYnVmZmVyX2dldChmYik7CiAKLQlwbGFuZV9z dGF0ZS0+Y3J0YyA9ICZpbnRlbF9jcnRjLT5iYXNlOwotCWludGVsX3BsYW5lX2NvcHlfdWFwaV90 b19od19zdGF0ZShpbnRlbF9zdGF0ZSwgaW50ZWxfc3RhdGUsCi0JCQkJCSAgaW50ZWxfY3J0Yyk7 CisJcGxhbmVfc3RhdGUtPnVhcGkuY3J0YyA9ICZjcnRjLT5iYXNlOworCWludGVsX3BsYW5lX2Nv cHlfdWFwaV90b19od19zdGF0ZShwbGFuZV9zdGF0ZSwgcGxhbmVfc3RhdGUsIGNydGMpOwogCiAJ aW50ZWxfZnJvbnRidWZmZXJfZmx1c2godG9faW50ZWxfZnJvbnRidWZmZXIoZmIpLCBPUklHSU5f RElSVFlGQik7CiAKLQlhdG9taWNfb3IodG9faW50ZWxfcGxhbmUocHJpbWFyeSktPmZyb250YnVm ZmVyX2JpdCwKLQkJICAmdG9faW50ZWxfZnJvbnRidWZmZXIoZmIpLT5iaXRzKTsKKwlhdG9taWNf b3IocGxhbmUtPmZyb250YnVmZmVyX2JpdCwgJnRvX2ludGVsX2Zyb250YnVmZmVyKGZiKS0+Yml0 cyk7CiB9CiAKIHVuc2lnbmVkIGludAotLSAKMi4zMS4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK