From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 15/15] drm/i915: Use more atomic state in
	intel_color.c
Date: Tue,  9 Aug 2016 17:04:14 +0200
Message-ID: <1470755054-32699-16-git-send-email-maarten.lankhorst@linux.intel.com>
References: <1470755054-32699-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 893D06E251
 for <intel-gfx@lists.freedesktop.org>; Tue,  9 Aug 2016 15:04:21 +0000 (UTC)
In-Reply-To: <1470755054-32699-1-git-send-email-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

Y3J0Y19zdGF0ZSBpcyBhbHJlYWR5IHBhc3NlZCBhcm91bmQsIHVzZSBpdCBpbnN0ZWFkIG9mIGNy
dGMtPmNvbmZpZy4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh
bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
Y29sb3IuYyB8IDI0ICsrKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0
IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xv
ci5jCmluZGV4IGJjMGZlZjNkMzMzNS4uOTVhNzI3NzFlZWE2IDEwMDY0NAotLS0gYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2NvbG9yLmMKQEAgLTEwMCwxMyArMTAwLDE0IEBAIHN0YXRpYyB2b2lkIGk5eHhfbG9hZF9j
c2NfbWF0cml4KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAlzdHJ1Y3QgaW50
ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJaW50IGksIHBpcGUg
PSBpbnRlbF9jcnRjLT5waXBlOwogCXVpbnQxNl90IGNvZWZmc1s5XSA9IHsgMCwgfTsKKwlzdHJ1
Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3Rh
dGUoY3J0Y19zdGF0ZSk7CiAKIAlpZiAoY3J0Y19zdGF0ZS0+Y3RtKSB7CiAJCXN0cnVjdCBkcm1f
Y29sb3JfY3RtICpjdG0gPQogCQkJKHN0cnVjdCBkcm1fY29sb3JfY3RtICopY3J0Y19zdGF0ZS0+
Y3RtLT5kYXRhOwogCQl1aW50NjRfdCBpbnB1dFs5XSA9IHsgMCwgfTsKIAotCQlpZiAoaW50ZWxf
Y3J0Yy0+Y29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKSB7CisJCWlmIChpbnRlbF9jcnRjX3N0
YXRlLT5saW1pdGVkX2NvbG9yX3JhbmdlKSB7CiAJCQljdG1fbXVsdF9ieV9saW1pdGVkKGlucHV0
LCBjdG0tPm1hdHJpeCk7CiAJCX0gZWxzZSB7CiAJCQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0la
RShpbnB1dCk7IGkrKykKQEAgLTE1OCw3ICsxNTksNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2xvYWRf
Y3NjX21hdHJpeChzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCSAqIGludG8g
Y29uc2lkZXJhdGlvbi4KIAkJICovCiAJCWZvciAoaSA9IDA7IGkgPCAzOyBpKyspIHsKLQkJCWlm
IChpbnRlbF9jcnRjLT5jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UpCisJCQlpZiAoaW50ZWxf
Y3J0Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJCQljb2VmZnNbaSAqIDMgKyBpXSA9
CiAJCQkJCUk5WFhfQ1NDX0NPRUZGX0xJTUlURURfUkFOR0U7CiAJCQllbHNlCkBAIC0xODIsNyAr
MTgzLDcgQEAgc3RhdGljIHZvaWQgaTl4eF9sb2FkX2NzY19tYXRyaXgoc3RydWN0IGRybV9jcnRj
X3N0YXRlICpjcnRjX3N0YXRlKQogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+IDYpIHsKIAkJ
dWludDE2X3QgcG9zdG9mZiA9IDA7CiAKLQkJaWYgKGludGVsX2NydGMtPmNvbmZpZy0+bGltaXRl
ZF9jb2xvcl9yYW5nZSkKKwkJaWYgKGludGVsX2NydGNfc3RhdGUtPmxpbWl0ZWRfY29sb3JfcmFu
Z2UpCiAJCQlwb3N0b2ZmID0gKDE2ICogKDEgPDwgMTIpIC8gMjU1KSAmIDB4MWZmZjsKIAogCQlJ
OTE1X1dSSVRFKFBJUEVfQ1NDX1BPU1RPRkZfSEkocGlwZSksIHBvc3RvZmYpOwpAQCAtMTkzLDcg
KzE5NCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfbG9hZF9jc2NfbWF0cml4KHN0cnVjdCBkcm1fY3J0
Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAl9IGVsc2UgewogCQl1aW50MzJfdCBtb2RlID0gQ1NDX01P
REVfWVVWX1RPX1JHQjsKIAotCQlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5saW1pdGVkX2NvbG9y
X3JhbmdlKQorCQlpZiAoaW50ZWxfY3J0Y19zdGF0ZS0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJ
CW1vZGUgfD0gQ1NDX0JMQUNLX1NDUkVFTl9PRkZTRVQ7CiAKIAkJSTkxNV9XUklURShQSVBFX0NT
Q19NT0RFKHBpcGUpLCBtb2RlKTsKQEAgLTI2Myw3ICsyNjQsOCBAQCB2b2lkIGludGVsX2NvbG9y
X3NldF9jc2Moc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCiAvKiBMb2FkcyB0
aGUgbGVnYWN5IHBhbGV0dGUvZ2FtbWEgdW5pdCBmb3IgdGhlIENSVEMuICovCiBzdGF0aWMgdm9p
ZCBpOXh4X2xvYWRfbHV0c19pbnRlcm5hbChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkJICAg
IHN0cnVjdCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikKKwkJCQkgICAgc3RydWN0IGRybV9wcm9w
ZXJ0eV9ibG9iICpibG9iLAorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z
dGF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBk
cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKQEAgLTI3Miw3ICsyNzQs
NyBAQCBzdGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0c19pbnRlcm5hbChzdHJ1Y3QgZHJtX2NydGMg
KmNydGMsCiAJaW50IGk7CiAKIAlpZiAoSEFTX0dNQ0hfRElTUExBWShkZXYpKSB7Ci0JCWlmIChp
bnRlbF9jcnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywgSU5URUxfT1VUUFVUX0RTSSkp
CisJCWlmIChpbnRlbF9jcnRjX2hhc190eXBlKGNydGNfc3RhdGUsIElOVEVMX09VVFBVVF9EU0kp
KQogCQkJYXNzZXJ0X2RzaV9wbGxfZW5hYmxlZChkZXZfcHJpdik7CiAJCWVsc2UKIAkJCWFzc2Vy
dF9wbGxfZW5hYmxlZChkZXZfcHJpdiwgcGlwZSk7CkBAIC0zMDUsNyArMzA3LDggQEAgc3RhdGlj
IHZvaWQgaTl4eF9sb2FkX2x1dHNfaW50ZXJuYWwoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCiBz
dGF0aWMgdm9pZCBpOXh4X2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3Rh
dGUpCiB7Ci0JaTl4eF9sb2FkX2x1dHNfaW50ZXJuYWwoY3J0Y19zdGF0ZS0+Y3J0YywgY3J0Y19z
dGF0ZS0+Z2FtbWFfbHV0KTsKKwlpOXh4X2xvYWRfbHV0c19pbnRlcm5hbChjcnRjX3N0YXRlLT5j
cnRjLCBjcnRjX3N0YXRlLT5nYW1tYV9sdXQsCisJCQkJdG9faW50ZWxfY3J0Y19zdGF0ZShjcnRj
X3N0YXRlKSk7CiB9CiAKIC8qIExvYWRzIHRoZSBsZWdhY3kgcGFsZXR0ZS9nYW1tYSB1bml0IGZv
ciB0aGUgQ1JUQyBvbiBIYXN3ZWxsLiAqLwpAQCAtMzIzLDcgKzMyNiw3IEBAIHN0YXRpYyB2b2lk
IGhhc3dlbGxfbG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAkg
KiBXb3JrYXJvdW5kIDogRG8gbm90IHJlYWQgb3Igd3JpdGUgdGhlIHBpcGUgcGFsZXR0ZS9nYW1t
YSBkYXRhIHdoaWxlCiAJICogR0FNTUFfTU9ERSBpcyBjb25maWd1cmVkIGZvciBzcGxpdCBnYW1t
YSBhbmQgSVBTX0NUTCBoYXMgSVBTIGVuYWJsZWQuCiAJICovCi0JaWYgKElTX0hBU1dFTEwoZGV2
KSAmJiBpbnRlbF9jcnRjLT5jb25maWctPmlwc19lbmFibGVkICYmCisJaWYgKElTX0hBU1dFTEwo
ZGV2KSAmJiBpbnRlbF9jcnRjX3N0YXRlLT5pcHNfZW5hYmxlZCAmJgogCSAgICAoaW50ZWxfY3J0
Y19zdGF0ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfU1BMSVQpKSB7CiAJCWhzd19k
aXNhYmxlX2lwcyhpbnRlbF9jcnRjKTsKIAkJcmVlbmFibGVfaXBzID0gdHJ1ZTsKQEAgLTQzNiw3
ICs0MzksOCBAQCBzdGF0aWMgdm9pZCBjaGVycnl2aWV3X2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2Ny
dGNfc3RhdGUgKnN0YXRlKQogCQkvKiBUdXJuIG9mZiBkZWdhbW1hL2dhbW1hIG9uIENHTSBibG9j
ay4gKi8KIAkJSTkxNV9XUklURShDR01fUElQRV9NT0RFKHBpcGUpLAogCQkJICAgKHN0YXRlLT5j
dG0gPyBDR01fUElQRV9NT0RFX0NTQyA6IDApKTsKLQkJaTl4eF9sb2FkX2x1dHNfaW50ZXJuYWwo
Y3J0Yywgc3RhdGUtPmdhbW1hX2x1dCk7CisJCWk5eHhfbG9hZF9sdXRzX2ludGVybmFsKGNydGMs
IHN0YXRlLT5nYW1tYV9sdXQsCisJCQkJCXRvX2ludGVsX2NydGNfc3RhdGUoc3RhdGUpKTsKIAkJ
cmV0dXJuOwogCX0KIApAQCAtNDc5LDcgKzQ4Myw3IEBAIHN0YXRpYyB2b2lkIGNoZXJyeXZpZXdf
bG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCiAJICogQWxzbyBwcm9ncmFt
IGEgbGluZWFyIExVVCBpbiB0aGUgbGVnYWN5IGJsb2NrIChiZWhpbmQgdGhlCiAJICogQ0dNIGJs
b2NrKS4KIAkgKi8KLQlpOXh4X2xvYWRfbHV0c19pbnRlcm5hbChjcnRjLCBOVUxMKTsKKwlpOXh4
X2xvYWRfbHV0c19pbnRlcm5hbChjcnRjLCBOVUxMLCB0b19pbnRlbF9jcnRjX3N0YXRlKHN0YXRl
KSk7CiB9CiAKIHZvaWQgaW50ZWxfY29sb3JfbG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0
ZSAqY3J0Y19zdGF0ZSkKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m
cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0
aW5mby9pbnRlbC1nZngK