From: Matt Roper Subject: [PATCH 01/16] drm/i915: Reorganize WM structs/unions in CRTC state Date: Thu, 31 Mar 2016 18:46:23 -0700 Message-ID: <1459475198-30094-2-git-send-email-matthew.d.roper@intel.com> References: <1459475198-30094-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 87ABC6E1CB for ; Fri, 1 Apr 2016 01:47:10 +0000 (UTC) In-Reply-To: <1459475198-30094-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 YXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oIHwgNjEgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgfCAxOCArKysrKystLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMzUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAppbmRleCA2YWM0NmQ5Li4zYjljMDg0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaApAQCAtNDA0LDYgKzQwNCw0MCBAQCBzdHJ1Y3Qgc2tsX3BpcGVfd20gewogCXVpbnQzMl90 IGxpbmV0aW1lOwogfTsKIAorc3RydWN0IGludGVsX2NydGNfd21fc3RhdGUgeworCXVuaW9uIHsK KwkJc3RydWN0IHsKKwkJCS8qCisJCQkgKiBJbnRlcm1lZGlhdGUgd2F0ZXJtYXJrczsgdGhlc2Ug Y2FuIGJlCisJCQkgKiBwcm9ncmFtbWVkIGltbWVkaWF0ZWx5IHNpbmNlIHRoZXkgc2F0aXNmeQor CQkJICogYm90aCB0aGUgY3VycmVudCBjb25maWd1cmF0aW9uIHdlJ3JlCisJCQkgKiBzd2l0Y2hp bmcgYXdheSBmcm9tIGFuZCB0aGUgbmV3CisJCQkgKiBjb25maWd1cmF0aW9uIHdlJ3JlIHN3aXRj aGluZyB0by4KKwkJCSAqLworCQkJc3RydWN0IGludGVsX3BpcGVfd20gaW50ZXJtZWRpYXRlOwor CisJCQkvKgorCQkJICogT3B0aW1hbCB3YXRlcm1hcmtzLCBwcm9ncmFtbWVkIHBvc3QtdmJsYW5r CisJCQkgKiB3aGVuIHRoaXMgc3RhdGUgaXMgY29tbWl0dGVkLgorCQkJICovCisJCQlzdHJ1Y3Qg aW50ZWxfcGlwZV93bSBvcHRpbWFsOworCQl9IGlsazsKKworCQlzdHJ1Y3QgeworCQkJLyogZ2Vu OSsgb25seSBuZWVkcyAxLXN0ZXAgd20gcHJvZ3JhbW1pbmcgKi8KKwkJCXN0cnVjdCBza2xfcGlw ZV93bSBvcHRpbWFsOworCQl9IHNrbDsKKwl9OworCisJLyoKKwkgKiBQbGF0Zm9ybXMgd2l0aCB0 d28tc3RlcCB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgd2lsbCBuZWVkIHRvCisJICogdXBkYXRlIHdh dGVybWFyayBwcm9ncmFtbWluZyBwb3N0LXZibGFuayB0byBzd2l0Y2ggZnJvbSB0aGUKKwkgKiBz YWZlIGludGVybWVkaWF0ZSB3YXRlcm1hcmtzIHRvIHRoZSBvcHRpbWFsIGZpbmFsCisJICogd2F0 ZXJtYXJrcy4KKwkgKi8KKwlib29sIG5lZWRfcG9zdHZibF91cGRhdGU7Cit9OworCiBzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSB7CiAJc3RydWN0IGRybV9jcnRjX3N0YXRlIGJhc2U7CiAKQEAgLTU1 MiwzMiArNTg2LDcgQEAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogCS8qIElWQiBzcHJpdGUg c2NhbGluZyB3L2EgKFdhQ3hTUkRpc2FibGVkRm9yU3ByaXRlU2NhbGluZzppdmIpICovCiAJYm9v bCBkaXNhYmxlX2xwX3dtOwogCi0Jc3RydWN0IHsKLQkJLyoKLQkJICogT3B0aW1hbCB3YXRlcm1h cmtzLCBwcm9ncmFtbWVkIHBvc3QtdmJsYW5rIHdoZW4gdGhpcyBzdGF0ZQotCQkgKiBpcyBjb21t aXR0ZWQuCi0JCSAqLwotCQl1bmlvbiB7Ci0JCQlzdHJ1Y3QgaW50ZWxfcGlwZV93bSBpbGs7Ci0J CQlzdHJ1Y3Qgc2tsX3BpcGVfd20gc2tsOwotCQl9IG9wdGltYWw7Ci0KLQkJLyoKLQkJICogSW50 ZXJtZWRpYXRlIHdhdGVybWFya3M7IHRoZXNlIGNhbiBiZSBwcm9ncmFtbWVkIGltbWVkaWF0ZWx5 Ci0JCSAqIHNpbmNlIHRoZXkgc2F0aXNmeSBib3RoIHRoZSBjdXJyZW50IGNvbmZpZ3VyYXRpb24g d2UncmUKLQkJICogc3dpdGNoaW5nIGF3YXkgZnJvbSBhbmQgdGhlIG5ldyBjb25maWd1cmF0aW9u IHdlJ3JlIHN3aXRjaGluZwotCQkgKiB0by4KLQkJICovCi0JCXN0cnVjdCBpbnRlbF9waXBlX3dt IGludGVybWVkaWF0ZTsKLQotCQkvKgotCQkgKiBQbGF0Zm9ybXMgd2l0aCB0d28tc3RlcCB3YXRl cm1hcmsgcHJvZ3JhbW1pbmcgd2lsbCBuZWVkIHRvCi0JCSAqIHVwZGF0ZSB3YXRlcm1hcmsgcHJv Z3JhbW1pbmcgcG9zdC12YmxhbmsgdG8gc3dpdGNoIGZyb20gdGhlCi0JCSAqIHNhZmUgaW50ZXJt ZWRpYXRlIHdhdGVybWFya3MgdG8gdGhlIG9wdGltYWwgZmluYWwKLQkJICogd2F0ZXJtYXJrcy4K LQkJICovCi0JCWJvb2wgbmVlZF9wb3N0dmJsX3VwZGF0ZTsKLQl9IHdtOworCXN0cnVjdCBpbnRl bF9jcnRjX3dtX3N0YXRlIHdtOwogCiAJLyogR2FtbWEgbW9kZSBwcm9ncmFtbWVkIG9uIHRoZSBw aXBlICovCiAJdWludDMyX3QgZ2FtbWFfbW9kZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4 IDliYzljMjUuLmEwNGU0OTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjMwOSw3ICsy MzA5LDcgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRj X3N0YXRlICpjc3RhdGUpCiAJaW50IGxldmVsLCBtYXhfbGV2ZWwgPSBpbGtfd21fbWF4X2xldmVs KGRldiksIHVzYWJsZV9sZXZlbDsKIAlzdHJ1Y3QgaWxrX3dtX21heGltdW1zIG1heDsKIAotCXBp cGVfd20gPSAmY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKKwlwaXBlX3dtID0gJmNzdGF0ZS0+d20u aWxrLm9wdGltYWw7CiAKIAlmb3JfZWFjaF9pbnRlbF9wbGFuZV9vbl9jcnRjKGRldiwgaW50ZWxf Y3J0YywgaW50ZWxfcGxhbmUpIHsKIAkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwczsKQEAg LTIzOTEsNyArMjM5MSw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfaW50ZXJtZWRpYXRlX3dt KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jcnRjICpp bnRlbF9jcnRjLAogCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3c3RhdGUp CiB7Ci0Jc3RydWN0IGludGVsX3BpcGVfd20gKmEgPSAmbmV3c3RhdGUtPndtLmludGVybWVkaWF0 ZTsKKwlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYSA9ICZuZXdzdGF0ZS0+d20uaWxrLmludGVybWVk aWF0ZTsKIAlzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqYiA9ICZpbnRlbF9jcnRjLT53bS5hY3RpdmUu aWxrOwogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYpOwogCkBA IC0yNDAwLDcgKzI0MDAsNyBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX2ludGVybWVkaWF0ZV93 bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIGN1cnJlbnRseSBhY3RpdmUgd2F0ZXJtYXJr cyB0byBnZXQgdmFsdWVzIHRoYXQgYXJlIHNhZmUgYm90aCBiZWZvcmUKIAkgKiBhbmQgYWZ0ZXIg dGhlIHZibGFuay4KIAkgKi8KLQkqYSA9IG5ld3N0YXRlLT53bS5vcHRpbWFsLmlsazsKKwkqYSA9 IG5ld3N0YXRlLT53bS5pbGsub3B0aW1hbDsKIAlhLT5waXBlX2VuYWJsZWQgfD0gYi0+cGlwZV9l bmFibGVkOwogCWEtPnNwcml0ZXNfZW5hYmxlZCB8PSBiLT5zcHJpdGVzX2VuYWJsZWQ7CiAJYS0+ c3ByaXRlc19zY2FsZWQgfD0gYi0+c3ByaXRlc19zY2FsZWQ7CkBAIC0yNDI5LDcgKzI0MjksNyBA QCBzdGF0aWMgaW50IGlsa19jb21wdXRlX2ludGVybWVkaWF0ZV93bShzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAogCSAqIElmIG91ciBpbnRlcm1lZGlhdGUgV00gYXJlIGlkZW50aWNhbCB0byB0aGUg ZmluYWwgV00sIHRoZW4gd2UgY2FuCiAJICogb21pdCB0aGUgcG9zdC12YmxhbmsgcHJvZ3JhbW1p bmc7IG9ubHkgdXBkYXRlIGlmIGl0J3MgZGlmZmVyZW50LgogCSAqLwotCWlmIChtZW1jbXAoYSwg Jm5ld3N0YXRlLT53bS5vcHRpbWFsLmlsaywgc2l6ZW9mKCphKSkgPT0gMCkKKwlpZiAobWVtY21w KGEsICZuZXdzdGF0ZS0+d20uaWxrLm9wdGltYWwsIHNpemVvZigqYSkpID09IDApCiAJCW5ld3N0 YXRlLT53bS5uZWVkX3Bvc3R2YmxfdXBkYXRlID0gZmFsc2U7CiAKIAlyZXR1cm4gMDsKQEAgLTM2 NjQsNyArMzY2NCw3IEBAIHN0YXRpYyB2b2lkIHNrbF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRj ICpjcnRjKQogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3By aXZhdGU7CiAJc3RydWN0IHNrbF93bV92YWx1ZXMgKnJlc3VsdHMgPSAmZGV2X3ByaXYtPndtLnNr bF9yZXN1bHRzOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUgPSB0b19pbnRlbF9j cnRjX3N0YXRlKGNydGMtPnN0YXRlKTsKLQlzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20gPSAm Y3N0YXRlLT53bS5vcHRpbWFsLnNrbDsKKwlzdHJ1Y3Qgc2tsX3BpcGVfd20gKnBpcGVfd20gPSAm Y3N0YXRlLT53bS5za2wub3B0aW1hbDsKIAogCiAJLyogQ2xlYXIgYWxsIGRpcnR5IGZsYWdzICov CkBAIC0zNzQzLDcgKzM3NDMsNyBAQCBzdGF0aWMgdm9pZCBpbGtfaW5pdGlhbF93YXRlcm1hcmtz KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiAJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNzdGF0ZS0+YmFzZS5jcnRjKTsKIAogCW11dGV4X2xv Y2soJmRldl9wcml2LT53bS53bV9tdXRleCk7Ci0JaW50ZWxfY3J0Yy0+d20uYWN0aXZlLmlsayA9 IGNzdGF0ZS0+d20uaW50ZXJtZWRpYXRlOworCWludGVsX2NydGMtPndtLmFjdGl2ZS5pbGsgPSBj c3RhdGUtPndtLmlsay5pbnRlcm1lZGlhdGU7CiAJaWxrX3Byb2dyYW1fd2F0ZXJtYXJrcyhkZXZf cHJpdik7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwogfQpAQCAtMzc1 NSw3ICszNzU1LDcgQEAgc3RhdGljIHZvaWQgaWxrX29wdGltaXplX3dhdGVybWFya3Moc3RydWN0 IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSkKIAogCW11dGV4X2xvY2soJmRldl9wcml2LT53bS53 bV9tdXRleCk7CiAJaWYgKGNzdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSkgewotCQlpbnRl bF9jcnRjLT53bS5hY3RpdmUuaWxrID0gY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKKwkJaW50ZWxf Y3J0Yy0+d20uYWN0aXZlLmlsayA9IGNzdGF0ZS0+d20uaWxrLm9wdGltYWw7CiAJCWlsa19wcm9n cmFtX3dhdGVybWFya3MoZGV2X3ByaXYpOwogCX0KIAltdXRleF91bmxvY2soJmRldl9wcml2LT53 bS53bV9tdXRleCk7CkBAIC0zODEyLDcgKzM4MTIsNyBAQCBzdGF0aWMgdm9pZCBza2xfcGlwZV93 bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBza2xfd21fdmFs dWVzICpodyA9ICZkZXZfcHJpdi0+d20uc2tsX2h3OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3N0YXRlID0gdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Ci0Jc3RydWN0IHNrbF9w aXBlX3dtICphY3RpdmUgPSAmY3N0YXRlLT53bS5vcHRpbWFsLnNrbDsKKwlzdHJ1Y3Qgc2tsX3Bp cGVfd20gKmFjdGl2ZSA9ICZjc3RhdGUtPndtLnNrbC5vcHRpbWFsOwogCWVudW0gcGlwZSBwaXBl ID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAlpbnQgbGV2ZWwsIGksIG1heF9sZXZlbDsKIAl1aW50MzJf dCB0ZW1wOwpAQCAtMzg3OCw3ICszODc4LDcgQEAgc3RhdGljIHZvaWQgaWxrX3BpcGVfd21fZ2V0 X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgaWxrX3dtX3ZhbHVlcyAq aHcgPSAmZGV2X3ByaXYtPndtLmh3OwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0g dG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0g dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Ci0Jc3RydWN0IGludGVsX3BpcGVfd20g KmFjdGl2ZSA9ICZjc3RhdGUtPndtLm9wdGltYWwuaWxrOworCXN0cnVjdCBpbnRlbF9waXBlX3dt ICphY3RpdmUgPSAmY3N0YXRlLT53bS5pbGsub3B0aW1hbDsKIAllbnVtIHBpcGUgcGlwZSA9IGlu dGVsX2NydGMtPnBpcGU7CiAJc3RhdGljIGNvbnN0IGk5MTVfcmVnX3Qgd20wX3BpcGVfcmVnW10g PSB7CiAJCVtQSVBFX0FdID0gV00wX1BJUEVBX0lMSywKLS0gCjIuMS40CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK