From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v2 2/3] drm/i915: Don't update staged config during force restore modesets Date: Tue, 16 Jun 2015 11:49:44 +0300 Message-ID: <1434444585-25708-2-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1434444585-25708-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 050BC6E527 for ; Tue, 16 Jun 2015 01:49:56 -0700 (PDT) In-Reply-To: <1434444585-25708-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 VGhlIGZvcmNlIHJlc3RvcmUgcGF0aCByZWxpZXMgb24gdGhlIHN0YWdlZCBjb25maWcgdG8gcHJl c2VydmUgdGhlCmNvbmZpZ3VyYXRpb24gdXNlZCBiZWZvcmUgYSBzdXNwZW5kL3Jlc3VtZSBjeWNs ZS4gVGhlIHVwZGF0ZSBkb25lIHRvIGl0CmluIGludGVsX21vZGVzZXRfZml4dXBfc3RhdGUoKSB3 b3VsZCBjYXVzZSB0aGF0IGluZm9ybWF0aW9uIHRvIGJlIGxvc3QKYWZ0ZXIgdGhlIGZpcnN0IG1v ZGVzZXQsIG1ha2luZyBpdCBpbXBvc3NpYmxlIHRvIHJlc3RvcmUgdGhlIG1vZGVzIGZvcgpwaXBl cyBCIGFuZCBDLgoKUmVmZXJlbmNlczogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTA0NjgKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29uc2VsdmFuIGRlIE9saXZl aXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog TWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4ICsrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBp bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBiY2YxMDQxLi5mZjcxNzViIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0xMTM4NiwxMCArMTEzODYsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0 X2ZpeHVwX3N0YXRlKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJY3J0Yy0+YmFz ZS5lbmFibGVkID0gY3J0Yy0+YmFzZS5zdGF0ZS0+ZW5hYmxlOwogCQljcnRjLT5jb25maWcgPSB0 b19pbnRlbF9jcnRjX3N0YXRlKGNydGMtPmJhc2Uuc3RhdGUpOwogCX0KLQotCS8qIENvcHkgdGhl IG5ldyBjb25maWd1cmF0aW9uIHRvIHRoZSBzdGFnZWQgc3RhdGUsIHRvIGtlZXAgdGhlIGZldwot CSAqIHBpZWNlcyBvZiBjb2RlIHRoYXQgaGF2ZW4ndCBiZWVuIGNvbnZlcnRlZCB5ZXQgaGFwcHkg Ki8KLQlpbnRlbF9tb2Rlc2V0X3VwZGF0ZV9zdGFnZWRfb3V0cHV0X3N0YXRlKHN0YXRlLT5kZXYp OwogfQogCiBzdGF0aWMgdm9pZApAQCAtMTI2NTQsOCArMTI2NTAsMTAgQEAgc3RhdGljIGludCBp bnRlbF9zZXRfbW9kZV93aXRoX2NvbmZpZyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlyZXQg PSBfX2ludGVsX3NldF9tb2RlKGNydGMsIHBpcGVfY29uZmlnKTsKIAotCWlmIChyZXQgPT0gMCAm JiBmb3JjZV9yZXN0b3JlKQorCWlmIChyZXQgPT0gMCAmJiBmb3JjZV9yZXN0b3JlKSB7CisJCWlu dGVsX21vZGVzZXRfdXBkYXRlX3N0YWdlZF9vdXRwdXRfc3RhdGUoY3J0Yy0+ZGV2KTsKIAkJaW50 ZWxfbW9kZXNldF9jaGVja19zdGF0ZShjcnRjLT5kZXYpOworCX0KIAogCXJldHVybiByZXQ7CiB9 Ci0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK