From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 27/35] drm/i915: Remove save/restore logic from intel_crtc_set_config() Date: Tue, 21 Apr 2015 17:13:16 +0300 Message-ID: <1429625604-22252-28-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 874376E5E8 for ; Tue, 21 Apr 2015 07:14:12 -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 VGhpcyBpcyBubyBsb25nZXIgbmVjZXNzYXJ5IHNpbmNlIHdlIG9ubHkgdXBkYXRlIHRoZSBzdGFn ZWQgY29uZmlnIG9uCnN1Y2Nlc3NmdWxsIG1vZGVzZXQuIFRoZSBuZXcgY29uZmlndXJhdGlvbiBp cyBzdG9yZWQgaW4gYW4gYXRvbWljIHN0YXRlCnN0cnVjdCB3aGljaCBpcyBmcmVlZCBpbiBjYXNl IG9mIGZhaWx1cmUuCgpTaWduZWQtb2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEg PGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTEzICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgIDkgLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMTE2IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmNTU2NzYxLi5hNWY1NjVkIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0xMjQ2MSw5MSArMTI0NjEsNiBAQCB2 b2lkIGludGVsX2NydGNfcmVzdG9yZV9tb2RlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogI3Vu ZGVmIGZvcl9lYWNoX2ludGVsX2NydGNfbWFza2VkCiAKLXN0YXRpYyB2b2lkIGludGVsX3NldF9j b25maWdfZnJlZShzdHJ1Y3QgaW50ZWxfc2V0X2NvbmZpZyAqY29uZmlnKQotewotCWlmICghY29u ZmlnKQotCQlyZXR1cm47Ci0KLQlrZnJlZShjb25maWctPnNhdmVfY29ubmVjdG9yX2VuY29kZXJz KTsKLQlrZnJlZShjb25maWctPnNhdmVfZW5jb2Rlcl9jcnRjcyk7Ci0Ja2ZyZWUoY29uZmlnLT5z YXZlX2NydGNfZW5hYmxlZCk7Ci0Ja2ZyZWUoY29uZmlnKTsKLX0KLQotc3RhdGljIGludCBpbnRl bF9zZXRfY29uZmlnX3NhdmVfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKLQkJCQkgICAg ICAgc3RydWN0IGludGVsX3NldF9jb25maWcgKmNvbmZpZykKLXsKLQlzdHJ1Y3QgZHJtX2NydGMg KmNydGM7Ci0Jc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyOwotCXN0cnVjdCBkcm1fY29ubmVj dG9yICpjb25uZWN0b3I7Ci0JaW50IGNvdW50OwotCi0JY29uZmlnLT5zYXZlX2NydGNfZW5hYmxl ZCA9Ci0JCWtjYWxsb2MoZGV2LT5tb2RlX2NvbmZpZy5udW1fY3J0YywKLQkJCXNpemVvZihib29s KSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFjb25maWctPnNhdmVfY3J0Y19lbmFibGVkKQotCQlyZXR1 cm4gLUVOT01FTTsKLQotCWNvbmZpZy0+c2F2ZV9lbmNvZGVyX2NydGNzID0KLQkJa2NhbGxvYyhk ZXYtPm1vZGVfY29uZmlnLm51bV9lbmNvZGVyLAotCQkJc2l6ZW9mKHN0cnVjdCBkcm1fY3J0YyAq KSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFjb25maWctPnNhdmVfZW5jb2Rlcl9jcnRjcykKLQkJcmV0 dXJuIC1FTk9NRU07Ci0KLQljb25maWctPnNhdmVfY29ubmVjdG9yX2VuY29kZXJzID0KLQkJa2Nh bGxvYyhkZXYtPm1vZGVfY29uZmlnLm51bV9jb25uZWN0b3IsCi0JCQlzaXplb2Yoc3RydWN0IGRy bV9lbmNvZGVyICopLCBHRlBfS0VSTkVMKTsKLQlpZiAoIWNvbmZpZy0+c2F2ZV9jb25uZWN0b3Jf ZW5jb2RlcnMpCi0JCXJldHVybiAtRU5PTUVNOwotCi0JLyogQ29weSBkYXRhLiBOb3RlIHRoYXQg ZHJpdmVyIHByaXZhdGUgZGF0YSBpcyBub3QgYWZmZWN0ZWQuCi0JICogU2hvdWxkIGFueXRoaW5n IGJhZCBoYXBwZW4gb25seSB0aGUgZXhwZWN0ZWQgc3RhdGUgaXMKLQkgKiByZXN0b3JlZCwgbm90 IHRoZSBkcml2ZXJzIHBlcnNvbmFsIGJvb2trZWVwaW5nLgotCSAqLwotCWNvdW50ID0gMDsKLQlm b3JfZWFjaF9jcnRjKGRldiwgY3J0YykgewotCQljb25maWctPnNhdmVfY3J0Y19lbmFibGVkW2Nv dW50KytdID0gY3J0Yy0+c3RhdGUtPmVuYWJsZTsKLQl9Ci0KLQljb3VudCA9IDA7Ci0JbGlzdF9m b3JfZWFjaF9lbnRyeShlbmNvZGVyLCAmZGV2LT5tb2RlX2NvbmZpZy5lbmNvZGVyX2xpc3QsIGhl YWQpIHsKLQkJY29uZmlnLT5zYXZlX2VuY29kZXJfY3J0Y3NbY291bnQrK10gPSBlbmNvZGVyLT5j cnRjOwotCX0KLQotCWNvdW50ID0gMDsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5KGNvbm5lY3Rvciwg JmRldi0+bW9kZV9jb25maWcuY29ubmVjdG9yX2xpc3QsIGhlYWQpIHsKLQkJY29uZmlnLT5zYXZl X2Nvbm5lY3Rvcl9lbmNvZGVyc1tjb3VudCsrXSA9IGNvbm5lY3Rvci0+ZW5jb2RlcjsKLQl9Ci0K LQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIHZvaWQgaW50ZWxfc2V0X2NvbmZpZ19yZXN0b3JlX3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJCSAgIHN0cnVjdCBpbnRlbF9zZXRfY29u ZmlnICpjb25maWcpCi17Ci0Jc3RydWN0IGludGVsX2NydGMgKmNydGM7Ci0Jc3RydWN0IGludGVs X2VuY29kZXIgKmVuY29kZXI7Ci0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqY29ubmVjdG9yOwot CWludCBjb3VudDsKLQotCWNvdW50ID0gMDsKLQlmb3JfZWFjaF9pbnRlbF9jcnRjKGRldiwgY3J0 YykgewotCQljcnRjLT5uZXdfZW5hYmxlZCA9IGNvbmZpZy0+c2F2ZV9jcnRjX2VuYWJsZWRbY291 bnQrK107Ci0JfQotCi0JY291bnQgPSAwOwotCWZvcl9lYWNoX2ludGVsX2VuY29kZXIoZGV2LCBl bmNvZGVyKSB7Ci0JCWVuY29kZXItPm5ld19jcnRjID0KLQkJCXRvX2ludGVsX2NydGMoY29uZmln LT5zYXZlX2VuY29kZXJfY3J0Y3NbY291bnQrK10pOwotCX0KLQotCWNvdW50ID0gMDsKLQlmb3Jf ZWFjaF9pbnRlbF9jb25uZWN0b3IoZGV2LCBjb25uZWN0b3IpIHsKLQkJY29ubmVjdG9yLT5uZXdf ZW5jb2RlciA9Ci0JCQl0b19pbnRlbF9lbmNvZGVyKGNvbmZpZy0+c2F2ZV9jb25uZWN0b3JfZW5j b2RlcnNbY291bnQrK10pOwotCX0KLX0KLQogc3RhdGljIGJvb2wKIGlzX2NydGNfY29ubmVjdG9y X29mZihzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiB7CkBAIC0xMjc4NCw3ICsxMjY5OSw2IEBA IHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19zZXRfY29uZmlnKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNl dCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2OwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSA9IE5VTEw7Ci0Jc3RydWN0IGludGVsX3NldF9jb25maWcgKmNvbmZpZzsKIAlzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWc7CiAJYm9vbCBwcmltYXJ5X3BsYW5lX3dh c192aXNpYmxlOwogCWludCByZXQ7CkBAIC0xMjgwNywzNyArMTI3MjEsMjYgQEAgc3RhdGljIGlu dCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3NldCAqc2V0KQogCiAJZGV2 ID0gc2V0LT5jcnRjLT5kZXY7CiAKLQlyZXQgPSAtRU5PTUVNOwotCWNvbmZpZyA9IGt6YWxsb2Mo c2l6ZW9mKCpjb25maWcpLCBHRlBfS0VSTkVMKTsKLQlpZiAoIWNvbmZpZykKLQkJZ290byBvdXRf Y29uZmlnOwotCi0JcmV0ID0gaW50ZWxfc2V0X2NvbmZpZ19zYXZlX3N0YXRlKGRldiwgY29uZmln KTsKLQlpZiAocmV0KQotCQlnb3RvIG91dF9jb25maWc7Ci0KIAlzdGF0ZSA9IGRybV9hdG9taWNf c3RhdGVfYWxsb2MoZGV2KTsKLQlpZiAoIXN0YXRlKSB7Ci0JCXJldCA9IC1FTk9NRU07Ci0JCWdv dG8gb3V0X2NvbmZpZzsKLQl9CisJaWYgKCFzdGF0ZSkKKwkJcmV0dXJuIC1FTk9NRU07CiAKIAlz dGF0ZS0+YWNxdWlyZV9jdHggPSBkZXYtPm1vZGVfY29uZmlnLmFjcXVpcmVfY3R4OwogCiAJcmV0 ID0gaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoZGV2LCBzZXQsIHN0YXRlKTsKIAlp ZiAocmV0KQotCQlnb3RvIGZhaWw7CisJCWdvdG8gb3V0OwogCiAJcmV0ID0gaW50ZWxfbW9kZXNl dF9zZXR1cF9wbGFuZV9zdGF0ZShzdGF0ZSwgc2V0LT5jcnRjLCBzZXQtPm1vZGUsCiAJCQkJCSAg ICAgIHNldC0+ZmIsIHNldC0+eCwgc2V0LT55KTsKIAlpZiAocmV0KQotCQlnb3RvIGZhaWw7CisJ CWdvdG8gb3V0OwogCiAJcGlwZV9jb25maWcgPSBpbnRlbF9tb2Rlc2V0X2NvbXB1dGVfY29uZmln KHNldC0+Y3J0Yywgc2V0LT5tb2RlLAogCQkJCQkJICAgc3RhdGUpOwogCWlmIChJU19FUlIocGlw ZV9jb25maWcpKSB7CiAJCXJldCA9IFBUUl9FUlIocGlwZV9jb25maWcpOwotCQlnb3RvIGZhaWw7 CisJCWdvdG8gb3V0OwogCX0KIAogCS8qIENvbXB1dGUgd2hldGhlciB3ZSBuZWVkIGEgZnVsbCBt b2Rlc2V0LCBvbmx5IGFuIGZiIGJhc2UgdXBkYXRlIG9yIG5vCkBAIC0xMjg4NCwxNCArMTI3ODcs MTAgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3NldF9jb25maWcoc3RydWN0IGRybV9tb2RlX3Nl dCAqc2V0KQogCWlmIChyZXQpIHsKIAkJRFJNX0RFQlVHX0tNUygiZmFpbGVkIHRvIHNldCBtb2Rl IG9uIFtDUlRDOiVkXSwgZXJyID0gJWRcbiIsCiAJCQkgICAgICBzZXQtPmNydGMtPmJhc2UuaWQs IHJldCk7Ci1mYWlsOgotCQlpbnRlbF9zZXRfY29uZmlnX3Jlc3RvcmVfc3RhdGUoZGV2LCBjb25m aWcpOwogCX0KIAotb3V0X2NvbmZpZzoKK291dDoKIAlkcm1fYXRvbWljX3N0YXRlX2ZyZWUoc3Rh dGUpOwotCi0JaW50ZWxfc2V0X2NvbmZpZ19mcmVlKGNvbmZpZyk7CiAJcmV0dXJuIHJldDsKIH0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkYzUzZjU5Li41Y2E0ZmIwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtODEzLDE1ICs4MTMsNiBAQCBzdHJ1Y3QgaW50ZWxfdW5w aW5fd29yayB7CiAJYm9vbCBlbmFibGVfc3RhbGxfY2hlY2s7CiB9OwogCi1zdHJ1Y3QgaW50ZWxf c2V0X2NvbmZpZyB7Ci0Jc3RydWN0IGRybV9lbmNvZGVyICoqc2F2ZV9jb25uZWN0b3JfZW5jb2Rl cnM7Ci0Jc3RydWN0IGRybV9jcnRjICoqc2F2ZV9lbmNvZGVyX2NydGNzOwotCWJvb2wgKnNhdmVf Y3J0Y19lbmFibGVkOwotCi0JYm9vbCBmYl9jaGFuZ2VkOwotCWJvb2wgbW9kZV9jaGFuZ2VkOwot fTsKLQogc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgewogCXN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKnJlbGVhc2VfZmI7CiAJYm9vbCBsb2FkX2RldGVjdF90ZW1wOwotLSAKMi4xLjAKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==