From: Chandra Konduru Subject: [PATCH 08/21 v3] drm/i915: Add helper function to update scaler_users in crtc_state Date: Wed, 25 Mar 2015 16:21:26 -0700 Message-ID: <1427325686-29959-1-git-send-email-chandra.konduru@intel.com> References: <1426896282-23215-9-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D11D6E958 for ; Wed, 25 Mar 2015 16:22:02 -0700 (PDT) In-Reply-To: <1426896282-23215-9-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 bmdlIGludG8gc2NhbGVyX3N0YXRlLgoKdjI6Ci11cGRhdGVzIHRvIHVzZSBzaW5nbGUgY29weSBv ZiBzY2FsZXIgbGltaXRzIChNYXR0KQotYWRkZWQgZm9yY2UgZGV0YWNoIHBhcmFtZXRlciBmb3Ig cGZpdCBkaXNhYmxlIHB1cnBvc2UgKG1lKQoKdjM6Ci11cGRhdGVkIGZ1bmN0aW9uIGhlYWRlciB0 byBrZXJuZWxkb2MgZm9ybWF0IChNYXR0KQotZHJvcHBlZCBuZWVkX3NjYWxpbmcgY2hlY2tzIChN YXR0KQoKU2lnbmVkLW9mZi1ieTogQ2hhbmRyYSBLb25kdXJ1IDxjaGFuZHJhLmtvbmR1cnVAaW50 ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICAxNDMg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggICAgIHwgICAgMyArCiAyIGZpbGVzIGNoYW5nZWQsIDE0NiBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDI5ZDQ2ZmMuLjVjMzY1 ZjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMzg3LDYgKzEyMzg3 LDE0OSBAQCBpbnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog CX0KIH0KIAorLyoqCisgKiBza2xfdXBkYXRlX3NjYWxlcl91c2VycyAtIFN0YWdlcyB1cGRhdGUg dG8gY3J0YydzIHNjYWxlciBzdGF0ZQorICogQGludGVsX2NydGM6IGNydGMKKyAqIEBjcnRjX3N0 YXRlOiBjcnRjX3N0YXRlCisgKiBAcGxhbmU6IHBsYW5lIChOVUxMIGluZGljYXRlcyBjcnRjIGlz IHJlcXVlc3RpbmcgdXBkYXRlKQorICogQHBsYW5lX3N0YXRlOiBwbGFuZSdzIHN0YXRlCisgKiBA Zm9yY2VfZGV0YWNoOiByZXF1ZXN0IHVuY29uZGl0aW9uYWwgZGV0YWNobWVudCBvZiBzY2FsZXIK KyAqCisgKiBUaGlzIGZ1bmN0aW9uIHVwZGF0ZXMgc2NhbGVyIHN0YXRlIGZvciByZXF1ZXN0ZWQg cGxhbmUgb3IgY3J0Yy4KKyAqIFRvIHJlcXVlc3Qgc2NhbGVyIHVzYWdlIHVwZGF0ZSBmb3IgYSBw bGFuZSwgY2FsbGVyIHNoYWxsIHBhc3MgcGxhbmUgcG9pbnRlci4KKyAqIFRvIHJlcXVlc3Qgc2Nh bGVyIHVzYWdlIHVwZGF0ZSBmb3IgY3J0YywgY2FsbGVyIHNoYWxsIHBhc3MgcGxhbmUgcG9pbnRl cgorICogYXMgTlVMTC4KKyAqCisgKiBSZXR1cm4KKyAqICAgICAwIC0gc2NhbGVyX3VzYWdlIHVw ZGF0ZWQgc3VjY2Vzc2Z1bGx5CisgKiAgICBlcnJvciAtIHJlcXVlc3RlZCBzY2FsaW5nIGNhbm5v dCBiZSBzdXBwb3J0ZWQgb3Igb3RoZXIgZXJyb3IgY29uZGl0aW9uCisgKi8KK2ludAorc2tsX3Vw ZGF0ZV9zY2FsZXJfdXNlcnMoCisJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsIHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50 ZWxfcGxhbmUsIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCisJaW50IGZv cmNlX2RldGFjaCkKK3sKKwlpbnQgbmVlZF9zY2FsaW5nOworCWludCBpZHg7CisJaW50IHNyY193 LCBzcmNfaCwgZHN0X3csIGRzdF9oOworCWludCBzY2FsZXJfaWQ7CisJc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmI7CisJc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3Rh dGU7CisKKwlpZiAoIWludGVsX2NydGMgfHwgIWNydGNfc3RhdGUgfHwKKwkJKGludGVsX3BsYW5l ICYmIGludGVsX3BsYW5lLT5iYXNlLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKSkKKwkJ cmV0dXJuIDA7CisKKwlzY2FsZXJfc3RhdGUgPSAmY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRlOwor CisJaWYgKCFzY2FsZXJfc3RhdGUtPm51bV9zY2FsZXJzKSB7CisJCURSTV9ERUJVR19LTVMoImNy dGNfc3RhdGUgPSAlcCwgbnVtX3NjYWxlcnMgPSAlZFxuIiwgY3J0Y19zdGF0ZSwKKwkJCXNjYWxl cl9zdGF0ZS0+bnVtX3NjYWxlcnMpOworCQlyZXR1cm4gMDsKKwl9CisKKwlpZHggPSBpbnRlbF9w bGFuZSA/IGRybV9wbGFuZV9pbmRleCgmaW50ZWxfcGxhbmUtPmJhc2UpIDogU0tMX0NSVENfSU5E RVg7CisJZmIgPSBpbnRlbF9wbGFuZSA/IHBsYW5lX3N0YXRlLT5iYXNlLmZiIDogTlVMTDsKKwor CWlmIChpbnRlbF9wbGFuZSkgeworCQlzcmNfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0 ZS0+c3JjKSA+PiAxNjsKKwkJc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5z cmMpID4+IDE2OworCQlkc3RfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+ZHN0KTsK KwkJZHN0X2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5kc3QpOworCQlzY2FsZXJf aWQgPSBwbGFuZV9zdGF0ZS0+c2NhbGVyX2lkOworCX0gZWxzZSB7CisJCXN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KKwkJCSZjcnRjX3N0YXRlLT5iYXNlLmFkanVzdGVk X21vZGU7CisJCXNyY193ID0gY3J0Y19zdGF0ZS0+cGlwZV9zcmNfdzsKKwkJc3JjX2ggPSBjcnRj X3N0YXRlLT5waXBlX3NyY19oOworCQlkc3RfdyA9IGFkanVzdGVkX21vZGUtPmhkaXNwbGF5Owor CQlkc3RfaCA9IGFkanVzdGVkX21vZGUtPnZkaXNwbGF5OworCQlzY2FsZXJfaWQgPSBzY2FsZXJf c3RhdGUtPnNjYWxlcl9pZDsKKwl9CisJbmVlZF9zY2FsaW5nID0gKHNyY193ICE9IGRzdF93IHx8 IHNyY19oICE9IGRzdF9oKTsKKworCS8qCisJICogaWYgcGxhbmUgaXMgYmVpbmcgZGlzYWJsZWQg b3Igc2NhbGVyIGlzIG5vIG1vcmUgcmVxdWlyZWQgb3IgZm9yY2UgZGV0YWNoCisJICogIC0gZnJl ZSBzY2FsZXIgYmluZGVkIHRvIHRoaXMgcGxhbmUvY3J0YworCSAqICAtIGluIG9yZGVyIHRvIGRv IHRoaXMsIHVwZGF0ZSBjcnRjLT5zY2FsZXJfdXNhZ2UKKwkgKgorCSAqIEhlcmUgc2NhbGVyIHN0 YXRlIGluIGNydGNfc3RhdGUgaXMgc2V0IGZyZWUgc28gdGhhdAorCSAqIHNjYWxlciBjYW4gYmUg YXNzaWduZWQgdG8gb3RoZXIgdXNlci4gQWN0dWFsIHJlZ2lzdGVyCisJICogdXBkYXRlIHRvIGZy ZWUgdGhlIHNjYWxlciBpcyBkb25lIGluIHBsYW5lL3BhbmVsLWZpdCBwcm9ncmFtbWluZy4KKwkg KiBGb3IgdGhpcyBwdXJwb3NlIGNydGMvcGxhbmVfc3RhdGUtPnNjYWxlcl9pZCBpc24ndCByZXNl dCBoZXJlLgorCSAqLworCWlmIChmb3JjZV9kZXRhY2ggfHwgIW5lZWRfc2NhbGluZyB8fCAoaW50 ZWxfcGxhbmUgJiYKKwkJKCFmYiB8fCAhcGxhbmVfc3RhdGUtPnZpc2libGUpKSkgeworCQlpZiAo c2NhbGVyX2lkID49IDApIHsKKwkJCXNjYWxlcl9zdGF0ZS0+c2NhbGVyX3VzZXJzICY9IH4oMSA8 PCBpZHgpOworCQkJc2NhbGVyX3N0YXRlLT5zY2FsZXJzW3NjYWxlcl9pZF0uaW5fdXNlID0gMDsK KworCQkJRFJNX0RFQlVHX0tNUygiU3RhZ2VkIGZyZWVpbmcgc2NhbGVyIGlkICV1LiV1IGZyb20g JXM6JWQgIgorCQkJCSJjcnRjX3N0YXRlID0gJXAgc2NhbGVyX3VzZXJzID0gMHgleFxuIiwKKwkJ CQlpbnRlbF9jcnRjLT5waXBlLCBzY2FsZXJfaWQsIGludGVsX3BsYW5lID8gIlBMQU5FIiA6ICJD UlRDIiwKKwkJCQlpbnRlbF9wbGFuZSA/IGludGVsX3BsYW5lLT5iYXNlLmJhc2UuaWQgOgorCQkJ CWludGVsX2NydGMtPmJhc2UuYmFzZS5pZCwgY3J0Y19zdGF0ZSwKKwkJCQlzY2FsZXJfc3RhdGUt PnNjYWxlcl91c2Vycyk7CisJCX0KKwkJcmV0dXJuIDA7CisJfQorCisJLyogcmFuZ2UgY2hlY2tz ICovCisJaWYgKHNyY193IDwgc2NhbGVyX3N0YXRlLT5taW5fc3JjX3cgfHwgc3JjX2ggPCBzY2Fs ZXJfc3RhdGUtPm1pbl9zcmNfaCB8fAorCQlkc3RfdyA8IHNjYWxlcl9zdGF0ZS0+bWluX2RzdF93 IHx8IGRzdF9oIDwgc2NhbGVyX3N0YXRlLT5taW5fZHN0X2ggfHwKKworCQlzcmNfdyA+IHNjYWxl cl9zdGF0ZS0+bWF4X3NyY193IHx8IHNyY19oID4gc2NhbGVyX3N0YXRlLT5tYXhfc3JjX2ggfHwK KwkJZHN0X3cgPiBzY2FsZXJfc3RhdGUtPm1heF9kc3RfdyB8fCBkc3RfaCA+IHNjYWxlcl9zdGF0 ZS0+bWF4X2RzdF9oKSB7CisJCURSTV9ERUJVR19LTVMoIiVzOiVkIHNjYWxlcl91c2VyIGluZGV4 ICV1LiV1OiBzcmMgJXV4JXUgZHN0ICV1eCV1ICIKKwkJCSJzaXplIGlzIG91dCBvZiBzY2FsZXIg cmFuZ2VcbiIsCisJCQlpbnRlbF9wbGFuZSA/ICJQTEFORSIgOiAiQ1JUQyIsCisJCQlpbnRlbF9w bGFuZSA/IGludGVsX3BsYW5lLT5iYXNlLmJhc2UuaWQgOiBpbnRlbF9jcnRjLT5iYXNlLmJhc2Uu aWQsCisJCQlpbnRlbF9jcnRjLT5waXBlLCBpZHgsIHNyY193LCBzcmNfaCwgZHN0X3csIGRzdF9o KTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJLyogY2hlY2sgY29sb3JrZXkgKi8KKwlpZiAo aW50ZWxfcGxhbmUgJiYgaW50ZWxfY29sb3JrZXlfZW5hYmxlZChpbnRlbF9wbGFuZSkpIHsKKwkJ RFJNX0RFQlVHX0tNUygiUExBTkU6JWQgc2NhbGluZyB3aXRoIGNvbG9yIGtleSBub3QgYWxsb3dl ZCIsCisJCQlpbnRlbF9wbGFuZS0+YmFzZS5iYXNlLmlkKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJ fQorCisJLyogQ2hlY2sgc3JjIGZvcm1hdCAqLworCWlmIChpbnRlbF9wbGFuZSkgeworCQlzd2l0 Y2ggKGZiLT5waXhlbF9mb3JtYXQpIHsKKwkJY2FzZSBEUk1fRk9STUFUX1JHQjU2NToKKwkJY2Fz ZSBEUk1fRk9STUFUX1hCR1I4ODg4OgorCQljYXNlIERSTV9GT1JNQVRfWFJHQjg4ODg6CisJCWNh c2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwkJY2FzZSBEUk1fRk9STUFUX0FSR0I4ODg4OgorCQlj YXNlIERSTV9GT1JNQVRfWFJHQjIxMDEwMTA6CisJCWNhc2UgRFJNX0ZPUk1BVF9BUkdCMjEwMTAx MDoKKwkJY2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgorCQljYXNlIERSTV9GT1JNQVRfQUJH UjIxMDEwMTA6CisJCWNhc2UgRFJNX0ZPUk1BVF9ZVVlWOgorCQljYXNlIERSTV9GT1JNQVRfWVZZ VToKKwkJY2FzZSBEUk1fRk9STUFUX1VZVlk6CisJCWNhc2UgRFJNX0ZPUk1BVF9WWVVZOgorCQkJ YnJlYWs7CisJCWRlZmF1bHQ6CisJCQlEUk1fREVCVUdfS01TKCJQTEFORTolZCBGQjolZCB1bnN1 cHBvcnRlZCBzY2FsaW5nIGZvcm1hdCAweCV4XG4iLAorCQkJCWludGVsX3BsYW5lLT5iYXNlLmJh c2UuaWQsIGZiLT5iYXNlLmlkLCBmYi0+cGl4ZWxfZm9ybWF0KTsKKwkJCXJldHVybiAtRUlOVkFM OworCQl9CisJfQorCisJLyogbWFyayB0aGlzIHBsYW5lIGFzIGEgc2NhbGVyIHVzZXIgaW4gY3J0 Y19zdGF0ZSAqLworCXNjYWxlcl9zdGF0ZS0+c2NhbGVyX3VzZXJzIHw9ICgxIDw8IGlkeCk7CisJ RFJNX0RFQlVHX0tNUygiJXM6JWQgc3RhZ2VkIHNjYWxpbmcgcmVxdWVzdCBmb3IgJXV4JXUtPiV1 eCV1ICIKKwkJImNydGNfc3RhdGUgPSAlcCBzY2FsZXJfdXNlcnMgPSAweCV4XG4iLAorCQlpbnRl bF9wbGFuZSA/ICJQTEFORSIgOiAiQ1JUQyIsCisJCWludGVsX3BsYW5lID8gaW50ZWxfcGxhbmUt PmJhc2UuYmFzZS5pZCA6IGludGVsX2NydGMtPmJhc2UuYmFzZS5pZCwKKwkJc3JjX3csIHNyY19o LCBkc3RfdywgZHN0X2gsIGNydGNfc3RhdGUsIHNjYWxlcl9zdGF0ZS0+c2NhbGVyX3VzZXJzKTsK KwlyZXR1cm4gMDsKK30KKwogc3RhdGljIGludAogaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpz dGF0ZSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggMWRhNTA4Ny4uZjVkNTNjOSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTExMzgsNiArMTEzOCw5IEBAIHZvaWQgaW50ZWxf bW9kZV9mcm9tX3BpcGVfY29uZmlnKHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlLAogCQkJ CSBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcpOwogdm9pZCBpbnRlbF9jcnRj X3dhaXRfZm9yX3BlbmRpbmdfZmxpcHMoc3RydWN0IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50 ZWxfbW9kZXNldF9wcmVjbG9zZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUpOworaW50IHNrbF91cGRhdGVfc2NhbGVyX3VzZXJzKHN0cnVjdCBpbnRlbF9jcnRj ICppbnRlbF9jcnRjLAorCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLCBzdHJ1 Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lLAorCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUsIGludCBmb3JjZV9kZXRhY2gpOwogCiAvKiBpbnRlbF9kcC5jICovCiB2b2lk IGludGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IG91dHB1dF9yZWcsIGVu dW0gcG9ydCBwb3J0KTsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==