From: Tvrtko Ursulin Subject: [PATCH] drm/i915/skl: Only disable scalers once Date: Wed, 5 Aug 2015 15:59:36 +0100 Message-ID: <1438786776-10775-1-git-send-email-tvrtko.ursulin@linux.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 167DC6E961 for ; Wed, 5 Aug 2015 08:00:18 -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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk9ubHkgZGlz YWJsZSBzY2FsZXJzIG9uY2Ugd2hlbiB0cmFuc2l0aW9uaW5nIGZyb20gZW5hYmxlZCBzdGF0ZS4K CkF2b2lkcyBhIGxvdCBvZiBsb2cgbm9pc2UgYXMgYSBzaWRlIGVmZmVjdC4KClNpZ25lZC1vZmYt Ynk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBDaGFuZHJh IEtvbmR1cnUgPGNoYW5kcmEua29uZHVydUBpbnRlbC5jb20+Ci0tLQpDb21waWxlIHRlc3RlZCBv bmx5IGR1ZSBtb21lbnRhcnkgbGFjayBvZiBzdWl0YWJsZSBoYXJkd2FyZSBmb3IgdGVzdGluZyEh IQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDEyICsrKysrKysr LS0tLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODNkYWRiNDc5NmE0Li5iNzU0MWE5 YjUyMjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTI5NTQsMTYgKzI5 NTQsMTkgQEAgc3RhdGljIHZvaWQgc2tsX2RldGFjaF9zY2FsZXIoc3RydWN0IGludGVsX2NydGMg KmludGVsX2NydGMsIGludCBpZCkKIC8qCiAgKiBUaGlzIGZ1bmN0aW9uIGRldGFjaGVzIChha2Eu IHVuYmluZHMpIHVudXNlZCBzY2FsZXJzIGluIGhhcmR3YXJlCiAgKi8KLXN0YXRpYyB2b2lkIHNr bF9kZXRhY2hfc2NhbGVycyhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKK3N0YXRpYyB2 b2lkIHNrbF9kZXRhY2hfc2NhbGVycyhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKKwkJ CSAgICAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2ludGVsX2NydGNfc3RhdGUpCiB7 Ci0Jc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhdGU7CisJc3RydWN0 IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhdGUsICpvbGRfc2NhbGVyX3N0YXRl OwogCWludCBpOwogCiAJc2NhbGVyX3N0YXRlID0gJmludGVsX2NydGMtPmNvbmZpZy0+c2NhbGVy X3N0YXRlOworCW9sZF9zY2FsZXJfc3RhdGUgPSAmb2xkX2ludGVsX2NydGNfc3RhdGUtPnNjYWxl cl9zdGF0ZTsKIAogCS8qIGxvb3AgdGhyb3VnaCBhbmQgZGlzYWJsZSBzY2FsZXJzIHRoYXQgYXJl bid0IGluIHVzZSAqLwogCWZvciAoaSA9IDA7IGkgPCBpbnRlbF9jcnRjLT5udW1fc2NhbGVyczsg aSsrKSB7Ci0JCWlmICghc2NhbGVyX3N0YXRlLT5zY2FsZXJzW2ldLmluX3VzZSkKKwkJaWYgKCFz Y2FsZXJfc3RhdGUtPnNjYWxlcnNbaV0uaW5fdXNlICYmCisJCSAgICBvbGRfc2NhbGVyX3N0YXRl LT5zY2FsZXJzW2ldLmluX3VzZSkKIAkJCXNrbF9kZXRhY2hfc2NhbGVyKGludGVsX2NydGMsIGkp OwogCX0KIH0KQEAgLTEzNjY1LDcgKzEzNjY4LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfYmVnaW5f Y3J0Y19jb21taXQoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlpbnRlbF9waXBlX3VwZGF0ZV9z dGFydChpbnRlbF9jcnRjLCAmaW50ZWxfY3J0Yy0+c3RhcnRfdmJsX2NvdW50KTsKIAogCWlmICgh bmVlZHNfbW9kZXNldChjcnRjLT5zdGF0ZSkgJiYgSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOSkK LQkJc2tsX2RldGFjaF9zY2FsZXJzKGludGVsX2NydGMpOworCQlza2xfZGV0YWNoX3NjYWxlcnMo aW50ZWxfY3J0YywKKwkJCQkgICB0b19pbnRlbF9jcnRjX3N0YXRlKG9sZF9jcnRjX3N0YXRlKSk7 CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2ZpbmlzaF9jcnRjX2NvbW1pdChzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCi0tIAoyLjQuNgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK