From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 25/35] drm/i915: Simplify
	intel_set_config_compute_mode_changes() a bit
Date: Tue, 21 Apr 2015 17:13:14 +0300
Message-ID: <1429625604-22252-26-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id D23D56E5E6
 for <intel-gfx@lists.freedesktop.org>; Tue, 21 Apr 2015 07:14:08 -0700 (PDT)
In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

QWRkIGEgaGVscGVyIGZ1bmN0aW9uIHRvIG1ha2UgdGhlIGNvZGUgc2xpZ2h0bHkgbW9yZSByZWFk
YWJsZS4KClNpZ25lZC1vZmYtYnk6IEFuZGVyIENvbnNlbHZhbiBkZSBPbGl2ZWlyYSA8YW5kZXIu
Y29uc2VsdmFuLmRlLm9saXZlaXJhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMgfCA0NCArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t
LS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNDk0OWMyNS4uMTcyODAxZCAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMTI2MzMsNiArMTI2MzMsMTggQEAg
aW50ZWxfc2V0X2NvbmZpZ19jb21wdXRlX21vZGVfY2hhbmdlcyhzdHJ1Y3QgZHJtX21vZGVfc2V0
ICpzZXQsCiAJCQlwaXBlX2NvbmZpZy0+YmFzZS5wbGFuZXNfY2hhbmdlZCk7CiB9CiAKK3N0YXRp
YyBib29sIGludGVsX2Nvbm5lY3Rvcl9pbl9tb2RlX3NldChzdHJ1Y3QgaW50ZWxfY29ubmVjdG9y
ICpjb25uZWN0b3IsCisJCQkJCXN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCkKK3sKKwlpbnQgcm87
CisKKwlmb3IgKHJvID0gMDsgcm8gPCBzZXQtPm51bV9jb25uZWN0b3JzOyBybysrKQorCQlpZiAo
c2V0LT5jb25uZWN0b3JzW3JvXSA9PSAmY29ubmVjdG9yLT5iYXNlKQorCQkJcmV0dXJuIHRydWU7
CisKKwlyZXR1cm4gZmFsc2U7Cit9CisKIHN0YXRpYyBpbnQKIGludGVsX21vZGVzZXRfc3RhZ2Vf
b3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJIHN0cnVjdCBkcm1fbW9k
ZV9zZXQgKnNldCwKQEAgLTEyNjQzLDcgKzEyNjU1LDYgQEAgaW50ZWxfbW9kZXNldF9zdGFnZV9v
dXRwdXRfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlzdHJ1Y3QgaW50ZWxfZW5jb2Rl
ciAqZW5jb2RlcjsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YzsKIAlzdHJ1Y3QgaW50ZWxfY3J0
Y19zdGF0ZSAqY3J0Y19zdGF0ZTsKLQlpbnQgcm87CiAKIAkvKiBUaGUgdXBwZXIgbGF5ZXJzIGVu
c3VyZSB0aGF0IHdlIGVpdGhlciBkaXNhYmxlIGEgY3J0YyBvciBoYXZlIGEgbGlzdAogCSAqIG9m
IGNvbm5lY3RvcnMuIEZvciBwYXJhbm9pYSwgZG91YmxlLWNoZWNrIHRoaXMuICovCkBAIC0xMjY1
MSwyMSArMTI2NjIsMjIgQEAgaW50ZWxfbW9kZXNldF9zdGFnZV9vdXRwdXRfc3RhdGUoc3RydWN0
IGRybV9kZXZpY2UgKmRldiwKIAlXQVJOX09OKHNldC0+ZmIgJiYgKHNldC0+bnVtX2Nvbm5lY3Rv
cnMgPT0gMCkpOwogCiAJZm9yX2VhY2hfaW50ZWxfY29ubmVjdG9yKGRldiwgY29ubmVjdG9yKSB7
Ci0JCS8qIE90aGVyd2lzZSB0cmF2ZXJzZSBwYXNzZWQgaW4gY29ubmVjdG9yIGxpc3QgYW5kIGdl
dCBlbmNvZGVycwotCQkgKiBmb3IgdGhlbS4gKi8KLQkJZm9yIChybyA9IDA7IHJvIDwgc2V0LT5u
dW1fY29ubmVjdG9yczsgcm8rKykgewotCQkJaWYgKHNldC0+Y29ubmVjdG9yc1tyb10gPT0gJmNv
bm5lY3Rvci0+YmFzZSkgewotCQkJCWNvbm5lY3Rvci0+bmV3X2VuY29kZXIgPSBpbnRlbF9maW5k
X2VuY29kZXIoY29ubmVjdG9yLCB0b19pbnRlbF9jcnRjKHNldC0+Y3J0YyktPnBpcGUpOwotCQkJ
CWJyZWFrOwotCQkJfQorCQlib29sIGluX21vZGVfc2V0ID0gaW50ZWxfY29ubmVjdG9yX2luX21v
ZGVfc2V0KGNvbm5lY3Rvciwgc2V0KTsKKworCQlpZiAoaW5fbW9kZV9zZXQpIHsKKwkJCWludCBw
aXBlID0gdG9faW50ZWxfY3J0YyhzZXQtPmNydGMpLT5waXBlOworCQkJY29ubmVjdG9yLT5uZXdf
ZW5jb2RlciA9CisJCQkJaW50ZWxfZmluZF9lbmNvZGVyKGNvbm5lY3RvciwgcGlwZSk7CiAJCX0K
IAorCQlpZiAoIWNvbm5lY3Rvci0+YmFzZS5lbmNvZGVyIHx8CisJCSAgICBjb25uZWN0b3ItPmJh
c2UuZW5jb2Rlci0+Y3J0YyAhPSBzZXQtPmNydGMpCisJCQljb250aW51ZTsKKwogCQkvKiBJZiB3
ZSBkaXNhYmxlIHRoZSBjcnRjLCBkaXNhYmxlIGFsbCBpdHMgY29ubmVjdG9ycy4gQWxzbywgaWYK
IAkJICogdGhlIGNvbm5lY3RvciBpcyBvbiB0aGUgY2hhbmdpbmcgY3J0YyBidXQgbm90IG9uIHRo
ZSBuZXcKIAkJICogY29ubmVjdG9yIGxpc3QsIGRpc2FibGUgaXQuICovCi0JCWlmICgoIXNldC0+
ZmIgfHwgcm8gPT0gc2V0LT5udW1fY29ubmVjdG9ycykgJiYKLQkJICAgIGNvbm5lY3Rvci0+YmFz
ZS5lbmNvZGVyICYmCi0JCSAgICBjb25uZWN0b3ItPmJhc2UuZW5jb2Rlci0+Y3J0YyA9PSBzZXQt
PmNydGMpIHsKKwkJaWYgKCFzZXQtPmZiIHx8ICFpbl9tb2RlX3NldCkgewogCQkJY29ubmVjdG9y
LT5uZXdfZW5jb2RlciA9IE5VTEw7CiAKIAkJCURSTV9ERUJVR19LTVMoIltDT05ORUNUT1I6JWQ6
JXNdIHRvIFtOT0NSVENdXG4iLApAQCAtMTI2ODIsMTIgKzEyNjk0LDEwIEBAIGludGVsX21vZGVz
ZXRfc3RhZ2Vfb3V0cHV0X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWlmICghY29u
bmVjdG9yLT5uZXdfZW5jb2RlcikKIAkJCWNvbnRpbnVlOwogCi0JCW5ld19jcnRjID0gY29ubmVj
dG9yLT5uZXdfZW5jb2Rlci0+YmFzZS5jcnRjOwotCi0JCWZvciAocm8gPSAwOyBybyA8IHNldC0+
bnVtX2Nvbm5lY3RvcnM7IHJvKyspIHsKLQkJCWlmIChzZXQtPmNvbm5lY3RvcnNbcm9dID09ICZj
b25uZWN0b3ItPmJhc2UpCi0JCQkJbmV3X2NydGMgPSBzZXQtPmNydGM7Ci0JCX0KKwkJaWYgKGlu
dGVsX2Nvbm5lY3Rvcl9pbl9tb2RlX3NldChjb25uZWN0b3IsIHNldCkpCisJCQluZXdfY3J0YyA9
IHNldC0+Y3J0YzsKKwkJZWxzZQorCQkJbmV3X2NydGMgPSBjb25uZWN0b3ItPm5ld19lbmNvZGVy
LT5iYXNlLmNydGM7CiAKIAkJLyogTWFrZSBzdXJlIHRoZSBuZXcgQ1JUQyB3aWxsIHdvcmsgd2l0
aCB0aGUgZW5jb2RlciAqLwogCQlpZiAoIWRybV9lbmNvZGVyX2NydGNfb2soJmNvbm5lY3Rvci0+
bmV3X2VuY29kZXItPmJhc2UsCi0tIAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz
dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s
aXN0aW5mby9pbnRlbC1nZngK