From: Chandra Konduru Subject: [PATCH 08/21] drm/i915: Add helper function to update scaler_users in crtc_state Date: Sat, 14 Mar 2015 22:55:33 -0700 Message-ID: <1426398946-5900-9-git-send-email-chandra.konduru@intel.com> References: <1426398946-5900-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 18E056E342 for ; Sat, 14 Mar 2015 22:56:30 -0700 (PDT) In-Reply-To: <1426398946-5900-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: ander.conselvan.de.oliveira@intel.com, daniel.vetter@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhpcyBoZWxwZXIgZnVuY3Rpb24gc3RhZ2VzIGEgc2NhbGVyIHJlcXVlc3QgZm9yIGEgcGxhbmUv Y3J0YyBpbnRvCmNydGNfc3RhdGUtPnNjYWxlcl91c2VycyAod2hpY2ggaXMgYSBiaXQgZmllbGQp LiBJdCBhbHNvIHBlcmZvcm1zCnJlcXVpcmVkIGNoZWNrcyBiZWZvcmUgc3RhZ2luZyBhbnkgY2hh bmdlIGludG8gc2NhbGVyX3N0YXRlLgoKU2lnbmVkLW9mZi1ieTogQ2hhbmRyYSBLb25kdXJ1IDxj aGFuZHJhLmtvbmR1cnVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYyB8ICAxNDIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgICAgMyArCiAyIGZpbGVzIGNoYW5n ZWQsIDE0NSBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDU1OTEyODIuLjBlYjEyMGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTEyMzU2LDYgKzEyMzU2LDE0OCBAQCBpbnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCX0KIH0KIAorLyoKKyAqIFVwZGF0ZSBjcnRjX3N0YXRlLT5zY2Fs ZXJfdXNlcnMgZm9yIHJlcXVlc3RlZCBwbGFuZSBvciBjcnRjIGJhc2VkIG9uIHN0YXRlLgorICoK KyAqIHBsYW5lIChpbikKKyAqICAgICBOVUxMIC0gZm9yIGNydGMKKyAqICAgICBub3QgTlVMTCAt IGZvciBwbGFuZQorICogUmV0dXJuCisgKiAgICAgMCAtIHNjYWxlcl91c2FnZSB1cGRhdGVkIHN1 Y2Nlc3NmdWxseQorICogICAgZXJyb3IgLSByZXF1ZXN0ZWQgc2NhbGluZyBjYW5ub3QgYmUgc3Vw cG9ydGVkIG9yIG90aGVyIGVycm9yIGNvbmRpdGlvbgorICovCitpbnQKK3NrbF91cGRhdGVfc2Nh bGVyX3VzZXJzKAorCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLCBzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5l LCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKQoreworCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBpbnRlbF9jcnRjLT5iYXNlLmRldjsKKwlpbnQgbmVlZF9zY2FsaW5nOwor CWludCBpZHg7CisJaW50IHNyY193LCBzcmNfaCwgZHN0X3csIGRzdF9oOworCWludCBzY2FsZXJf aWQ7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmI7CisJc3RydWN0IGludGVsX2NydGNfc2Nh bGVyX3N0YXRlICpzY2FsZXJfc3RhdGU7CisJc3RydWN0IGludGVsX3NjYWxlciAqc2NhbGVyOwor CisJaWYgKCFpbnRlbF9jcnRjIHx8ICFjcnRjX3N0YXRlIHx8IElOVEVMX0lORk8oZGV2KS0+Z2Vu IDwgOSB8fAorCQkoaW50ZWxfcGxhbmUgJiYgaW50ZWxfcGxhbmUtPmJhc2UudHlwZSA9PSBEUk1f UExBTkVfVFlQRV9DVVJTT1IpKQorCQlyZXR1cm4gMDsKKworCXNjYWxlcl9zdGF0ZSA9ICZjcnRj X3N0YXRlLT5zY2FsZXJfc3RhdGU7CisJc2NhbGVyID0gJnNjYWxlcl9zdGF0ZS0+c2NhbGVyc1sw XTsKKworCWlmICghc2NhbGVyX3N0YXRlLT5udW1fc2NhbGVycykgeworCQlEUk1fREVCVUdfS01T KCJjcnRjX3N0YXRlID0gJXAsIG51bV9zY2FsZXJzID0gJWRcbiIsIGNydGNfc3RhdGUsCisJCQlz Y2FsZXJfc3RhdGUtPm51bV9zY2FsZXJzKTsKKwkJcmV0dXJuIDA7CisJfQorCisJaWR4ID0gaW50 ZWxfcGxhbmUgPyBkcm1fcGxhbmVfaW5kZXgoJmludGVsX3BsYW5lLT5iYXNlKSA6IFNLTF9DUlRD X0lOREVYOworCWZiID0gaW50ZWxfcGxhbmUgPyBwbGFuZV9zdGF0ZS0+YmFzZS5mYiA6IE5VTEw7 CisKKwlpZiAoaW50ZWxfcGxhbmUpIHsKKwkJc3JjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVf c3RhdGUtPnNyYykgPj4gMTY7CisJCXNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZwbGFuZV9zdGF0 ZS0+c3JjKSA+PiAxNjsKKwkJZHN0X3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUtPmRz dCk7CisJCWRzdF9oID0gZHJtX3JlY3RfaGVpZ2h0KCZwbGFuZV9zdGF0ZS0+ZHN0KTsKKwkJc2Nh bGVyX2lkID0gcGxhbmVfc3RhdGUtPnNjYWxlcl9pZDsKKwl9IGVsc2UgeworCQlzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZSA9CisJCQkmY3J0Y19zdGF0ZS0+YmFzZS5hZGp1 c3RlZF9tb2RlOworCQlzcmNfdyA9IGNydGNfc3RhdGUtPnBpcGVfc3JjX3c7CisJCXNyY19oID0g Y3J0Y19zdGF0ZS0+cGlwZV9zcmNfaDsKKwkJZHN0X3cgPSBhZGp1c3RlZF9tb2RlLT5oZGlzcGxh eTsKKwkJZHN0X2ggPSBhZGp1c3RlZF9tb2RlLT52ZGlzcGxheTsKKwkJc2NhbGVyX2lkID0gc2Nh bGVyX3N0YXRlLT5zY2FsZXJfaWQ7CisJfQorCW5lZWRfc2NhbGluZyA9IChzcmNfdyAhPSBkc3Rf dyB8fCBzcmNfaCAhPSBkc3RfaCk7CisKKwkvKgorCSAqIGlmIHBsYW5lIGlzIGJlaW5nIGRpc2Fi bGVkIG9yIHNjYWxlciBpcyBubyBtb3JlIHJlcXVpcmVkCisJICogIC0gZnJlZSBzY2FsZXIgYmlu ZGVkIHRvIHRoaXMgcGxhbmUvY3J0YworCSAqICAtIGluIG9yZGVyIHRvIGRvIHRoaXMsIHVwZGF0 ZSBjcnRjLT5zY2FsZXJfdXNhZ2UKKwkgKgorCSAqIEhlcmUgc2NhbGVyIHN0YXRlIGluIGNydGNf c3RhdGUgaXMgc2V0IGZyZWUgc28gdGhhdAorCSAqIHNjYWxlciBjYW4gYmUgYXNzaWduZWQgdG8g b3RoZXIgdXNlci4gQWN0dWFsIHJlZ2lzdGVyCisJICogdXBkYXRlIHRvIGZyZWUgdGhlIHNjYWxl ciBpcyBkb25lIGluIHBsYW5lL3BhbmVsLWZpdCBwcm9ncmFtbWluZy4KKwkgKiBGb3IgdGhpcyBw dXJwb3NlIGNydGMvcGxhbmVfc3RhdGUtPnNjYWxlcl9pZCBpc24ndCByZXNldCBoZXJlLgorCSAq LworCWlmICghbmVlZF9zY2FsaW5nIHx8IChpbnRlbF9wbGFuZSAmJiAoIWZiIHx8ICFwbGFuZV9z dGF0ZS0+dmlzaWJsZSkpKSB7CisJCWlmIChzY2FsZXJfaWQgPj0gMCkgeworCQkJc2NhbGVyX3N0 YXRlLT5zY2FsZXJfdXNlcnMgJj0gfigxIDw8IGlkeCk7CisJCQlzY2FsZXJfc3RhdGUtPnNjYWxl cnNbc2NhbGVyX2lkXS5pbl91c2UgPSAwOworCisJCQlEUk1fREVCVUdfS01TKCJTdGFnZWQgZnJl ZWluZyBzY2FsZXIgaWQgJXUuJXUgZnJvbSAlczolZCAiCisJCQkJImNydGNfc3RhdGUgPSAlcCBz Y2FsZXJfdXNlcnMgPSAweCV4XG4iLAorCQkJCWludGVsX2NydGMtPnBpcGUsIHNjYWxlcl9pZCwg aW50ZWxfcGxhbmUgPyAiUExBTkUiIDogIkNSVEMiLAorCQkJCWludGVsX3BsYW5lID8gaW50ZWxf cGxhbmUtPmJhc2UuYmFzZS5pZCA6CisJCQkJaW50ZWxfY3J0Yy0+YmFzZS5iYXNlLmlkLCBjcnRj X3N0YXRlLAorCQkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyX3VzZXJzKTsKKwkJfQorCQlyZXR1cm4g MDsKKwl9CisKKwkvKgorCSAqIGNoZWNrIGZvciByZWN0IHNpemU6CisJICogICAgIG1pbiBzaXpl cyBpbiBjYXNlIG9mIHNjYWxpbmcgaW52b2x2ZWQKKwkgKiAgICAgbWF4IHNpemVzIGluIGFsbCBj YXNlcworCSAqLworCWlmICgobmVlZF9zY2FsaW5nICYmCisJCShzcmNfdyA8IHNjYWxlci0+bWlu X3NyY193IHx8IHNyY19oIDwgc2NhbGVyLT5taW5fc3JjX2ggfHwKKwkJIGRzdF93IDwgc2NhbGVy LT5taW5fZHN0X3cgfHwgZHN0X2ggPCBzY2FsZXItPm1pbl9kc3RfaCkpIHx8CisKKwkJIHNyY193 ID4gc2NhbGVyLT5tYXhfc3JjX3cgfHwgc3JjX2ggPiBzY2FsZXItPm1heF9zcmNfaCB8fAorCQkg ZHN0X3cgPiBzY2FsZXItPm1heF9kc3RfdyB8fCBkc3RfaCA+IHNjYWxlci0+bWF4X2RzdF9oKSB7 CisJCURSTV9ERUJVR19LTVMoIiVzOiVkIHNjYWxlcl91c2VyIGluZGV4ICV1LiV1OiBzcmMgJXV4 JXUgZHN0ICV1eCV1ICIKKwkJCSJzaXplIGlzIG91dCBvZiBzY2FsZXIgcmFuZ2VcbiIsCisJCQlp bnRlbF9wbGFuZSA/ICJQTEFORSIgOiAiQ1JUQyIsCisJCQlpbnRlbF9wbGFuZSA/IGludGVsX3Bs YW5lLT5iYXNlLmJhc2UuaWQgOiBpbnRlbF9jcnRjLT5iYXNlLmJhc2UuaWQsCisJCQlpbnRlbF9j cnRjLT5waXBlLCBpZHgsIHNyY193LCBzcmNfaCwgZHN0X3csIGRzdF9oKTsKKwkJcmV0dXJuIC1F SU5WQUw7CisJfQorCisJLyogY2hlY2sgY29sb3JrZXkgKi8KKwlpZiAoaW50ZWxfcGxhbmUgJiYg bmVlZF9zY2FsaW5nICYmIGludGVsX2NvbG9ya2V5X2VuYWJsZWQoaW50ZWxfcGxhbmUpKSB7CisJ CURSTV9ERUJVR19LTVMoIlBMQU5FOiVkIHNjYWxpbmcgd2l0aCBjb2xvciBrZXkgbm90IGFsbG93 ZWQiLAorCQkJaW50ZWxfcGxhbmUtPmJhc2UuYmFzZS5pZCk7CisJCXJldHVybiAtRUlOVkFMOwor CX0KKworCS8qIENoZWNrIHNyYyBmb3JtYXQgKi8KKwlpZiAoaW50ZWxfcGxhbmUgJiYgbmVlZF9z Y2FsaW5nKSB7CisJCXN3aXRjaCAoZmItPnBpeGVsX2Zvcm1hdCkgeworCQljYXNlIERSTV9GT1JN QVRfUkdCNTY1OgorCQljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6CisJCWNhc2UgRFJNX0ZPUk1B VF9YUkdCODg4ODoKKwkJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgorCQljYXNlIERSTV9GT1JN QVRfQVJHQjg4ODg6CisJCWNhc2UgRFJNX0ZPUk1BVF9YUkdCMjEwMTAxMDoKKwkJY2FzZSBEUk1f Rk9STUFUX0FSR0IyMTAxMDEwOgorCQljYXNlIERSTV9GT1JNQVRfWEJHUjIxMDEwMTA6CisJCWNh c2UgRFJNX0ZPUk1BVF9BQkdSMjEwMTAxMDoKKwkJY2FzZSBEUk1fRk9STUFUX1lVWVY6CisJCWNh c2UgRFJNX0ZPUk1BVF9ZVllVOgorCQljYXNlIERSTV9GT1JNQVRfVVlWWToKKwkJY2FzZSBEUk1f Rk9STUFUX1ZZVVk6CisJCQlicmVhazsKKwkJZGVmYXVsdDoKKwkJCURSTV9ERUJVR19LTVMoIlBM QU5FOiVkIEZCOiVkIGZvcm1hdCAweCV4IG5vdCBzdXBwb3J0ZWRcbiIsCisJCQkJaW50ZWxfcGxh bmUtPmJhc2UuYmFzZS5pZCwgZmItPmJhc2UuaWQsIGZiLT5waXhlbF9mb3JtYXQpOworCQkJcmV0 dXJuIC1FSU5WQUw7CisJCX0KKwl9CisKKwkvKiBtYXJrIHRoaXMgcGxhbmUgYXMgYSBzY2FsZXIg dXNlciBpbiBjcnRjX3N0YXRlICovCisJc2NhbGVyX3N0YXRlLT5zY2FsZXJfdXNlcnMgfD0gKDEg PDwgaWR4KTsKKwlEUk1fREVCVUdfS01TKCIlczolZCBzdGFnZWQgc2NhbGluZyByZXF1ZXN0IGZv ciAldXgldS0+JXV4JXUgIgorCQkiY3J0Y19zdGF0ZSA9ICVwIHNjYWxlcl91c2VycyA9IDB4JXhc biIsCisJCWludGVsX3BsYW5lID8gIlBMQU5FIiA6ICJDUlRDIiwKKwkJaW50ZWxfcGxhbmUgPyBp bnRlbF9wbGFuZS0+YmFzZS5iYXNlLmlkIDogaW50ZWxfY3J0Yy0+YmFzZS5iYXNlLmlkLAorCQlz cmNfdywgc3JjX2gsIGRzdF93LCBkc3RfaCwgY3J0Y19zdGF0ZSwgc2NhbGVyX3N0YXRlLT5zY2Fs ZXJfdXNlcnMpOworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19wcmlt YXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgaW50ZWxfcGxh bmVfc3RhdGUgKnN0YXRlKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkOWEzYjY0Li5i NTZiYWJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTEzOCw2ICsxMTM4LDkgQEAg dm9pZCBpbnRlbF9tb2RlX2Zyb21fcGlwZV9jb25maWcoc3RydWN0IGRybV9kaXNwbGF5X21vZGUg Km1vZGUsCiAJCQkJIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZyk7CiB2b2lk IGludGVsX2NydGNfd2FpdF9mb3JfcGVuZGluZ19mbGlwcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMp Owogdm9pZCBpbnRlbF9tb2Rlc2V0X3ByZWNsb3NlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0 cnVjdCBkcm1fZmlsZSAqZmlsZSk7CitpbnQgc2tsX3VwZGF0ZV9zY2FsZXJfdXNlcnMoc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMsCisJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUsIHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUsCisJc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiAKIC8qIGludGVsX2RwLmMgKi8KIHZvaWQgaW50ZWxf ZHBfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgb3V0cHV0X3JlZywgZW51bSBwb3J0 IHBvcnQpOwotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK