From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 06/24] drm/i915: Clean up intel_atomic_setup_scalers slightly. Date: Mon, 1 Jun 2015 15:27:09 +0200 Message-ID: <1433165247-15928-7-git-send-email-maarten.lankhorst@linux.intel.com> References: <1433165247-15928-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTP id AFCDE6E5FE for ; Mon, 1 Jun 2015 06:27:44 -0700 (PDT) In-Reply-To: <1433165247-15928-1-git-send-email-maarten.lankhorst@linux.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 List-Id: intel-gfx@lists.freedesktop.org R2V0IHJpZCBvZiBhIHdob2xlIGxvdCBvZiB0ZXJuYXJ5IG9wZXJhdG9ycyBhbmQgYXNzaWduIHRo ZSBpbmRleAppbiBzY2FsZXJfaWQsIGluc3RlYWQgb2YgdGhlIGlkLiBUaGV5J3JlIHRoZSBzYW1l IHRoaW5nLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hv cnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t aWMuYyAgfCAyMSArKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8ICAyIC0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAg ICAgfCAgMSAtCiAzIGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMKaW5kZXggMTdiZjllODBjNTU3Li4x NTZkZjFiNTlkZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21p Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCkBAIC0zMDksMTUg KzMwOSwyMyBAQCBpbnQgaW50ZWxfYXRvbWljX3NldHVwX3NjYWxlcnMoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkvKiB3YWxrdGhyb3VnaCBzY2FsZXJfdXNlcnMgYml0cyBhbmQgc3RhcnQgYXNz aWduaW5nIHNjYWxlcnMgKi8KIAlmb3IgKGkgPSAwOyBpIDwgc2l6ZW9mKHNjYWxlcl9zdGF0ZS0+ c2NhbGVyX3VzZXJzKSAqIDg7IGkrKykgewogCQlpbnQgKnNjYWxlcl9pZDsKKwkJY29uc3QgY2hh ciAqbmFtZTsKKwkJaW50IGlkeDsKIAogCQkvKiBza2lwIGlmIHNjYWxlciBub3QgcmVxdWlyZWQg Ki8KIAkJaWYgKCEoc2NhbGVyX3N0YXRlLT5zY2FsZXJfdXNlcnMgJiAoMSA8PCBpKSkpCiAJCQlj b250aW51ZTsKIAogCQlpZiAoaSA9PSBTS0xfQ1JUQ19JTkRFWCkgeworCQkJbmFtZSA9ICJDUlRD IjsKKwkJCWlkeCA9IGludGVsX2NydGMtPmJhc2UuYmFzZS5pZDsKKwogCQkJLyogcGFuZWwgZml0 dGVyIGNhc2U6IGFzc2lnbiBhcyBhIGNydGMgc2NhbGVyICovCiAJCQlzY2FsZXJfaWQgPSAmc2Nh bGVyX3N0YXRlLT5zY2FsZXJfaWQ7CiAJCX0gZWxzZSB7CisJCQluYW1lID0gIlBMQU5FIjsKKwkJ CWlkeCA9IHBsYW5lLT5iYXNlLmlkOworCiAJCQlpZiAoIWRybV9zdGF0ZSkKIAkJCQljb250aW51 ZTsKIApAQCAtMzU2LDIzICszNjQsMTYgQEAgaW50IGludGVsX2F0b21pY19zZXR1cF9zY2FsZXJz KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQlmb3IgKGogPSAwOyBqIDwgaW50ZWxfY3J0Yy0+ bnVtX3NjYWxlcnM7IGorKykgewogCQkJCWlmICghc2NhbGVyX3N0YXRlLT5zY2FsZXJzW2pdLmlu X3VzZSkgewogCQkJCQlzY2FsZXJfc3RhdGUtPnNjYWxlcnNbal0uaW5fdXNlID0gMTsKLQkJCQkJ KnNjYWxlcl9pZCA9IHNjYWxlcl9zdGF0ZS0+c2NhbGVyc1tqXS5pZDsKKwkJCQkJKnNjYWxlcl9p ZCA9IGo7CiAJCQkJCURSTV9ERUJVR19LTVMoIkF0dGFjaGVkIHNjYWxlciBpZCAldS4ldSB0byAl czolZFxuIiwKLQkJCQkJCWludGVsX2NydGMtPnBpcGUsCi0JCQkJCQlpID09IFNLTF9DUlRDX0lO REVYID8gc2NhbGVyX3N0YXRlLT5zY2FsZXJfaWQgOgotCQkJCQkJCXBsYW5lX3N0YXRlLT5zY2Fs ZXJfaWQsCi0JCQkJCQlpID09IFNLTF9DUlRDX0lOREVYID8gIkNSVEMiIDogIlBMQU5FIiwKLQkJ CQkJCWkgPT0gU0tMX0NSVENfSU5ERVggPyAgaW50ZWxfY3J0Yy0+YmFzZS5iYXNlLmlkIDoKLQkJ CQkJCXBsYW5lLT5iYXNlLmlkKTsKKwkJCQkJCWludGVsX2NydGMtPnBpcGUsICpzY2FsZXJfaWQs IG5hbWUsIGlkeCk7CiAJCQkJCWJyZWFrOwogCQkJCX0KIAkJCX0KIAkJfQogCiAJCWlmIChXQVJO X09OKCpzY2FsZXJfaWQgPCAwKSkgewotCQkJRFJNX0RFQlVHX0tNUygiQ2Fubm90IGZpbmQgc2Nh bGVyIGZvciAlczolZFxuIiwKLQkJCQlpID09IFNLTF9DUlRDX0lOREVYID8gIkNSVEMiIDogIlBM QU5FIiwKLQkJCQlpID09IFNLTF9DUlRDX0lOREVYID8gaW50ZWxfY3J0Yy0+YmFzZS5iYXNlLmlk OnBsYW5lLT5iYXNlLmlkKTsKKwkJCURSTV9ERUJVR19LTVMoIkNhbm5vdCBmaW5kIHNjYWxlciBm b3IgJXM6JWRcbiIsIG5hbWUsIGlkeCk7CiAJCQljb250aW51ZTsKIAkJfQogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMGY3NWIxZTIwNmY2Li42ZjNlOTY5MzBkYTUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEzNzE0LDggKzEzNzE0LDYgQEAg c3RhdGljIHZvaWQgc2tsX2luaXRfc2NhbGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3IKIAlmb3IgKGkgPSAwOyBpIDwgaW50ZWxfY3J0Yy0+bnVt X3NjYWxlcnM7IGkrKykgewogCQlpbnRlbF9zY2FsZXIgPSAmc2NhbGVyX3N0YXRlLT5zY2FsZXJz W2ldOwogCQlpbnRlbF9zY2FsZXItPmluX3VzZSA9IDA7Ci0JCWludGVsX3NjYWxlci0+aWQgPSBp OwotCiAJCWludGVsX3NjYWxlci0+bW9kZSA9IFBTX1NDQUxFUl9NT0RFX0RZTjsKIAl9CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZWM3MjFlMzFlYWU4Li4xZDlmZWI4NzI3ZWEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0yODIsNyArMjgyLDYgQEAgc3RydWN0IGludGVs X2luaXRpYWxfcGxhbmVfY29uZmlnIHsKICNkZWZpbmUgU0tMX01BWF9EU1RfSCA0MDk2CiAKIHN0 cnVjdCBpbnRlbF9zY2FsZXIgewotCWludCBpZDsKIAlpbnQgaW5fdXNlOwogCXVpbnQzMl90IG1v ZGU7CiB9OwotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==