From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chandra Konduru Subject: [PATCH] drm/i915: Make scaler_id check in check_crtc_state work for all gens Date: Mon, 11 May 2015 14:35:47 -0700 Message-ID: <1431380147-17877-1-git-send-email-chandra.konduru@intel.com> References: <1431047764-29950-1-git-send-email-chandra.konduru@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 4642D6E28D for ; Mon, 11 May 2015 14:36:38 -0700 (PDT) In-Reply-To: <1431047764-29950-1-git-send-email-chandra.konduru@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: daniel.vetter@intel.com List-Id: intel-gfx@lists.freedesktop.org RHVyaW5nIGNoZWNrX2NydGNfc3RhdGUsIHNjYWxlcl9pZCBtaXNwYXRjaCBpcyBiZWluZyByZXBv cnRlZCBmb3IgSFNXLgpUaGlzIGlzIGFwcGxpY2FibGUgZm9yIHNrbCsgYW5kIG5vdCBmb3IgSFNX LiBJdCBpcyBpbnRyb2R1Y2VkIGJ5CmNvbW1pdCBpZDoKICAgIGNvbW1pdCBhMWIyMjc4ZTRkZmNk MmRiZWE4NWUzMTllYmY3M2E2YjdiMmYxODBiCiAgICBBdXRob3I6IENoYW5kcmEgS29uZHVydSA8 Y2hhbmRyYS5rb25kdXJ1QGludGVsLmNvbT4KICAgIERhdGU6ICAgVHVlIEFwciA3IDE1OjI4OjQ1 IDIwMTUgLTA3MDAKCiAgICAgICAgZHJtL2k5MTU6IHNreWxha2UgcGFuZWwgZml0dGluZyB1c2lu ZyBzaGFyZWQgc2NhbGVycwoKVGhpcyBwYXRjaCB3aWxsIG1ha2Ugc3VyZSB0aGF0IHdlIGxlYXZl IHNjYWxlcl9pZCBhcyAwIGZvciBwbGF0Zm9ybXMKYmVmb3JlIHNrbCBhbmQgc2V0IGZvciBza2wr IG9ubHkuIFRoaXMgd2F5IHNjYWxlcl9pZCBjaGVjayBkdXJpbmcKY2hlY2tfY3J0Y19zdGF0ZSB3 aWxsIHBhc3MgZm9yIGJvdGggcHJpb3IgdG8gc2tsIGFuZCBza2wrIHBsYXRmb3Jtcy4KCnYyOgot TGVhdmUgc2NhbGVyX2lkIGFzIDAgZm9yIGdlbiA8IDkgKERhbmllbCkKClNpZ25lZC1vZmYtYnk6 IENoYW5kcmEgS29uZHVydSA8Y2hhbmRyYS5rb25kdXJ1QGludGVsLmNvbT4KUmVmZXJlbmNlczog aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZlcy9pbnRlbC1nZngvMjAxNS1NYXkv MDY1NzQxLmh0bWwKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAg IDE2ICsrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBjMjk3 Y2RjLi41YzlmMzU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC05MzUx LDYgKzkzNTEsMTIgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9nZXRfcGlwZV9jb25maWcoc3RydWN0 IGludGVsX2NydGMgKmNydGMsCiAJfQogCiAJcGZpdF9kb21haW4gPSBQT1dFUl9ET01BSU5fUElQ RV9QQU5FTF9GSVRURVIoY3J0Yy0+cGlwZSk7CisKKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4g Pj0gOSkgeworCQlwaXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl9pZCA9IC0xOworCQlw aXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl91c2VycyAmPSB+KDEgPDwgU0tMX0NSVENf SU5ERVgpOworCX0KKwogCWlmIChpbnRlbF9kaXNwbGF5X3Bvd2VyX2lzX2VuYWJsZWQoZGV2X3By aXYsIHBmaXRfZG9tYWluKSkgewogCQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gOSkKIAkJ CXNreWxha2VfZ2V0X3BmaXRfY29uZmlnKGNydGMsIHBpcGVfY29uZmlnKTsKQEAgLTkzNTgsMTAg KzkzNjQsNiBAQCBzdGF0aWMgYm9vbCBoYXN3ZWxsX2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAkJCWlyb25sYWtlX2dldF9wZml0X2NvbmZpZyhjcnRjLCBwaXBlX2Nv bmZpZyk7CiAJCWVsc2UKIAkJCU1JU1NJTkdfQ0FTRShJTlRFTF9JTkZPKGRldiktPmdlbik7Ci0K LQl9IGVsc2UgewotCQlwaXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl9pZCA9IC0xOwot CQlwaXBlX2NvbmZpZy0+c2NhbGVyX3N0YXRlLnNjYWxlcl91c2VycyAmPSB+KDEgPDwgU0tMX0NS VENfSU5ERVgpOwogCX0KIAogCWlmIChJU19IQVNXRUxMKGRldikpCkBAIC0xMzI0OCw4ICsxMzI1 MCw4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0 ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXByaW1hcnktPm1heF9kb3duc2NhbGUgPSAxOwog CWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7CiAJCXByaW1hcnktPmNhbl9zY2FsZSA9 IHRydWU7CisJCXN0YXRlLT5zY2FsZXJfaWQgPSAtMTsKIAl9Ci0Jc3RhdGUtPnNjYWxlcl9pZCA9 IC0xOwogCXByaW1hcnktPnBpcGUgPSBwaXBlOwogCXByaW1hcnktPnBsYW5lID0gcGlwZTsKIAlw cmltYXJ5LT5jaGVja19wbGFuZSA9IGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmU7CkBAIC0xMzQz MSw3ICsxMzQzMyw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5lICppbnRlbF9jdXJzb3JfcGxh bmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJY3Vyc29yLT5tYXhfZG93bnNjYWxl ID0gMTsKIAljdXJzb3ItPnBpcGUgPSBwaXBlOwogCWN1cnNvci0+cGxhbmUgPSBwaXBlOwotCXN0 YXRlLT5zY2FsZXJfaWQgPSAtMTsKIAljdXJzb3ItPmNoZWNrX3BsYW5lID0gaW50ZWxfY2hlY2tf Y3Vyc29yX3BsYW5lOwogCWN1cnNvci0+Y29tbWl0X3BsYW5lID0gaW50ZWxfY29tbWl0X2N1cnNv cl9wbGFuZTsKIAljdXJzb3ItPmRpc2FibGVfcGxhbmUgPSBpbnRlbF9kaXNhYmxlX2N1cnNvcl9w bGFuZTsKQEAgLTEzNDU0LDYgKzEzNDU1LDkgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxhbmUgKmlu dGVsX2N1cnNvcl9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQlzdGF0 ZS0+YmFzZS5yb3RhdGlvbik7CiAJfQogCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49OSkK KwkJc3RhdGUtPnNjYWxlcl9pZCA9IC0xOworCiAJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmN1cnNv ci0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CiAKIAlyZXR1cm4gJmN1cnNvci0+ YmFzZTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==