From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [CI 01/17] drm/i915: Reorganize WM structs/unions in CRTC state Date: Thu, 12 May 2016 07:05:55 -0700 Message-ID: <1463061971-19638-2-git-send-email-matthew.d.roper@intel.com> References: <1463061971-19638-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id EB28F6E8CA for ; Thu, 12 May 2016 14:07:15 +0000 (UTC) In-Reply-To: <1463061971-19638-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 ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMWEzZTY5ZS4uMWIyZTY5NiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKQEAgLTQwNSw2ICs0MDUsNDAgQEAgc3RydWN0IHNrbF9waXBlX3dtIHsK IAl1aW50MzJfdCBsaW5ldGltZTsKIH07CiAKK3N0cnVjdCBpbnRlbF9jcnRjX3dtX3N0YXRlIHsK Kwl1bmlvbiB7CisJCXN0cnVjdCB7CisJCQkvKgorCQkJICogSW50ZXJtZWRpYXRlIHdhdGVybWFy a3M7IHRoZXNlIGNhbiBiZQorCQkJICogcHJvZ3JhbW1lZCBpbW1lZGlhdGVseSBzaW5jZSB0aGV5 IHNhdGlzZnkKKwkJCSAqIGJvdGggdGhlIGN1cnJlbnQgY29uZmlndXJhdGlvbiB3ZSdyZQorCQkJ ICogc3dpdGNoaW5nIGF3YXkgZnJvbSBhbmQgdGhlIG5ldworCQkJICogY29uZmlndXJhdGlvbiB3 ZSdyZSBzd2l0Y2hpbmcgdG8uCisJCQkgKi8KKwkJCXN0cnVjdCBpbnRlbF9waXBlX3dtIGludGVy bWVkaWF0ZTsKKworCQkJLyoKKwkJCSAqIE9wdGltYWwgd2F0ZXJtYXJrcywgcHJvZ3JhbW1lZCBw b3N0LXZibGFuaworCQkJICogd2hlbiB0aGlzIHN0YXRlIGlzIGNvbW1pdHRlZC4KKwkJCSAqLwor CQkJc3RydWN0IGludGVsX3BpcGVfd20gb3B0aW1hbDsKKwkJfSBpbGs7CisKKwkJc3RydWN0IHsK KwkJCS8qIGdlbjkrIG9ubHkgbmVlZHMgMS1zdGVwIHdtIHByb2dyYW1taW5nICovCisJCQlzdHJ1 Y3Qgc2tsX3BpcGVfd20gb3B0aW1hbDsKKwkJfSBza2w7CisJfTsKKworCS8qCisJICogUGxhdGZv cm1zIHdpdGggdHdvLXN0ZXAgd2F0ZXJtYXJrIHByb2dyYW1taW5nIHdpbGwgbmVlZCB0bworCSAq IHVwZGF0ZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgcG9zdC12YmxhbmsgdG8gc3dpdGNoIGZyb20g dGhlCisJICogc2FmZSBpbnRlcm1lZGlhdGUgd2F0ZXJtYXJrcyB0byB0aGUgb3B0aW1hbCBmaW5h bAorCSAqIHdhdGVybWFya3MuCisJICovCisJYm9vbCBuZWVkX3Bvc3R2YmxfdXBkYXRlOworfTsK Kwogc3RydWN0IGludGVsX2NydGNfc3RhdGUgewogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSBiYXNl OwogCkBAIC01NTgsMzIgKzU5Miw3IEBAIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlIHsKIAkvKiBJ VkIgc3ByaXRlIHNjYWxpbmcgdy9hIChXYUN4U1JEaXNhYmxlZEZvclNwcml0ZVNjYWxpbmc6aXZi KSAqLwogCWJvb2wgZGlzYWJsZV9scF93bTsKIAotCXN0cnVjdCB7Ci0JCS8qCi0JCSAqIE9wdGlt YWwgd2F0ZXJtYXJrcywgcHJvZ3JhbW1lZCBwb3N0LXZibGFuayB3aGVuIHRoaXMgc3RhdGUKLQkJ ICogaXMgY29tbWl0dGVkLgotCQkgKi8KLQkJdW5pb24gewotCQkJc3RydWN0IGludGVsX3BpcGVf d20gaWxrOwotCQkJc3RydWN0IHNrbF9waXBlX3dtIHNrbDsKLQkJfSBvcHRpbWFsOwotCi0JCS8q Ci0JCSAqIEludGVybWVkaWF0ZSB3YXRlcm1hcmtzOyB0aGVzZSBjYW4gYmUgcHJvZ3JhbW1lZCBp bW1lZGlhdGVseQotCQkgKiBzaW5jZSB0aGV5IHNhdGlzZnkgYm90aCB0aGUgY3VycmVudCBjb25m aWd1cmF0aW9uIHdlJ3JlCi0JCSAqIHN3aXRjaGluZyBhd2F5IGZyb20gYW5kIHRoZSBuZXcgY29u ZmlndXJhdGlvbiB3ZSdyZSBzd2l0Y2hpbmcKLQkJICogdG8uCi0JCSAqLwotCQlzdHJ1Y3QgaW50 ZWxfcGlwZV93bSBpbnRlcm1lZGlhdGU7Ci0KLQkJLyoKLQkJICogUGxhdGZvcm1zIHdpdGggdHdv LXN0ZXAgd2F0ZXJtYXJrIHByb2dyYW1taW5nIHdpbGwgbmVlZCB0bwotCQkgKiB1cGRhdGUgd2F0 ZXJtYXJrIHByb2dyYW1taW5nIHBvc3QtdmJsYW5rIHRvIHN3aXRjaCBmcm9tIHRoZQotCQkgKiBz YWZlIGludGVybWVkaWF0ZSB3YXRlcm1hcmtzIHRvIHRoZSBvcHRpbWFsIGZpbmFsCi0JCSAqIHdh dGVybWFya3MuCi0JCSAqLwotCQlib29sIG5lZWRfcG9zdHZibF91cGRhdGU7Ci0JfSB3bTsKKwlz dHJ1Y3QgaW50ZWxfY3J0Y193bV9zdGF0ZSB3bTsKIAogCS8qIEdhbW1hIG1vZGUgcHJvZ3JhbW1l ZCBvbiB0aGUgcGlwZSAqLwogCXVpbnQzMl90IGdhbW1hX21vZGU7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYwppbmRleCAxYmIwZjlhLi41NDBjNjUxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg LTIzMDksNyArMjMwOSw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3Qg aW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dt X21heF9sZXZlbChkZXYpLCB1c2FibGVfbGV2ZWw7CiAJc3RydWN0IGlsa193bV9tYXhpbXVtcyBt YXg7CiAKLQlwaXBlX3dtID0gJmNzdGF0ZS0+d20ub3B0aW1hbC5pbGs7CisJcGlwZV93bSA9ICZj c3RhdGUtPndtLmlsay5vcHRpbWFsOwogCiAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0Yyhk ZXYsIGludGVsX2NydGMsIGludGVsX3BsYW5lKSB7CiAJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqcHM7CkBAIC0yMzkxLDcgKzIzOTEsNyBAQCBzdGF0aWMgaW50IGlsa19jb21wdXRlX2ludGVy bWVkaWF0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCSAgICAgICBzdHJ1Y3QgaW50 ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJCQkgICAgICAgc3RydWN0IGludGVsX2NydGNfc3RhdGUg Km5ld3N0YXRlKQogewotCXN0cnVjdCBpbnRlbF9waXBlX3dtICphID0gJm5ld3N0YXRlLT53bS5p bnRlcm1lZGlhdGU7CisJc3RydWN0IGludGVsX3BpcGVfd20gKmEgPSAmbmV3c3RhdGUtPndtLmls ay5pbnRlcm1lZGlhdGU7CiAJc3RydWN0IGludGVsX3BpcGVfd20gKmIgPSAmaW50ZWxfY3J0Yy0+ d20uYWN0aXZlLmlsazsKIAlpbnQgbGV2ZWwsIG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwo ZGV2KTsKIApAQCAtMjQwMCw3ICsyNDAwLDcgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9pbnRl cm1lZGlhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiBjdXJyZW50bHkgYWN0aXZl IHdhdGVybWFya3MgdG8gZ2V0IHZhbHVlcyB0aGF0IGFyZSBzYWZlIGJvdGggYmVmb3JlCiAJICog YW5kIGFmdGVyIHRoZSB2YmxhbmsuCiAJICovCi0JKmEgPSBuZXdzdGF0ZS0+d20ub3B0aW1hbC5p bGs7CisJKmEgPSBuZXdzdGF0ZS0+d20uaWxrLm9wdGltYWw7CiAJYS0+cGlwZV9lbmFibGVkIHw9 IGItPnBpcGVfZW5hYmxlZDsKIAlhLT5zcHJpdGVzX2VuYWJsZWQgfD0gYi0+c3ByaXRlc19lbmFi bGVkOwogCWEtPnNwcml0ZXNfc2NhbGVkIHw9IGItPnNwcml0ZXNfc2NhbGVkOwpAQCAtMjQyOSw3 ICsyNDI5LDcgQEAgc3RhdGljIGludCBpbGtfY29tcHV0ZV9pbnRlcm1lZGlhdGVfd20oc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkgKiBJZiBvdXIgaW50ZXJtZWRpYXRlIFdNIGFyZSBpZGVudGlj YWwgdG8gdGhlIGZpbmFsIFdNLCB0aGVuIHdlIGNhbgogCSAqIG9taXQgdGhlIHBvc3QtdmJsYW5r IHByb2dyYW1taW5nOyBvbmx5IHVwZGF0ZSBpZiBpdCdzIGRpZmZlcmVudC4KIAkgKi8KLQlpZiAo bWVtY21wKGEsICZuZXdzdGF0ZS0+d20ub3B0aW1hbC5pbGssIHNpemVvZigqYSkpID09IDApCisJ aWYgKG1lbWNtcChhLCAmbmV3c3RhdGUtPndtLmlsay5vcHRpbWFsLCBzaXplb2YoKmEpKSA9PSAw KQogCQluZXdzdGF0ZS0+d20ubmVlZF9wb3N0dmJsX3VwZGF0ZSA9IGZhbHNlOwogCiAJcmV0dXJu IDA7CkBAIC0zNjc4LDcgKzM2NzgsNyBAQCBzdGF0aWMgdm9pZCBza2xfdXBkYXRlX3dtKHN0cnVj dCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBk ZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBza2xfd21fdmFsdWVzICpyZXN1bHRzID0gJmRldl9w cml2LT53bS5za2xfcmVzdWx0czsKIAlzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlID0g dG9faW50ZWxfY3J0Y19zdGF0ZShjcnRjLT5zdGF0ZSk7Ci0Jc3RydWN0IHNrbF9waXBlX3dtICpw aXBlX3dtID0gJmNzdGF0ZS0+d20ub3B0aW1hbC5za2w7CisJc3RydWN0IHNrbF9waXBlX3dtICpw aXBlX3dtID0gJmNzdGF0ZS0+d20uc2tsLm9wdGltYWw7CiAKIAogCS8qIENsZWFyIGFsbCBkaXJ0 eSBmbGFncyAqLwpAQCAtMzc1Nyw3ICszNzU3LDcgQEAgc3RhdGljIHZvaWQgaWxrX2luaXRpYWxf d2F0ZXJtYXJrcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlKQogCXN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0Yyhjc3RhdGUtPmJhc2UuY3J0Yyk7CiAK IAltdXRleF9sb2NrKCZkZXZfcHJpdi0+d20ud21fbXV0ZXgpOwotCWludGVsX2NydGMtPndtLmFj dGl2ZS5pbGsgPSBjc3RhdGUtPndtLmludGVybWVkaWF0ZTsKKwlpbnRlbF9jcnRjLT53bS5hY3Rp dmUuaWxrID0gY3N0YXRlLT53bS5pbGsuaW50ZXJtZWRpYXRlOwogCWlsa19wcm9ncmFtX3dhdGVy bWFya3MoZGV2X3ByaXYpOwogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPndtLndtX211dGV4KTsK IH0KQEAgLTM3NjksNyArMzc2OSw3IEBAIHN0YXRpYyB2b2lkIGlsa19vcHRpbWl6ZV93YXRlcm1h cmtzKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUpCiAKIAltdXRleF9sb2NrKCZkZXZf cHJpdi0+d20ud21fbXV0ZXgpOwogCWlmIChjc3RhdGUtPndtLm5lZWRfcG9zdHZibF91cGRhdGUp IHsKLQkJaW50ZWxfY3J0Yy0+d20uYWN0aXZlLmlsayA9IGNzdGF0ZS0+d20ub3B0aW1hbC5pbGs7 CisJCWludGVsX2NydGMtPndtLmFjdGl2ZS5pbGsgPSBjc3RhdGUtPndtLmlsay5vcHRpbWFsOwog CQlpbGtfcHJvZ3JhbV93YXRlcm1hcmtzKGRldl9wcml2KTsKIAl9CiAJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+d20ud21fbXV0ZXgpOwpAQCAtMzgyNiw3ICszODI2LDcgQEAgc3RhdGljIHZvaWQg c2tsX3BpcGVfd21fZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlzdHJ1Y3Qg c2tsX3dtX3ZhbHVlcyAqaHcgPSAmZGV2X3ByaXYtPndtLnNrbF9odzsKIAlzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwotCXN0 cnVjdCBza2xfcGlwZV93bSAqYWN0aXZlID0gJmNzdGF0ZS0+d20ub3B0aW1hbC5za2w7CisJc3Ry dWN0IHNrbF9waXBlX3dtICphY3RpdmUgPSAmY3N0YXRlLT53bS5za2wub3B0aW1hbDsKIAllbnVt IHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJaW50IGxldmVsLCBpLCBtYXhfbGV2ZWw7 CiAJdWludDMyX3QgdGVtcDsKQEAgLTM4OTIsNyArMzg5Miw3IEBAIHN0YXRpYyB2b2lkIGlsa19w aXBlX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJc3RydWN0IGlsa193 bV92YWx1ZXMgKmh3ID0gJmRldl9wcml2LT53bS5odzsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNzdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUoY3J0Yy0+c3RhdGUpOwotCXN0cnVjdCBpbnRl bF9waXBlX3dtICphY3RpdmUgPSAmY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKKwlzdHJ1Y3QgaW50 ZWxfcGlwZV93bSAqYWN0aXZlID0gJmNzdGF0ZS0+d20uaWxrLm9wdGltYWw7CiAJZW51bSBwaXBl IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0YXRpYyBjb25zdCBpOTE1X3JlZ190IHdtMF9w aXBlX3JlZ1tdID0gewogCQlbUElQRV9BXSA9IFdNMF9QSVBFQV9JTEssCi0tIAoyLjEuNAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==