From: Maarten Lankhorst Subject: [PATCH 10/10] drm/i915: Remove crtc->active from crtc_enable callbacks Date: Thu, 11 Oct 2018 12:04:57 +0200 Message-ID: <20181011100457.8776-11-maarten.lankhorst@linux.intel.com> References: <20181011100457.8776-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 057C86E36C for ; Thu, 11 Oct 2018 10:05:03 +0000 (UTC) In-Reply-To: <20181011100457.8776-1-maarten.lankhorst@linux.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 Tm93IHRoYXQgbW9zdCBvZiB0aGUgZHJpdmVyIGlzIGF0b21pYywgd2Ugbm8gbG9uZ2VyIG5lZWQg dG8gd29ycnkKYWJvdXQgc2V0dGluZyBjcnRjLT5hY3RpdmUgcmlnaHQgYmVmb3JlIGFjdHVhbGx5 IGVuYWJsaW5nIHRoZSBwaXBlLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1h YXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCAyMSArLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxIGluc2VydGlvbigrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IGFkMmMyMDdkMThiYi4uMGU0YmRkNWMzMzdlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01NTg1LDkgKzU1ODUsNiBAQCBzdGF0aWMgdm9p ZCBpcm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25m aWcsCiAJc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqb2xkX2ludGVsX3N0YXRlID0KIAkJdG9f aW50ZWxfYXRvbWljX3N0YXRlKG9sZF9zdGF0ZSk7CiAKLQlpZiAoV0FSTl9PTihpbnRlbF9jcnRj LT5hY3RpdmUpKQotCQlyZXR1cm47Ci0KIAkvKgogCSAqIFNvbWV0aW1lcyBzcHVyaW91cyBDUFUg cGlwZSB1bmRlcnJ1bnMgaGFwcGVuIGR1cmluZyBGREkKIAkgKiB0cmFpbmluZywgYXQgbGVhc3Qg d2l0aCBWR0ErSERNSSBjbG9uaW5nLiBTdXBwcmVzcyB0aGVtLgpAQCAtNTYxNyw4ICs1NjE0LDYg QEAgc3RhdGljIHZvaWQgaXJvbmxha2VfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKnBpcGVfY29uZmlnLAogCiAJaXJvbmxha2Vfc2V0X3BpcGVjb25mKHBpcGVfY29uZmlnKTsK IAotCWludGVsX2NydGMtPmFjdGl2ZSA9IHRydWU7Ci0KIAlpbnRlbF9lbmNvZGVyc19wcmVfZW5h YmxlKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUpOwogCiAJaWYgKHBpcGVfY29uZmlnLT5o YXNfcGNoX2VuY29kZXIpIHsKQEAgLTU3MTUsOSArNTcxMCw2IEBAIHN0YXRpYyB2b2lkIGhhc3dl bGxfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCWJv b2wgcHNsX2Nsa2dhdGVfd2E7CiAJdTMyIHBpcGVfY2hpY2tlbjsKIAotCWlmIChXQVJOX09OKGlu dGVsX2NydGMtPmFjdGl2ZSkpCi0JCXJldHVybjsKLQogCWludGVsX2VuY29kZXJzX3ByZV9wbGxf ZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBvbGRfc3RhdGUpOwogCiAJaWYgKHBpcGVfY29uZmln LT5zaGFyZWRfZHBsbCkKQEAgLTU3NTQsOCArNTc0Niw2IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxf Y3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCiAJaW50 ZWxfY29sb3Jfc2V0X2NzYygmcGlwZV9jb25maWctPmJhc2UpOwogCi0JaW50ZWxfY3J0Yy0+YWN0 aXZlID0gdHJ1ZTsKLQogCS8qIERpc3BsYXkgV0EgIzExODA6IFdhRGlzYWJsZVNjYWxhckNsb2Nr R2F0aW5nOiBnbGssIGNubCAqLwogCXBzbF9jbGtnYXRlX3dhID0gKElTX0dFTUlOSUxBS0UoZGV2 X3ByaXYpIHx8IElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSAmJgogCQkJIHBpcGVfY29uZmlnLT5w Y2hfcGZpdC5lbmFibGVkOwpAQCAtNjA2Nyw5ICs2MDU3LDYgQEAgc3RhdGljIHZvaWQgdmFsbGV5 dmlld19jcnRjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJ c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWlu dCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAotCWlmIChXQVJOX09OKGludGVsX2NydGMtPmFj dGl2ZSkpCi0JCXJldHVybjsKLQogCWlmIChpbnRlbF9jcnRjX2hhc19kcF9lbmNvZGVyKHBpcGVf Y29uZmlnKSkKIAkJaW50ZWxfZHBfc2V0X21fbihwaXBlX2NvbmZpZywgTTFfTjEpOwogCkBAIC02 MDg1LDggKzYwNzIsNiBAQCBzdGF0aWMgdm9pZCB2YWxsZXl2aWV3X2NydGNfZW5hYmxlKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAogCWludGVsX2NvbG9yX3NldF9jc2Mo JnBpcGVfY29uZmlnLT5iYXNlKTsKIAotCWludGVsX2NydGMtPmFjdGl2ZSA9IHRydWU7Ci0KIAlp bnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0cnVl KTsKIAogCWludGVsX2VuY29kZXJzX3ByZV9wbGxfZW5hYmxlKGNydGMsIHBpcGVfY29uZmlnLCBv bGRfc3RhdGUpOwpAQCAtNjEzNSw5ICs2MTIwLDYgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Vu YWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCWVudW0gcGlwZSBwaXBl ID0gaW50ZWxfY3J0Yy0+cGlwZTsKIAotCWlmIChXQVJOX09OKGludGVsX2NydGMtPmFjdGl2ZSkp Ci0JCXJldHVybjsKLQogCWk5eHhfc2V0X3BsbF9kaXZpZGVycyhwaXBlX2NvbmZpZyk7CiAKIAlp ZiAoaW50ZWxfY3J0Y19oYXNfZHBfZW5jb2RlcihwaXBlX2NvbmZpZykpCkBAIC02MTQ4LDggKzYx MzAsNiBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZywKIAogCWk5eHhfc2V0X3BpcGVjb25mKHBpcGVfY29uZmlnKTsKIAot CWludGVsX2NydGMtPmFjdGl2ZSA9IHRydWU7Ci0KIAlpZiAoIUlTX0dFTjIoZGV2X3ByaXYpKQog CQlpbnRlbF9zZXRfY3B1X2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRldl9wcml2LCBwaXBlLCB0 cnVlKTsKIApAQCAtMTI1MjUsNiArMTI1MDUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVf Y3J0YyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlpZiAobW9kZXNldCkgewogCQl1cGRhdGVf c2NhbmxpbmVfb2Zmc2V0KHBpcGVfY29uZmlnKTsKKwkJaW50ZWxfY3J0Yy0+YWN0aXZlID0gdHJ1 ZTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuY3J0Y19lbmFibGUocGlwZV9jb25maWcsIHN0YXRlKTsK IAogCQkvKiB2YmxhbmtzIHdvcmsgYWdhaW4sIHJlLWVuYWJsZSBwaXBlIENSQy4gKi8KLS0gCjIu MTkuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==