From: Matt Roper Subject: [PATCH 4/4] drm/i915/skl+: Use scaling amount for plane data rate calculation (v4) Date: Thu, 19 May 2016 15:03:01 -0700 Message-ID: <1463695381-21368-1-git-send-email-matthew.d.roper@intel.com> References: <1463439121-28974-5-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id B97266E312 for ; Thu, 19 May 2016 22:03:17 +0000 (UTC) In-Reply-To: <1463439121-28974-5-git-send-email-matthew.d.roper@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 RnJvbTogIkt1bWFyLCBNYWhlc2giIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KCmlmIGRvd25z Y2FsaW5nIGlzIGVuYWJsZWQgcGxhbmUgZGF0YSByYXRlIGluY3JlYXNlcyBhY2NvcmRpbmcgdG8g c2NhbGluZwphbW91bnQuIHRha2Ugc2NhbGluZyBhbW91bnQgdW5kZXIgY29uc2lkZXJhdGlvbiB3 aGlsZSBjYWxjdWxhdGluZyBwbGFuZQpkYXRhIHJhdGUKCnYyOiBBZGRyZXNzIE1hdHQncyBjb21t ZW50cywgd2hlcmUgZGF0YSByYXRlIHdhcyBvdmVycmlkZGVuIGJlY2F1c2Ugb2YKbWlzc2luZyBl bHNlLgoKdjMgKGJ5IE1hdHQpOgogLSBBZGQgYnJhY2VzIHRvICdlbHNlJyBicmFuY2ggdG8gbWF0 Y2gga2VybmVsIGNvZGluZyBzdHlsZQogLSBBZGp1c3QgZmluYWwgY2FsY3VsYXRpb24gbm93IHRo YXQgc2tsX3BsYW5lX2Rvd25zY2FsZV9hbW91bnQoKQogICByZXR1cm5zIDE2LjE2IGZpeGVkIHBv aW50IHZhbHVlIGluc3RlYWQgb2YgYSBkZWNpbWFsIGZpeGVkIHBvaW50Cgp2NCAoYnkgTWF0dCk6 CiAtIEF2b2lkIGludGVnZXIgb3ZlcmZsb3cgYnkgbWFraW5nIHN1cmUgZmluYWwgbXVsdGlwbGlj YXRpb24gaXMKICAgdHJlYXRlZCBhcyA2NC1iaXQuCgpDYzogbWF0dGhldy5kLnJvcGVyQGludGVs LmNvbQpTaWduZWQtb2ZmLWJ5OiBLdW1hciwgTWFoZXNoIDxtYWhlc2gxLmt1bWFyQGludGVsLmNv bT4KU2lnbmVkLW9mZi1ieTogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgMTMgKysrKysrKysrLS0tLQog MSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwppbmRleCA1YmQ4ODViLi43YTQ4NmU0IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3BtLmMKQEAgLTI5OTMsNiArMjk5Myw3IEBAIHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUo Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIHsKIAlzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBzdGF0ZSk7 CiAJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwc3RhdGUtPmZiOworCXVpbnQzMl90IGRv d25fc2NhbGVfYW1vdW50LCBkYXRhX3JhdGU7CiAJdWludDMyX3Qgd2lkdGggPSAwLCBoZWlnaHQg PSAwOwogCXVuc2lnbmVkIGZvcm1hdCA9IGZiID8gZmItPnBpeGVsX2Zvcm1hdCA6IERSTV9GT1JN QVRfWFJHQjg4ODg7CiAKQEAgLTMwMTIsMTUgKzMwMTMsMTkgQEAgc2tsX3BsYW5lX3JlbGF0aXZl X2RhdGFfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCS8qIGZv ciBwbGFuYXIgZm9ybWF0ICovCiAJaWYgKGZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKIAkJ aWYgKHkpICAvKiB5LXBsYW5lIGRhdGEgcmF0ZSAqLwotCQkJcmV0dXJuIHdpZHRoICogaGVpZ2h0 ICoKKwkJCWRhdGFfcmF0ZSA9IHdpZHRoICogaGVpZ2h0ICoKIAkJCQlkcm1fZm9ybWF0X3BsYW5l X2NwcChmb3JtYXQsIDApOwogCQllbHNlICAgIC8qIHV2LXBsYW5lIGRhdGEgcmF0ZSAqLwotCQkJ cmV0dXJuICh3aWR0aCAvIDIpICogKGhlaWdodCAvIDIpICoKKwkJCWRhdGFfcmF0ZSA9ICh3aWR0 aCAvIDIpICogKGhlaWdodCAvIDIpICoKIAkJCQlkcm1fZm9ybWF0X3BsYW5lX2NwcChmb3JtYXQs IDEpOworCX0gZWxzZSB7CisJCS8qIGZvciBwYWNrZWQgZm9ybWF0cyAqLworCQlkYXRhX3JhdGUg PSB3aWR0aCAqIGhlaWdodCAqIGRybV9mb3JtYXRfcGxhbmVfY3BwKGZvcm1hdCwgMCk7CiAJfQog Ci0JLyogZm9yIHBhY2tlZCBmb3JtYXRzICovCi0JcmV0dXJuIHdpZHRoICogaGVpZ2h0ICogZHJt X2Zvcm1hdF9wbGFuZV9jcHAoZm9ybWF0LCAwKTsKKwlkb3duX3NjYWxlX2Ftb3VudCA9IHNrbF9w bGFuZV9kb3duc2NhbGVfYW1vdW50KGludGVsX3BzdGF0ZSk7CisKKwlyZXR1cm4gKHVpbnQ2NF90 KWRhdGFfcmF0ZSAqIGRvd25fc2NhbGVfYW1vdW50ID4+IDE2OwogfQogCiAvKgotLSAKMi4xLjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=