From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 11/35] drm/i915: Extract mode_changed computation out of stage_output_config() Date: Tue, 21 Apr 2015 17:13:00 +0300 Message-ID: <1429625604-22252-12-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 2415C6E5CF for ; Tue, 21 Apr 2015 07:13:43 -0700 (PDT) In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@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 Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org VGhpcyBzaG91bGQgbWFrZSB0aGUgY29udmVyc2lvbiB0byBhdG9taWMgZWFzaWVyLCBieSBzcGxp dHRpbmcgdGhlCmluaXRpYWxpemF0aW9uIG9mIHRoZSBhdG9taWMgc3RhdGUgZnJvbSB0aGUgbG9n aWMgdGhhdCBkZWNpZGVzIGlmIGEKbW9kZXNldCBpcyBuZWVkZWQuCgpTaWduZWQtb2ZmLWJ5OiBB bmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNzMg KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDEg aW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IDRjZWQ1YTQuLjljNDNkZjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKQEAgLTEyNTE5LDYgKzEyNTE5LDEwIEBAIHN0YXRpYyB2b2lkCiBpbnRlbF9zZXRf Y29uZmlnX2NvbXB1dGVfbW9kZV9jaGFuZ2VzKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCwKIAkJ CQkgICAgICBzdHJ1Y3QgaW50ZWxfc2V0X2NvbmZpZyAqY29uZmlnKQogeworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBzZXQtPmNydGMtPmRldjsKKwlzdHJ1Y3QgaW50ZWxfY29ubmVjdG9yICpj b25uZWN0b3I7CisJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXI7CisJc3RydWN0IGludGVs X2NydGMgKmNydGM7CiAKIAkvKiBXZSBzaG91bGQgYmUgYWJsZSB0byBjaGVjayBoZXJlIGlmIHRo ZSBmYiBoYXMgdGhlIHNhbWUgcHJvcGVydGllcwogCSAqIGFuZCB0aGVuIGp1c3QgZmxpcF9vcl9t b3ZlIGl0ICovCkBAIC0xMjU2Miw2ICsxMjU2NiwzNiBAQCBpbnRlbF9zZXRfY29uZmlnX2NvbXB1 dGVfbW9kZV9jaGFuZ2VzKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCwKIAkJY29uZmlnLT5tb2Rl X2NoYW5nZWQgPSB0cnVlOwogCX0KIAorCWZvcl9lYWNoX2ludGVsX2Nvbm5lY3RvcihkZXYsIGNv bm5lY3RvcikgeworCQlpZiAoJmNvbm5lY3Rvci0+bmV3X2VuY29kZXItPmJhc2UgPT0gY29ubmVj dG9yLT5iYXNlLmVuY29kZXIpCisJCQljb250aW51ZTsKKworCQljb25maWctPm1vZGVfY2hhbmdl ZCA9IHRydWU7CisJCURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6JXNdIGVuY29kZXIgY2hh bmdlZCwgZnVsbCBtb2RlIHN3aXRjaFxuIiwKKwkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5iYXNl LmlkLAorCQkJICAgICAgY29ubmVjdG9yLT5iYXNlLm5hbWUpOworCX0KKworCWZvcl9lYWNoX2lu dGVsX2VuY29kZXIoZGV2LCBlbmNvZGVyKSB7CisJCWlmICgmZW5jb2Rlci0+bmV3X2NydGMtPmJh c2UgPT0gZW5jb2Rlci0+YmFzZS5jcnRjKQorCQkJY29udGludWU7CisKKwkJRFJNX0RFQlVHX0tN UygiW0VOQ09ERVI6JWQ6JXNdIGNydGMgY2hhbmdlZCwgZnVsbCBtb2RlIHN3aXRjaFxuIiwKKwkJ CSAgICAgIGVuY29kZXItPmJhc2UuYmFzZS5pZCwKKwkJCSAgICAgIGVuY29kZXItPmJhc2UubmFt ZSk7CisJCWNvbmZpZy0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKKwl9CisKKwlmb3JfZWFjaF9pbnRl bF9jcnRjKGRldiwgY3J0YykgeworCQlpZiAoY3J0Yy0+bmV3X2VuYWJsZWQgPT0gY3J0Yy0+YmFz ZS5zdGF0ZS0+ZW5hYmxlKQorCQkJY29udGludWU7CisKKwkJRFJNX0RFQlVHX0tNUygiW0NSVEM6 JWRdICVzYWJsZWQsIGZ1bGwgbW9kZSBzd2l0Y2hcbiIsCisJCQkgICAgICBjcnRjLT5iYXNlLmJh c2UuaWQsCisJCQkgICAgICBjcnRjLT5uZXdfZW5hYmxlZCA/ICJlbiIgOiAiZGlzIik7CisJCWNv bmZpZy0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKKwl9CisKIAlEUk1fREVCVUdfS01TKCJjb21wdXRl ZCBjaGFuZ2VzIGZvciBbQ1JUQzolZF0sIG1vZGVfY2hhbmdlZD0lZCwgZmJfY2hhbmdlZD0lZFxu IiwKIAkJCXNldC0+Y3J0Yy0+YmFzZS5pZCwgY29uZmlnLT5tb2RlX2NoYW5nZWQsIGNvbmZpZy0+ ZmJfY2hhbmdlZCk7CiB9CkBAIC0xMjU2OSw3ICsxMjYwMyw2IEBAIGludGVsX3NldF9jb25maWdf Y29tcHV0ZV9tb2RlX2NoYW5nZXMoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0LAogc3RhdGljIGlu dAogaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJCQkgc3RydWN0IGRybV9tb2RlX3NldCAqc2V0LAotCQkJCSBzdHJ1Y3QgaW50ZWxfc2V0 X2NvbmZpZyAqY29uZmlnLAogCQkJCSBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7 CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwpAQCAtMTI2MDUsMTQgKzEyNjM4 LDYgQEAgaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJCQljb25uZWN0b3ItPmJhc2UuYmFzZS5pZCwKIAkJCQljb25uZWN0b3ItPmJhc2Uu bmFtZSk7CiAJCX0KLQotCi0JCWlmICgmY29ubmVjdG9yLT5uZXdfZW5jb2Rlci0+YmFzZSAhPSBj b25uZWN0b3ItPmJhc2UuZW5jb2RlcikgewotCQkJRFJNX0RFQlVHX0tNUygiW0NPTk5FQ1RPUjol ZDolc10gZW5jb2RlciBjaGFuZ2VkLCBmdWxsIG1vZGUgc3dpdGNoXG4iLAotCQkJCSAgICAgIGNv bm5lY3Rvci0+YmFzZS5iYXNlLmlkLAotCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5uYW1lKTsK LQkJCWNvbmZpZy0+bW9kZV9jaGFuZ2VkID0gdHJ1ZTsKLQkJfQogCX0KIAkvKiBjb25uZWN0b3It Pm5ld19lbmNvZGVyIGlzIG5vdyB1cGRhdGVkIGZvciBhbGwgY29ubmVjdG9ycy4gKi8KIApAQCAt MTI2NjUsMTUgKzEyNjkwLDYgQEAgaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCWVuY29kZXItPm5ld19jcnRjID0gTlVMTDsKIAkJZWxz ZSBpZiAobnVtX2Nvbm5lY3RvcnMgPiAxKQogCQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQkJLyogT25s eSBub3cgY2hlY2sgZm9yIGNydGMgY2hhbmdlcyBzbyB3ZSBkb24ndCBtaXNzIGVuY29kZXJzCi0J CSAqIHRoYXQgd2lsbCBiZSBkaXNhYmxlZC4gKi8KLQkJaWYgKCZlbmNvZGVyLT5uZXdfY3J0Yy0+ YmFzZSAhPSBlbmNvZGVyLT5iYXNlLmNydGMpIHsKLQkJCURSTV9ERUJVR19LTVMoIltFTkNPREVS OiVkOiVzXSBjcnRjIGNoYW5nZWQsIGZ1bGwgbW9kZSBzd2l0Y2hcbiIsCi0JCQkJICAgICAgZW5j b2Rlci0+YmFzZS5iYXNlLmlkLAotCQkJCSAgICAgIGVuY29kZXItPmJhc2UubmFtZSk7Ci0JCQlj b25maWctPm1vZGVfY2hhbmdlZCA9IHRydWU7Ci0JCX0KIAl9CiAJLyogTm93IHdlJ3ZlIGFsc28g dXBkYXRlZCBlbmNvZGVyLT5uZXdfY3J0YyBmb3IgYWxsIGVuY29kZXJzLiAqLwogCWZvcl9lYWNo X2ludGVsX2Nvbm5lY3RvcihkZXYsIGNvbm5lY3RvcikgewpAQCAtMTI2OTksMTMgKzEyNzE1LDYg QEAgaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkJCQlicmVhazsKIAkJCX0KIAkJfQotCi0JCWlmIChjcnRjLT5uZXdfZW5hYmxlZCAhPSBj cnRjLT5iYXNlLnN0YXRlLT5lbmFibGUpIHsKLQkJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkXSAl c2FibGVkLCBmdWxsIG1vZGUgc3dpdGNoXG4iLAotCQkJCSAgICAgIGNydGMtPmJhc2UuYmFzZS5p ZCwKLQkJCQkgICAgICBjcnRjLT5uZXdfZW5hYmxlZCA/ICJlbiIgOiAiZGlzIik7Ci0JCQljb25m aWctPm1vZGVfY2hhbmdlZCA9IHRydWU7Ci0JCX0KIAl9CiAKIAlyZXR1cm4gMDsKQEAgLTEyNzc3 LDEyICsxMjc4Niw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19zZXRfY29uZmlnKHN0cnVjdCBk cm1fbW9kZV9zZXQgKnNldCkKIAlzYXZlX3NldC55ID0gc2V0LT5jcnRjLT55OwogCXNhdmVfc2V0 LmZiID0gc2V0LT5jcnRjLT5wcmltYXJ5LT5mYjsKIAotCS8qIENvbXB1dGUgd2hldGhlciB3ZSBu ZWVkIGEgZnVsbCBtb2Rlc2V0LCBvbmx5IGFuIGZiIGJhc2UgdXBkYXRlIG9yIG5vCi0JICogY2hh bmdlIGF0IGFsbC4gSW4gdGhlIGZ1dHVyZSB3ZSBtaWdodCBhbHNvIGNoZWNrIHdoZXRoZXIgb25s eSB0aGUKLQkgKiBtb2RlIGNoYW5nZWQsIGUuZy4gZm9yIExWRFMgd2hlcmUgd2Ugb25seSBjaGFu Z2UgdGhlIHBhbmVsIGZpdHRlciBpbgotCSAqIHN1Y2ggY2FzZXMuICovCi0JaW50ZWxfc2V0X2Nv bmZpZ19jb21wdXRlX21vZGVfY2hhbmdlcyhzZXQsIGNvbmZpZyk7Ci0KIAlzdGF0ZSA9IGRybV9h dG9taWNfc3RhdGVfYWxsb2MoZGV2KTsKIAlpZiAoIXN0YXRlKSB7CiAJCXJldCA9IC1FTk9NRU07 CkBAIC0xMjc5MSwxMCArMTI3OTQsMTYgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25m aWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KQogCiAJc3RhdGUtPmFjcXVpcmVfY3R4ID0gZGV2 LT5tb2RlX2NvbmZpZy5hY3F1aXJlX2N0eDsKIAotCXJldCA9IGludGVsX21vZGVzZXRfc3RhZ2Vf b3V0cHV0X3N0YXRlKGRldiwgc2V0LCBjb25maWcsIHN0YXRlKTsKKwlyZXQgPSBpbnRlbF9tb2Rl c2V0X3N0YWdlX291dHB1dF9zdGF0ZShkZXYsIHNldCwgc3RhdGUpOwogCWlmIChyZXQpCiAJCWdv dG8gZmFpbDsKIAorCS8qIENvbXB1dGUgd2hldGhlciB3ZSBuZWVkIGEgZnVsbCBtb2Rlc2V0LCBv bmx5IGFuIGZiIGJhc2UgdXBkYXRlIG9yIG5vCisJICogY2hhbmdlIGF0IGFsbC4gSW4gdGhlIGZ1 dHVyZSB3ZSBtaWdodCBhbHNvIGNoZWNrIHdoZXRoZXIgb25seSB0aGUKKwkgKiBtb2RlIGNoYW5n ZWQsIGUuZy4gZm9yIExWRFMgd2hlcmUgd2Ugb25seSBjaGFuZ2UgdGhlIHBhbmVsIGZpdHRlciBp bgorCSAqIHN1Y2ggY2FzZXMuICovCisJaW50ZWxfc2V0X2NvbmZpZ19jb21wdXRlX21vZGVfY2hh bmdlcyhzZXQsIGNvbmZpZyk7CisKIAlwaXBlX2NvbmZpZyA9IGludGVsX21vZGVzZXRfY29tcHV0 ZV9jb25maWcoc2V0LT5jcnRjLCBzZXQtPm1vZGUsCiAJCQkJCQkgICBzdGF0ZSwKIAkJCQkJCSAg ICZtb2Rlc2V0X3BpcGVzLAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==