From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: [PATCH 1/6] drm/i915: factor out compute_config from __intel_set_mode v2 Date: Thu, 30 Oct 2014 11:53:59 -0700 Message-ID: <1414695244-14159-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 000C46E0C0 for ; Thu, 30 Oct 2014 11:54:14 -0700 (PDT) Received: by mail-pa0-f54.google.com with SMTP id rd3so6079524pab.27 for ; Thu, 30 Oct 2014 11:54:14 -0700 (PDT) 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: shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyBhbGxvd3MgdXMgdG8gY2FsY3VsYXRlIHRoZSBmdWxsIHBpcGUgY29uZmlnIGJlZm9yZSB3 ZSBkbyBhbnkgbW9kZQpzZXR0aW5nIHdvcmsuCgp2MjoKICAtIGNsYXJpZnkgY29tbWVudHMgYWJv dXQgZ2xvYmFsIHZzLiBwZXItY3J0YyBtb2RlIHNldCAoQW5kZXIpCiAgLSBjbGVhbiB1cCB1bm5l Y2Vzc2FyeSBwaXBlX2NvbmZpZyA9IE5VTEwgc2V0dGluZyAoQW5kZXIpCgpTaWduZWQtb2ZmLWJ5 OiBKZXNzZSBCYXJuZXMgPGpiYXJuZXNAdmlydHVvdXNnZWVrLm9yZz4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA5NiArKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2OCBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNmU1YmMzYy4uZjlh MDk2MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTA5MTAsNDUgKzEw OTEwLDYxIEBAIHN0YXRpYyB2b2lkIHVwZGF0ZV9zY2FubGluZV9vZmZzZXQoc3RydWN0IGludGVs X2NydGMgKmNydGMpCiAJCWNydGMtPnNjYW5saW5lX29mZnNldCA9IDE7CiB9CiAKK3N0YXRpYyBp bnQgaW50ZWxfbW9kZXNldF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCisJ CQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAorCQkJCQlzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKKwkJCQkJdW5zaWduZWQgKm1vZGVzZXRfcGlwZXMsCisJCQkJCXVuc2lnbmVk ICpwcmVwYXJlX3BpcGVzLAorCQkJCQl1bnNpZ25lZCAqZGlzYWJsZV9waXBlcykKK3sKKwlzdHJ1 Y3QgaW50ZWxfY3J0Y19jb25maWcgKnBpcGVfY29uZmlnID0gTlVMTDsKKwlpbnQgcmV0ID0gMDsK KworCWludGVsX21vZGVzZXRfYWZmZWN0ZWRfcGlwZXMoY3J0YywgbW9kZXNldF9waXBlcywKKwkJ CQkgICAgIHByZXBhcmVfcGlwZXMsIGRpc2FibGVfcGlwZXMpOworCisJaWYgKCFtb2Rlc2V0X3Bp cGVzKQorCQlnb3RvIG91dDsKKworCS8qCisJICogTm90ZSB0aGlzIG5lZWRzIGNoYW5nZXMgd2hl biB3ZSBzdGFydCB0cmFja2luZyBtdWx0aXBsZSBtb2RlcworCSAqIGFuZCBjcnRjcy4gIEF0IHRo YXQgcG9pbnQgd2UnbGwgbmVlZCB0byBjb21wdXRlIHRoZSB3aG9sZSBjb25maWcKKwkgKiAoaS5l LiBvbmUgcGlwZV9jb25maWcgZm9yIGVhY2ggY3J0YykgcmF0aGVyIHRoYW4ganVzdCB0aGUgb25l CisJICogZm9yIHRoaXMgY3J0Yy4KKwkgKi8KKwlwaXBlX2NvbmZpZyA9IGludGVsX21vZGVzZXRf cGlwZV9jb25maWcoY3J0YywgZmIsIG1vZGUpOworCWlmIChJU19FUlIocGlwZV9jb25maWcpKSB7 CisJCXJldCA9IFBUUl9FUlIocGlwZV9jb25maWcpOworCQlnb3RvIG91dDsKKwl9CisJaW50ZWxf ZHVtcF9waXBlX2NvbmZpZyh0b19pbnRlbF9jcnRjKGNydGMpLCBwaXBlX2NvbmZpZywKKwkJCSAg ICAgICAiW21vZGVzZXRdIik7CisJdG9faW50ZWxfY3J0YyhjcnRjKS0+bmV3X2NvbmZpZyA9IHBp cGVfY29uZmlnOworCitvdXQ6CisJcmV0dXJuIHJldDsKK30KKwogc3RhdGljIGludCBfX2ludGVs X3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgICBzdHJ1Y3QgZHJtX2Rpc3Bs YXlfbW9kZSAqbW9kZSwKLQkJCSAgICBpbnQgeCwgaW50IHksIHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiKQorCQkJICAgIGludCB4LCBpbnQgeSwgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs CisJCQkgICAgdW5zaWduZWQgZGlzYWJsZV9waXBlcywKKwkJCSAgICB1bnNpZ25lZCBwcmVwYXJl X3BpcGVzLAorCQkJICAgIHVuc2lnbmVkIG1vZGVzZXRfcGlwZXMpCiB7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpzYXZlZF9t b2RlOwogCXN0cnVjdCBpbnRlbF9jcnRjX2NvbmZpZyAqcGlwZV9jb25maWcgPSBOVUxMOwogCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjOwotCXVuc2lnbmVkIGRpc2FibGVfcGlwZXMsIHBy ZXBhcmVfcGlwZXMsIG1vZGVzZXRfcGlwZXM7CiAJaW50IHJldCA9IDA7CiAKIAlzYXZlZF9tb2Rl ID0ga21hbGxvYyhzaXplb2YoKnNhdmVkX21vZGUpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXNhdmVk X21vZGUpCiAJCXJldHVybiAtRU5PTUVNOwogCi0JaW50ZWxfbW9kZXNldF9hZmZlY3RlZF9waXBl cyhjcnRjLCAmbW9kZXNldF9waXBlcywKLQkJCQkgICAgICZwcmVwYXJlX3BpcGVzLCAmZGlzYWJs ZV9waXBlcyk7Ci0KIAkqc2F2ZWRfbW9kZSA9IGNydGMtPm1vZGU7CiAKLQkvKiBIYWNrOiBCZWNh dXNlIHdlIGRvbid0ICh5ZXQpIHN1cHBvcnQgZ2xvYmFsIG1vZGVzZXQgb24gbXVsdGlwbGUKLQkg KiBjcnRjcywgd2UgZG9uJ3Qga2VlcCB0cmFjayBvZiB0aGUgbmV3IG1vZGUgZm9yIG1vcmUgdGhh biBvbmUgY3J0Yy4KLQkgKiBIZW5jZSBzaW1wbHkgY2hlY2sgd2hldGhlciBhbnkgYml0IGlzIHNl dCBpbiBtb2Rlc2V0X3BpcGVzIGluIGFsbCB0aGUKLQkgKiBwaWVjZXMgb2YgY29kZSB0aGF0IGFy ZSBub3QgeWV0IGNvbnZlcnRlZCB0byBkZWFsIHdpdGggbXV0bGlwbGUgY3J0Y3MKLQkgKiBjaGFu Z2luZyB0aGVpciBtb2RlIGF0IHRoZSBzYW1lIHRpbWUuICovCi0JaWYgKG1vZGVzZXRfcGlwZXMp IHsKLQkJcGlwZV9jb25maWcgPSBpbnRlbF9tb2Rlc2V0X3BpcGVfY29uZmlnKGNydGMsIGZiLCBt b2RlKTsKLQkJaWYgKElTX0VSUihwaXBlX2NvbmZpZykpIHsKLQkJCXJldCA9IFBUUl9FUlIocGlw ZV9jb25maWcpOwotCQkJcGlwZV9jb25maWcgPSBOVUxMOwotCi0JCQlnb3RvIG91dDsKLQkJfQot CQlpbnRlbF9kdW1wX3BpcGVfY29uZmlnKHRvX2ludGVsX2NydGMoY3J0YyksIHBpcGVfY29uZmln LAotCQkJCSAgICAgICAiW21vZGVzZXRdIik7Ci0JCXRvX2ludGVsX2NydGMoY3J0YyktPm5ld19j b25maWcgPSBwaXBlX2NvbmZpZzsKLQl9Ci0KIAkvKgogCSAqIFNlZSBpZiB0aGUgY29uZmlnIHJl cXVpcmVzIGFueSBhZGRpdGlvbmFsIHByZXBhcmF0aW9uLCBlLmcuCiAJICogdG8gYWRqdXN0IGds b2JhbCBzdGF0ZSB3aXRoIHBpcGVzIG9mZi4gIFdlIG5lZWQgdG8gZG8gdGhpcwpAQCAtMTA5NzMs NiArMTA5ODksMTAgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YywKIAogCS8qIGNydGMtPm1vZGUgaXMgYWxyZWFkeSB1c2VkIGJ5IHRoZSAtPm1vZGVf c2V0IGNhbGxiYWNrcywgaGVuY2Ugd2UgbmVlZAogCSAqIHRvIHNldCBpdCBoZXJlIGFscmVhZHkg ZGVzcGl0ZSB0aGF0IHdlIHBhc3MgaXQgZG93biB0aGUgY2FsbGNoYWluLgorCSAqCisJICogTm90 ZSB3ZSdsbCBuZWVkIHRvIGZpeCB0aGlzIHVwIHdoZW4gd2Ugc3RhcnQgdHJhY2tpbmcgbXVsdGlw bGUKKwkgKiBwaXBlczsgaGVyZSB3ZSBhc3N1bWUgYSBzaW5nbGUgbW9kZXNldF9waXBlIGFuZCBv bmx5IHRyYWNrIHRoZQorCSAqIHNpbmdsZSBjcnRjIGFuZCBtb2RlLgogCSAqLwogCWlmIChtb2Rl c2V0X3BpcGVzKSB7CiAJCWNydGMtPm1vZGUgPSAqbW9kZTsKQEAgLTExMDQyLDE5ICsxMTA2Miwy MiBAQCBkb25lOgogCWlmIChyZXQgJiYgY3J0Yy0+ZW5hYmxlZCkKIAkJY3J0Yy0+bW9kZSA9ICpz YXZlZF9tb2RlOwogCi1vdXQ6CiAJa2ZyZWUocGlwZV9jb25maWcpOwogCWtmcmVlKHNhdmVkX21v ZGUpOwogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGUoc3RydWN0 IGRybV9jcnRjICpjcnRjLAotCQkJICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKLQkJ CSAgaW50IHgsIGludCB5LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKK3N0YXRpYyBpbnQg aW50ZWxfc2V0X21vZGVfcGlwZXMoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCXN0cnVjdCBk cm1fZGlzcGxheV9tb2RlICptb2RlLAorCQkJCWludCB4LCBpbnQgeSwgc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIsCisJCQkJdW5zaWduZWQgbW9kZXNldF9waXBlcywKKwkJCQl1bnNpZ25lZCBw cmVwYXJlX3BpcGVzLAorCQkJCXVuc2lnbmVkIGRpc2FibGVfcGlwZXMpCiB7CiAJaW50IHJldDsK IAotCXJldCA9IF9faW50ZWxfc2V0X21vZGUoY3J0YywgbW9kZSwgeCwgeSwgZmIpOworCXJldCA9 IF9faW50ZWxfc2V0X21vZGUoY3J0YywgbW9kZSwgeCwgeSwgZmIsIG1vZGVzZXRfcGlwZXMsCisJ CQkgICAgICAgcHJlcGFyZV9waXBlcywgZGlzYWJsZV9waXBlcyk7CiAKIAlpZiAocmV0ID09IDAp CiAJCWludGVsX21vZGVzZXRfY2hlY2tfc3RhdGUoY3J0Yy0+ZGV2KTsKQEAgLTExMDYyLDYgKzEx MDg1LDIzIEBAIHN0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGUoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyBpbnQgaW50ZWxfc2V0X21vZGUoc3RydWN0IGRy bV9jcnRjICpjcnRjLAorCQkJICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSwKKwkJCSAg aW50IHgsIGludCB5LCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYikKK3sKKwl1bnNpZ25lZCBt b2Rlc2V0X3BpcGVzLCBwcmVwYXJlX3BpcGVzLCBkaXNhYmxlX3BpcGVzOworCWludCByZXQ7CisK KwlyZXQgPSBpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmlnKGNydGMsIG1vZGUsIGZiLAorCQkJ CQkgICAmbW9kZXNldF9waXBlcywgJnByZXBhcmVfcGlwZXMsCisJCQkJCSAgICZkaXNhYmxlX3Bp cGVzKTsKKwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0dXJuIGludGVsX3NldF9tb2Rl X3BpcGVzKGNydGMsIG1vZGUsIHgsIHksIGZiLCBtb2Rlc2V0X3BpcGVzLAorCQkJCSAgICBwcmVw YXJlX3BpcGVzLCBkaXNhYmxlX3BpcGVzKTsKK30KKwogdm9pZCBpbnRlbF9jcnRjX3Jlc3RvcmVf bW9kZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJaW50ZWxfc2V0X21vZGUoY3J0YywgJmNy dGMtPm1vZGUsIGNydGMtPngsIGNydGMtPnksIGNydGMtPnByaW1hcnktPmZiKTsKLS0gCjEuOS4x CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=