From: Matt Roper Subject: [PATCH v3 01/16] drm/i915: Reorganize WM structs/unions in CRTC state Date: Thu, 21 Apr 2016 16:16:55 -0700 Message-ID: <1461280630-7477-2-git-send-email-matthew.d.roper@intel.com> References: <1461280630-7477-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id ACDF76EDBF for ; Thu, 21 Apr 2016 23:17:25 +0000 (UTC) In-Reply-To: <1461280630-7477-1-git-send-email-matthew.d.roper@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 UmVvcmdhbml6ZSB0aGUgbmVzdGVkIHN0cnVjdHVyZXMgYW5kIHVuaW9ucyB3ZSBoYXZlIGZvciBw aXBlIHdhdGVybWFyawpkYXRhIGluIGludGVsX2NydGNfc3RhdGUgc28gdGhhdCBwbGF0Zm9ybS1z cGVjaWZpYyBkYXRhIGNhbiBiZSBhZGRlZCBpbgphIG1vcmUgc2Vuc2libGUgbWFubmVyIChhbmQg c2F2ZSBhIGJpdCBvZiBtZW1vcnkgYXQgdGhlIHNhbWUgdGltZSkuCgpUaGUgY2hhbmdlIGJhc2lj YWxseSBjaGFuZ2VzIHRoZSBvcmdhbml6YXRpb24gZnJvbToKCiAgICAgICAgdW5pb24gewogICAg ICAgICAgICAgICAgc3RydWN0IGludGVsX3BpcGVfd20gaWxrOwogICAgICAgICAgICAgICAgc3Ry dWN0IGludGVsX3BpcGVfd20gc2tsOwogICAgICAgIH0gb3B0aW1hbDsKCiAgICAgICAgc3RydWN0 IGludGVsX3BpcGVfd20gaW50ZXJtZWRpYXRlIC8qIElMSy1vbmx5ICovCgp0bwoKICAgICAgICB1 bmlvbiB7CiAgICAgICAgICAgICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgICAgICAgICAgICBz dHJ1Y3QgaW50ZWxfcGlwZV93bSBpbnRlcm1lZGlhdGU7CiAgICAgICAgICAgICAgICAgICAgICAg IHN0cnVjdCBpbnRlbF9waXBlX3dtIG9wdGltYWw7CiAgICAgICAgICAgICAgICB9IGlsazsKCiAg ICAgICAgICAgICAgICBzdHJ1Y3QgewogICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgaW50 ZWxfcGlwZV93bSBvcHRpbWFsOwogICAgICAgICAgICAgICAgfSBza2w7CiAgICAgICAgfQoKVGhl cmUgc2hvdWxkIGJlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlIGhlcmUsIGJ1dCBpdCB3aWxsIGFsbG93 IHVzIHRvIGFkZAptb3JlIHBsYXRmb3JtLXNwZWNpZmljIGZpZWxkcyBnb2luZyBmb3J3YXJkIChh bmQgbW9yZSBlYXNpbHkgZXh0ZW5kIHRvCm90aGVyIHBsYXRmb3JtIHR5cGVzIGxpa2UgVkxWKS4K CldoaWxlIHdlJ3JlIGF0IGl0LCBsZXQncyBtb3ZlIHRoZSBlbnRpcmUgd2F0ZXJtYXJrIHN1YnN0 cnVjdHVyZSBvdXQgdG8KaXRzIG93biBzdHJ1Y3R1cmUgZGVmaW5pdGlvbiB0byBtYWtlIHRoZSBj b2RlIHNsaWdodGx5IG1vcmUgcmVhZGFibGUuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxt YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogTWFhcnRlbiBMYW5raG9yc3Qg PG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCB8IDYxICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgMTggKysrKysrLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDM1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggYmVlZDllOC4uYTk0ZDY1MWEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCkBAIC00MDQsNiArNDA0LDQwIEBAIHN0cnVjdCBza2xfcGlwZV93bSB7 CiAJdWludDMyX3QgbGluZXRpbWU7CiB9OwogCitzdHJ1Y3QgaW50ZWxfY3J0Y193bV9zdGF0ZSB7 CisJdW5pb24geworCQlzdHJ1Y3QgeworCQkJLyoKKwkJCSAqIEludGVybWVkaWF0ZSB3YXRlcm1h cmtzOyB0aGVzZSBjYW4gYmUKKwkJCSAqIHByb2dyYW1tZWQgaW1tZWRpYXRlbHkgc2luY2UgdGhl eSBzYXRpc2Z5CisJCQkgKiBib3RoIHRoZSBjdXJyZW50IGNvbmZpZ3VyYXRpb24gd2UncmUKKwkJ CSAqIHN3aXRjaGluZyBhd2F5IGZyb20gYW5kIHRoZSBuZXcKKwkJCSAqIGNvbmZpZ3VyYXRpb24g d2UncmUgc3dpdGNoaW5nIHRvLgorCQkJICovCisJCQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBpbnRl cm1lZGlhdGU7CisKKwkJCS8qCisJCQkgKiBPcHRpbWFsIHdhdGVybWFya3MsIHByb2dyYW1tZWQg cG9zdC12YmxhbmsKKwkJCSAqIHdoZW4gdGhpcyBzdGF0ZSBpcyBjb21taXR0ZWQuCisJCQkgKi8K KwkJCXN0cnVjdCBpbnRlbF9waXBlX3dtIG9wdGltYWw7CisJCX0gaWxrOworCisJCXN0cnVjdCB7 CisJCQkvKiBnZW45KyBvbmx5IG5lZWRzIDEtc3RlcCB3bSBwcm9ncmFtbWluZyAqLworCQkJc3Ry dWN0IHNrbF9waXBlX3dtIG9wdGltYWw7CisJCX0gc2tsOworCX07CisKKwkvKgorCSAqIFBsYXRm b3JtcyB3aXRoIHR3by1zdGVwIHdhdGVybWFyayBwcm9ncmFtbWluZyB3aWxsIG5lZWQgdG8KKwkg KiB1cGRhdGUgd2F0ZXJtYXJrIHByb2dyYW1taW5nIHBvc3QtdmJsYW5rIHRvIHN3aXRjaCBmcm9t IHRoZQorCSAqIHNhZmUgaW50ZXJtZWRpYXRlIHdhdGVybWFya3MgdG8gdGhlIG9wdGltYWwgZmlu YWwKKwkgKiB3YXRlcm1hcmtzLgorCSAqLworCWJvb2wgbmVlZF9wb3N0dmJsX3VwZGF0ZTsKK307 CisKIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgYmFz ZTsKIApAQCAtNTU3LDMyICs1OTEsNyBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJLyog SVZCIHNwcml0ZSBzY2FsaW5nIHcvYSAoV2FDeFNSRGlzYWJsZWRGb3JTcHJpdGVTY2FsaW5nOml2 YikgKi8KIAlib29sIGRpc2FibGVfbHBfd207CiAKLQlzdHJ1Y3QgewotCQkvKgotCQkgKiBPcHRp bWFsIHdhdGVybWFya3MsIHByb2dyYW1tZWQgcG9zdC12Ymxhbmsgd2hlbiB0aGlzIHN0YXRlCi0J CSAqIGlzIGNvbW1pdHRlZC4KLQkJICovCi0JCXVuaW9uIHsKLQkJCXN0cnVjdCBpbnRlbF9waXBl X3dtIGlsazsKLQkJCXN0cnVjdCBza2xfcGlwZV93bSBza2w7Ci0JCX0gb3B0aW1hbDsKLQotCQkv KgotCQkgKiBJbnRlcm1lZGlhdGUgd2F0ZXJtYXJrczsgdGhlc2UgY2FuIGJlIHByb2dyYW1tZWQg aW1tZWRpYXRlbHkKLQkJICogc2luY2UgdGhleSBzYXRpc2Z5IGJvdGggdGhlIGN1cnJlbnQgY29u ZmlndXJhdGlvbiB3ZSdyZQotCQkgKiBzd2l0Y2hpbmcgYXdheSBmcm9tIGFuZCB0aGUgbmV3IGNv bmZpZ3VyYXRpb24gd2UncmUgc3dpdGNoaW5nCi0JCSAqIHRvLgotCQkgKi8KLQkJc3RydWN0IGlu dGVsX3BpcGVfd20gaW50ZXJtZWRpYXRlOwotCi0JCS8qCi0JCSAqIFBsYXRmb3JtcyB3aXRoIHR3 by1zdGVwIHdhdGVybWFyayBwcm9ncmFtbWluZyB3aWxsIG5lZWQgdG8KLQkJICogdXBkYXRlIHdh dGVybWFyayBwcm9ncmFtbWluZyBwb3N0LXZibGFuayB0byBzd2l0Y2ggZnJvbSB0aGUKLQkJICog c2FmZSBpbnRlcm1lZGlhdGUgd2F0ZXJtYXJrcyB0byB0aGUgb3B0aW1hbCBmaW5hbAotCQkgKiB3 YXRlcm1hcmtzLgotCQkgKi8KLQkJYm9vbCBuZWVkX3Bvc3R2YmxfdXBkYXRlOwotCX0gd207CisJ c3RydWN0IGludGVsX2NydGNfd21fc3RhdGUgd207CiAKIAkvKiBHYW1tYSBtb2RlIHByb2dyYW1t ZWQgb24gdGhlIHBpcGUgKi8KIAl1aW50MzJfdCBnYW1tYV9tb2RlOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKaW5kZXggYjdjMjE4Ni4uMjRiNGI4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBA IC0yMzA5LDcgKzIzMDksNyBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX3BpcGVfd20oc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193 bV9tYXhfbGV2ZWwoZGV2KSwgdXNhYmxlX2xldmVsOwogCXN0cnVjdCBpbGtfd21fbWF4aW11bXMg bWF4OwogCi0JcGlwZV93bSA9ICZjc3RhdGUtPndtLm9wdGltYWwuaWxrOworCXBpcGVfd20gPSAm Y3N0YXRlLT53bS5pbGsub3B0aW1hbDsKIAogCWZvcl9lYWNoX2ludGVsX3BsYW5lX29uX2NydGMo ZGV2LCBpbnRlbF9jcnRjLCBpbnRlbF9wbGFuZSkgewogCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3Rh dGUgKnBzOwpAQCAtMjM5MSw3ICsyMzkxLDcgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9pbnRl cm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkgICAgICAgc3RydWN0IGlu dGVsX2NydGMgKmludGVsX2NydGMsCiAJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpuZXdzdGF0ZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYSA9ICZuZXdzdGF0ZS0+d20u aW50ZXJtZWRpYXRlOworCXN0cnVjdCBpbnRlbF9waXBlX3dtICphID0gJm5ld3N0YXRlLT53bS5p bGsuaW50ZXJtZWRpYXRlOwogCXN0cnVjdCBpbnRlbF9waXBlX3dtICpiID0gJmludGVsX2NydGMt PndtLmFjdGl2ZS5pbGs7CiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVs KGRldik7CiAKQEAgLTI0MDAsNyArMjQwMCw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfaW50 ZXJtZWRpYXRlX3dtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJICogY3VycmVudGx5IGFjdGl2 ZSB3YXRlcm1hcmtzIHRvIGdldCB2YWx1ZXMgdGhhdCBhcmUgc2FmZSBib3RoIGJlZm9yZQogCSAq IGFuZCBhZnRlciB0aGUgdmJsYW5rLgogCSAqLwotCSphID0gbmV3c3RhdGUtPndtLm9wdGltYWwu aWxrOworCSphID0gbmV3c3RhdGUtPndtLmlsay5vcHRpbWFsOwogCWEtPnBpcGVfZW5hYmxlZCB8 PSBiLT5waXBlX2VuYWJsZWQ7CiAJYS0+c3ByaXRlc19lbmFibGVkIHw9IGItPnNwcml0ZXNfZW5h YmxlZDsKIAlhLT5zcHJpdGVzX3NjYWxlZCB8PSBiLT5zcHJpdGVzX3NjYWxlZDsKQEAgLTI0Mjks NyArMjQyOSw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dtKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiAJICogSWYgb3VyIGludGVybWVkaWF0ZSBXTSBhcmUgaWRlbnRp Y2FsIHRvIHRoZSBmaW5hbCBXTSwgdGhlbiB3ZSBjYW4KIAkgKiBvbWl0IHRoZSBwb3N0LXZibGFu ayBwcm9ncmFtbWluZzsgb25seSB1cGRhdGUgaWYgaXQncyBkaWZmZXJlbnQuCiAJICovCi0JaWYg KG1lbWNtcChhLCAmbmV3c3RhdGUtPndtLm9wdGltYWwuaWxrLCBzaXplb2YoKmEpKSA9PSAwKQor CWlmIChtZW1jbXAoYSwgJm5ld3N0YXRlLT53bS5pbGsub3B0aW1hbCwgc2l6ZW9mKCphKSkgPT0g MCkKIAkJbmV3c3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUgPSBmYWxzZTsKIAogCXJldHVy biAwOwpAQCAtMzY3OCw3ICszNjc4LDcgQEAgc3RhdGljIHZvaWQgc2tsX3VwZGF0ZV93bShzdHJ1 Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g ZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3Qgc2tsX3dtX3ZhbHVlcyAqcmVzdWx0cyA9ICZkZXZf cHJpdi0+d20uc2tsX3Jlc3VsdHM7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSA9 IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwotCXN0cnVjdCBza2xfcGlwZV93bSAq cGlwZV93bSA9ICZjc3RhdGUtPndtLm9wdGltYWwuc2tsOworCXN0cnVjdCBza2xfcGlwZV93bSAq cGlwZV93bSA9ICZjc3RhdGUtPndtLnNrbC5vcHRpbWFsOwogCiAKIAkvKiBDbGVhciBhbGwgZGly dHkgZmxhZ3MgKi8KQEAgLTM3NTcsNyArMzc1Nyw3IEBAIHN0YXRpYyB2b2lkIGlsa19pbml0aWFs X3dhdGVybWFya3Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAlzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwog CiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPndtLndtX211dGV4KTsKLQlpbnRlbF9jcnRjLT53bS5h Y3RpdmUuaWxrID0gY3N0YXRlLT53bS5pbnRlcm1lZGlhdGU7CisJaW50ZWxfY3J0Yy0+d20uYWN0 aXZlLmlsayA9IGNzdGF0ZS0+d20uaWxrLmludGVybWVkaWF0ZTsKIAlpbGtfcHJvZ3JhbV93YXRl cm1hcmtzKGRldl9wcml2KTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT53bS53bV9tdXRleCk7 CiB9CkBAIC0zNzY5LDcgKzM3NjksNyBAQCBzdGF0aWMgdm9pZCBpbGtfb3B0aW1pemVfd2F0ZXJt YXJrcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCiAJbXV0ZXhfbG9jaygmZGV2 X3ByaXYtPndtLndtX211dGV4KTsKIAlpZiAoY3N0YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRl KSB7Ci0JCWludGVsX2NydGMtPndtLmFjdGl2ZS5pbGsgPSBjc3RhdGUtPndtLm9wdGltYWwuaWxr OworCQlpbnRlbF9jcnRjLT53bS5hY3RpdmUuaWxrID0gY3N0YXRlLT53bS5pbGsub3B0aW1hbDsK IAkJaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZfcHJpdik7CiAJfQogCW11dGV4X3VubG9jaygm ZGV2X3ByaXYtPndtLndtX211dGV4KTsKQEAgLTM4MjYsNyArMzgyNiw3IEBAIHN0YXRpYyB2b2lk IHNrbF9waXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0 IHNrbF93bV92YWx1ZXMgKmh3ID0gJmRldl9wcml2LT53bS5za2xfaHc7CiAJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQlz dHJ1Y3Qgc2tsX3BpcGVfd20gKmFjdGl2ZSA9ICZjc3RhdGUtPndtLm9wdGltYWwuc2tsOworCXN0 cnVjdCBza2xfcGlwZV93bSAqYWN0aXZlID0gJmNzdGF0ZS0+d20uc2tsLm9wdGltYWw7CiAJZW51 bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCWludCBsZXZlbCwgaSwgbWF4X2xldmVs OwogCXVpbnQzMl90IHRlbXA7CkBAIC0zODkyLDcgKzM4OTIsNyBAQCBzdGF0aWMgdm9pZCBpbGtf cGlwZV93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBpbGtf d21fdmFsdWVzICpodyA9ICZkZXZfcHJpdi0+d20uaHc7CiAJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpjc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQlzdHJ1Y3QgaW50 ZWxfcGlwZV93bSAqYWN0aXZlID0gJmNzdGF0ZS0+d20ub3B0aW1hbC5pbGs7CisJc3RydWN0IGlu dGVsX3BpcGVfd20gKmFjdGl2ZSA9ICZjc3RhdGUtPndtLmlsay5vcHRpbWFsOwogCWVudW0gcGlw ZSBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlzdGF0aWMgY29uc3QgaTkxNV9yZWdfdCB3bTBf cGlwZV9yZWdbXSA9IHsKIAkJW1BJUEVfQV0gPSBXTTBfUElQRUFfSUxLLAotLSAKMi4xLjQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=