From: Chandra Konduru Subject: [PATCH] drm/i915/skl: don't fail colorkey + scaler request Date: Mon, 18 May 2015 16:18:44 -0700 Message-ID: <1431991124-9034-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C64A6E030 for ; Mon, 18 May 2015 16:19:34 -0700 (PDT) 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, ville.syrjala@intel.com, bin.a.xu@intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgaXMgYSBtcGxheWVyIHZpZGVvIGZhaWx1cmUgcmVwb3J0ZWQgd2l0aCB4di4KVGhpcyBp cyBiZWNhdXNlIHRoZXJlIGlzIGEgcmVxdWVzdCB0byBkbyBib3RoIHBsYW5lIHNjYWxpbmcKYW5k IGNvbG9ya2V5LiBCZWNhdXNlIHNrbCBodyBkb2Vzbid0IHN1cHBvcnQgcGxhbmUgc2NhbGluZwph bmQgY29sb3JrZXkgYXQgdGhlIHNhbWUgdGltZSwgcmVxdWVzdCBpcyBmYWlsZWQgd2hpY2ggaXMg ZXhwZWN0ZWQKYmVoYXZpb3IuCgpUbyBtYWtlIHh2IG9wZXJhdGUsIHRoaXMgcGF0Y2ggYWxsb3dz IGNvbG9ya2V5IGNvbnRpbnVlIHRvIHdvcmsKd2l0aG91dCB1c2luZyBzY2FsZXIuIFRoZW4gYmVo YXZpb3Igd291bGQgYmUgc2ltaWxhciB0byBwbGF0Zm9ybXMKd2l0aG91dCBwbGFuZSBzY2FsZXIg c3VwcG9ydC4KClNpZ25lZC1vZmYtYnk6IENoYW5kcmEgS29uZHVydSA8Y2hhbmRyYS5rb25kdXJ1 QGludGVsLmNvbT4KQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19i dWcuY2dpP2lkPTkwNDQ5Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IHwgICAxNCArKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMgIHwgICAzMSArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5n ZWQsIDMwIGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYwppbmRleCA3YWI3NWMwLi5mYzVjZWYwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC00NTA1LDkgKzQ1MDUsMTAgQEAgc2tsX3VwZGF0ZV9zY2FsZXJf dXNlcnMoCiAJfQogCiAJLyogY2hlY2sgY29sb3JrZXkgKi8KLQlpZiAoaW50ZWxfcGxhbmUgJiYg aW50ZWxfcGxhbmUtPmNrZXkuZmxhZ3MgIT0gSTkxNV9TRVRfQ09MT1JLRVlfTk9ORSkgewotCQlE Uk1fREVCVUdfS01TKCJQTEFORTolZCBzY2FsaW5nIHdpdGggY29sb3Iga2V5IG5vdCBhbGxvd2Vk IiwKLQkJCWludGVsX3BsYW5lLT5iYXNlLmJhc2UuaWQpOworCWlmIChXQVJOX09OKGludGVsX3Bs YW5lICYmCisJCWludGVsX3BsYW5lLT5ja2V5LmZsYWdzICE9IEk5MTVfU0VUX0NPTE9SS0VZX05P TkUpKSB7CisJCURSTV9ERUJVR19LTVMoIlBMQU5FOiVkIHNjYWxpbmcgJXV4JXUtPiV1eCV1IG5v dCBhbGxvd2VkIHdpdGggY29sb3JrZXkiLAorCQkJaW50ZWxfcGxhbmUtPmJhc2UuYmFzZS5pZCwg c3JjX3csIHNyY19oLCBkc3RfdywgZHN0X2gpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAg LTEzMDQ5LDggKzEzMDUwLDExIEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJCWludGVsX2F0b21pY19nZXRfY3J0Y19zdGF0ZShzdGF0ZS0+YmFz ZS5zdGF0ZSwgaW50ZWxfY3J0YykgOiBOVUxMOwogCiAJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDkpIHsKLQkJbWluX3NjYWxlID0gMTsKLQkJbWF4X3NjYWxlID0gc2tsX21heF9zY2FsZShp bnRlbF9jcnRjLCBjcnRjX3N0YXRlKTsKKwkJLyogdXNlIHNjYWxlciB3aGVuIGNvbG9ya2V5IGlz IG5vdCByZXF1aXJlZCAqLworCQlpZiAodG9faW50ZWxfcGxhbmUocGxhbmUpLT5ja2V5LmZsYWdz ID09IEk5MTVfU0VUX0NPTE9SS0VZX05PTkUpIHsKKwkJCW1pbl9zY2FsZSA9IDE7CisJCQltYXhf c2NhbGUgPSBza2xfbWF4X3NjYWxlKGludGVsX2NydGMsIGNydGNfc3RhdGUpOworCQl9CiAJCWNh bl9wb3NpdGlvbiA9IHRydWU7CiAJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmlu ZGV4IDE2ZDBlNDguLjkwMDRlNDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBA IC03NzUsNyArNzc1LDcgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLAogCXN0cnVjdCBkcm1fcmVjdCAqZHN0ID0gJnN0YXRlLT5kc3Q7CiAJY29uc3Qg c3RydWN0IGRybV9yZWN0ICpjbGlwID0gJnN0YXRlLT5jbGlwOwogCWludCBoc2NhbGUsIHZzY2Fs ZTsKLQlpbnQgbWF4X3NjYWxlLCBtaW5fc2NhbGU7CisJaW50IG1heF9zY2FsZSwgbWluX3NjYWxl LCBjYW5fc2NhbGU7CiAJaW50IHBpeGVsX3NpemU7CiAJaW50IHJldDsKIApAQCAtODAwLDE4ICs4 MDAsMjkgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5l LAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKKwkvKiBzZXR1cCBjYW5fc2NhbGUsIG1pbl9zY2Fs ZSwgbWF4X3NjYWxlICovCisJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpIHsKKwkJLyog dXNlIHNjYWxlciB3aGVuIGNvbG9ya2V5IGlzIG5vdCByZXF1aXJlZCAqLworCQlpZiAoaW50ZWxf cGxhbmUtPmNrZXkuZmxhZ3MgPT0gSTkxNV9TRVRfQ09MT1JLRVlfTk9ORSkgeworCQkJY2FuX3Nj YWxlID0gMTsKKwkJCW1pbl9zY2FsZSA9IDE7CisJCQltYXhfc2NhbGUgPSBza2xfbWF4X3NjYWxl KGludGVsX2NydGMsIGNydGNfc3RhdGUpOworCQl9IGVsc2UgeworCQkJY2FuX3NjYWxlID0gMDsK KwkJCW1pbl9zY2FsZSA9IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORzsKKwkJCW1heF9zY2Fs ZSA9IERSTV9QTEFORV9IRUxQRVJfTk9fU0NBTElORzsKKwkJfQorCX0gZWxzZSB7CisJCWNhbl9z Y2FsZSA9IGludGVsX3BsYW5lLT5jYW5fc2NhbGU7CisJCW1heF9zY2FsZSA9IGludGVsX3BsYW5l LT5tYXhfZG93bnNjYWxlIDw8IDE2OworCQltaW5fc2NhbGUgPSBpbnRlbF9wbGFuZS0+Y2FuX3Nj YWxlID8gMSA6ICgxIDw8IDE2KTsKKwl9CisKIAkvKgogCSAqIEZJWE1FIHRoZSBmb2xsb3dpbmcg Y29kZSBkb2VzIGEgYnVuY2ggb2YgZnV6enkgYWRqdXN0bWVudHMgdG8gdGhlCiAJICogY29vcmRp bmF0ZXMgYW5kIHNpemVzLiBXZSBwcm9iYWJseSBuZWVkIHNvbWUgd2F5IHRvIGRlY2lkZSB3aGV0 aGVyCiAJICogbW9yZSBzdHJpY3QgY2hlY2tpbmcgc2hvdWxkIGJlIGRvbmUgaW5zdGVhZC4KIAkg Ki8KLQltYXhfc2NhbGUgPSBpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA8PCAxNjsKLQltaW5f c2NhbGUgPSBpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID8gMSA6ICgxIDw8IDE2KTsKLQotCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KSB7Ci0JCW1pbl9zY2FsZSA9IDE7Ci0JCW1heF9zY2Fs ZSA9IHNrbF9tYXhfc2NhbGUoaW50ZWxfY3J0YywgY3J0Y19zdGF0ZSk7Ci0JfQogCiAJZHJtX3Jl Y3Rfcm90YXRlKHNyYywgZmItPndpZHRoIDw8IDE2LCBmYi0+aGVpZ2h0IDw8IDE2LAogCQkJc3Rh dGUtPmJhc2Uucm90YXRpb24pOwpAQCAtODgyLDcgKzg5Myw3IEBAIGludGVsX2NoZWNrX3Nwcml0 ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAqIE11c3Qga2VlcCBzcmMgYW5k IGRzdCB0aGUKIAkJCSAqIHNhbWUgaWYgd2UgY2FuJ3Qgc2NhbGUuCiAJCQkgKi8KLQkJCWlmICgh aW50ZWxfcGxhbmUtPmNhbl9zY2FsZSkKKwkJCWlmICghY2FuX3NjYWxlKQogCQkJCWNydGNfdyAm PSB+MTsKIAogCQkJaWYgKGNydGNfdyA9PSAwKQpAQCAtODk0LDcgKzkwNSw3IEBAIGludGVsX2No ZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAoc3RhdGUtPnZp c2libGUgJiYgKHNyY193ICE9IGNydGNfdyB8fCBzcmNfaCAhPSBjcnRjX2gpKSB7CiAJCXVuc2ln bmVkIGludCB3aWR0aF9ieXRlczsKIAotCQlXQVJOX09OKCFpbnRlbF9wbGFuZS0+Y2FuX3NjYWxl KTsKKwkJV0FSTl9PTighY2FuX3NjYWxlKTsKIAogCQkvKiBGSVhNRSBpbnRlcmxhY2luZyBtaW4g aGVpZ2h0IGlzIDYgKi8KIAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK