From: Stanislav Lisovskiy Subject: [PATCH xf86-video-intel v8 1/2] sna/gen9+: Split out wm_kernel from the sna_composite_op flags Date: Tue, 13 Nov 2018 09:45:01 +0200 Message-ID: <20181113074502.31063-2-stanislav.lisovskiy@intel.com> References: <20181113074502.31063-1-stanislav.lisovskiy@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181113074502.31063-1-stanislav.lisovskiy@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: ville.syrjala@intel.com, martin.peres@intel.com, dri-devel@lists.freedesktop.org, stanislav.lisovskiy@intel.com List-Id: dri-devel@lists.freedesktop.org V2l0aCB0aGUgZXh0cmEgdmlkZW8ga2VybmVscyB3ZSBhbHJlYWR5IHJhbiBvdXQgb2YgYml0cyBp bgp0aGUgZmxhZ3MuIFRvIHRhY2tsZSB0aGF0IGxldCdzIGp1c3Qgc3BsaXQgb3V0IHRoZQp3bV9r ZXJuZWwgdG8gaXRzIG93biB0aGluZy4KClNpZ25lZC1vZmYtYnk6IFN0YW5pc2xhdiBMaXNvdnNr aXkgPHN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwuY29tPgotLS0KIHNyYy9zbmEvZ2VuOV9yZW5k ZXIuYyB8IDM1ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiBzcmMvc25hL3Nu YV9yZW5kZXIuaCAgfCAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDEz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9zbmEvZ2VuOV9yZW5kZXIuYyBiL3NyYy9z bmEvZ2VuOV9yZW5kZXIuYwppbmRleCA1MDViOThhZi4uZWIyMmI2NDIgMTAwNjQ0Ci0tLSBhL3Ny Yy9zbmEvZ2VuOV9yZW5kZXIuYworKysgYi9zcmMvc25hL2dlbjlfcmVuZGVyLmMKQEAgLTIyNiwx OSArMjI2LDE4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYmxlbmRpbmZvIHsKIAogI2RlZmluZSBD T1BZX1NBTVBMRVIgMAogI2RlZmluZSBDT1BZX1ZFUlRFWCBWRVJURVhfMnMycwotI2RlZmluZSBD T1BZX0ZMQUdTKGEpIEdFTjlfU0VUX0ZMQUdTKENPUFlfU0FNUExFUiwgKGEpID09IEdYY29weSA/ IE5PX0JMRU5EIDogQ0xFQVIsIEdFTjlfV01fS0VSTkVMX05PTUFTSywgQ09QWV9WRVJURVgpCisj ZGVmaW5lIENPUFlfRkxBR1MoYSkgR0VOOV9TRVRfRkxBR1MoQ09QWV9TQU1QTEVSLCAoYSkgPT0g R1hjb3B5ID8gTk9fQkxFTkQgOiBDTEVBUiwgQ09QWV9WRVJURVgpCiAKICNkZWZpbmUgRklMTF9T QU1QTEVSIDEKICNkZWZpbmUgRklMTF9WRVJURVggVkVSVEVYXzJzMnMKLSNkZWZpbmUgRklMTF9G TEFHUyhvcCwgZm9ybWF0KSBHRU45X1NFVF9GTEFHUyhGSUxMX1NBTVBMRVIsIGdlbjlfZ2V0X2Js ZW5kKChvcCksIGZhbHNlLCAoZm9ybWF0KSksIEdFTjlfV01fS0VSTkVMX05PTUFTSywgRklMTF9W RVJURVgpCi0jZGVmaW5lIEZJTExfRkxBR1NfTk9CTEVORCBHRU45X1NFVF9GTEFHUyhGSUxMX1NB TVBMRVIsIE5PX0JMRU5ELCBHRU45X1dNX0tFUk5FTF9OT01BU0ssIEZJTExfVkVSVEVYKQorI2Rl ZmluZSBGSUxMX0ZMQUdTKG9wLCBmb3JtYXQpIEdFTjlfU0VUX0ZMQUdTKEZJTExfU0FNUExFUiwg Z2VuOV9nZXRfYmxlbmQoKG9wKSwgZmFsc2UsIChmb3JtYXQpKSwgRklMTF9WRVJURVgpCisjZGVm aW5lIEZJTExfRkxBR1NfTk9CTEVORCBHRU45X1NFVF9GTEFHUyhGSUxMX1NBTVBMRVIsIE5PX0JM RU5ELCBGSUxMX1ZFUlRFWCkKIAogI2RlZmluZSBHRU45X1NBTVBMRVIoZikgKCgoZikgPj4gMjAp ICYgMHhmZmYpCiAjZGVmaW5lIEdFTjlfQkxFTkQoZikgKCgoZikgPj4gNCkgJiAweDdmZikKICNk ZWZpbmUgR0VOOV9SRUFEU19EU1QoZikgKCgoZikgPj4gMTUpICYgMSkKLSNkZWZpbmUgR0VOOV9L RVJORUwoZikgKCgoZikgPj4gMTYpICYgMHhmKQogI2RlZmluZSBHRU45X1ZFUlRFWChmKSAoKChm KSA+PiAwKSAmIDB4ZikKLSNkZWZpbmUgR0VOOV9TRVRfRkxBR1MoUywgQiwgSywgVikgICgoUykg PDwgMjAgfCAoSykgPDwgMTYgfCAoQikgfCAoVikpCisjZGVmaW5lIEdFTjlfU0VUX0ZMQUdTKFMs IEIsIFYpICAoKFMpIDw8IDIwIHwgKEIpIHwgKFYpKQogCiAjZGVmaW5lIE9VVF9CQVRDSCh2KSBi YXRjaF9lbWl0KHNuYSwgdikKICNkZWZpbmUgT1VUX0JBVENINjQodikgYmF0Y2hfZW1pdDY0KHNu YSwgdikKQEAgLTEzNDksNyArMTM0OCw3IEBAIGdlbjlfZW1pdF9zdGF0ZShzdHJ1Y3Qgc25hICpz bmEsCiAJZ2VuOV9lbWl0X2NjKHNuYSwgR0VOOV9CTEVORChvcC0+dS5nZW45LmZsYWdzKSk7CiAJ Z2VuOV9lbWl0X3NhbXBsZXIoc25hLCBHRU45X1NBTVBMRVIob3AtPnUuZ2VuOS5mbGFncykpOwog CWdlbjlfZW1pdF9zZihzbmEsIEdFTjlfVkVSVEVYKG9wLT51LmdlbjkuZmxhZ3MpID4+IDIpOwot CWdlbjlfZW1pdF93bShzbmEsIEdFTjlfS0VSTkVMKG9wLT51LmdlbjkuZmxhZ3MpKTsKKwlnZW45 X2VtaXRfd20oc25hLCBvcC0+dS5nZW45LndtX2tlcm5lbCk7CiAJZ2VuOV9lbWl0X3ZlcnRleF9l bGVtZW50cyhzbmEsIG9wKTsKIAlnZW45X2VtaXRfYmluZGluZ190YWJsZShzbmEsIHdtX2JpbmRp bmdfdGFibGUpOwogCkBAIC0xNjE4LDcgKzE2MTcsNyBAQCBzdGF0aWMgaW50IGdlbjlfZ2V0X3Jl Y3RhbmdsZXNfX2ZsdXNoKHN0cnVjdCBzbmEgKnNuYSwKIAkJaWYgKGdlbjlfbWFnaWNfY2FfcGFz cyhzbmEsIG9wKSkgewogCQkJZ2VuOV9lbWl0X3BpcGVfaW52YWxpZGF0ZShzbmEpOwogCQkJZ2Vu OV9lbWl0X2NjKHNuYSwgR0VOOV9CTEVORChvcC0+dS5nZW45LmZsYWdzKSk7Ci0JCQlnZW45X2Vt aXRfd20oc25hLCBHRU45X0tFUk5FTChvcC0+dS5nZW45LmZsYWdzKSk7CisJCQlnZW45X2VtaXRf d20oc25hLCBvcC0+dS5nZW45LndtX2tlcm5lbCk7CiAJCX0KIAl9CiAKQEAgLTI1NDgsMTEgKzI1 NDcsMTEgQEAgZ2VuOV9yZW5kZXJfY29tcG9zaXRlKHN0cnVjdCBzbmEgKnNuYSwKIAkJCSAgICAg ICBnZW45X2dldF9ibGVuZCh0bXAtPm9wLAogCQkJCQkgICAgICB0bXAtPmhhc19jb21wb25lbnRf YWxwaGEsCiAJCQkJCSAgICAgIHRtcC0+ZHN0LmZvcm1hdCksCi0JCQkgICAgICAgZ2VuOV9jaG9v c2VfY29tcG9zaXRlX2tlcm5lbCh0bXAtPm9wLAotCQkJCQkJCSAgICB0bXAtPm1hc2suYm8gIT0g TlVMTCwKLQkJCQkJCQkgICAgdG1wLT5oYXNfY29tcG9uZW50X2FscGhhLAotCQkJCQkJCSAgICB0 bXAtPmlzX2FmZmluZSksCiAJCQkgICAgICAgZ2VuNF9jaG9vc2VfY29tcG9zaXRlX2VtaXR0ZXIo c25hLCB0bXApKTsKKwl0bXAtPnUuZ2VuOS53bV9rZXJuZWwgPSBnZW45X2Nob29zZV9jb21wb3Np dGVfa2VybmVsKHRtcC0+b3AsCisJCQkJCQkJICAgICB0bXAtPm1hc2suYm8gIT0gTlVMTCwKKwkJ CQkJCQkgICAgIHRtcC0+aGFzX2NvbXBvbmVudF9hbHBoYSwKKwkJCQkJCQkgICAgIHRtcC0+aXNf YWZmaW5lKTsKIAogCXRtcC0+Ymx0ICAgPSBnZW45X3JlbmRlcl9jb21wb3NpdGVfYmx0OwogCXRt cC0+Ym94ICAgPSBnZW45X3JlbmRlcl9jb21wb3NpdGVfYm94OwpAQCAtMjc4MSw4ICsyNzgwLDkg QEAgZ2VuOV9yZW5kZXJfY29tcG9zaXRlX3NwYW5zKHN0cnVjdCBzbmEgKnNuYSwKIAkJCQkJICAg ICAgU0FNUExFUl9GSUxURVJfTkVBUkVTVCwKIAkJCQkJICAgICAgU0FNUExFUl9FWFRFTkRfUEFE KSwKIAkJCSAgICAgICBnZW45X2dldF9ibGVuZCh0bXAtPmJhc2Uub3AsIGZhbHNlLCB0bXAtPmJh c2UuZHN0LmZvcm1hdCksCi0JCQkgICAgICAgR0VOOV9XTV9LRVJORUxfT1BBQ0lUWSB8ICF0bXAt PmJhc2UuaXNfYWZmaW5lLAogCQkJICAgICAgIGdlbjRfY2hvb3NlX3NwYW5zX2VtaXR0ZXIoc25h LCB0bXApKTsKKwl0bXAtPmJhc2UudS5nZW45LndtX2tlcm5lbCA9CisJCUdFTjlfV01fS0VSTkVM X09QQUNJVFkgfCAhdG1wLT5iYXNlLmlzX2FmZmluZTsKIAogCXRtcC0+Ym94ICAgPSBnZW45X3Jl bmRlcl9jb21wb3NpdGVfc3BhbnNfYm94OwogCXRtcC0+Ym94ZXMgPSBnZW45X3JlbmRlcl9jb21w b3NpdGVfc3BhbnNfYm94ZXM7CkBAIC0zMDQ1LDYgKzMwNDUsNyBAQCBmYWxsYmFja19ibHQ6CiAJ dG1wLm5lZWRfbWFnaWNfY2FfcGFzcyA9IDA7CiAKIAl0bXAudS5nZW45LmZsYWdzID0gQ09QWV9G TEFHUyhhbHUpOworCXRtcC51Lmdlbjkud21fa2VybmVsID0gR0VOOV9XTV9LRVJORUxfTk9NQVNL OwogCiAJa2dlbV9zZXRfbW9kZSgmc25hLT5rZ2VtLCBLR0VNX1JFTkRFUiwgdG1wLmRzdC5ibyk7 CiAJaWYgKCFrZ2VtX2NoZWNrX2JvKCZzbmEtPmtnZW0sIHRtcC5kc3QuYm8sIHRtcC5zcmMuYm8s IE5VTEwpKSB7CkBAIC0zMjE0LDYgKzMyMTUsNyBAQCBmYWxsYmFjazoKIAlvcC0+YmFzZS5mbG9h dHNfcGVyX3JlY3QgPSA2OwogCiAJb3AtPmJhc2UudS5nZW45LmZsYWdzID0gQ09QWV9GTEFHUyhh bHUpOworCW9wLT5iYXNlLnUuZ2VuOS53bV9rZXJuZWwgPSBHRU45X1dNX0tFUk5FTF9OT01BU0s7 CiAKIAlrZ2VtX3NldF9tb2RlKCZzbmEtPmtnZW0sIEtHRU1fUkVOREVSLCBkc3RfYm8pOwogCWlm ICgha2dlbV9jaGVja19ibygmc25hLT5rZ2VtLCBkc3RfYm8sIHNyY19ibywgTlVMTCkpIHsKQEAg LTMzNjYsNiArMzM2OCw3IEBAIGdlbjlfcmVuZGVyX2ZpbGxfYm94ZXMoc3RydWN0IHNuYSAqc25h LAogCXRtcC5uZWVkX21hZ2ljX2NhX3Bhc3MgPSBmYWxzZTsKIAogCXRtcC51LmdlbjkuZmxhZ3Mg PSBGSUxMX0ZMQUdTKG9wLCBmb3JtYXQpOworCXRtcC51Lmdlbjkud21fa2VybmVsID0gR0VOOV9X TV9LRVJORUxfTk9NQVNLOwogCiAJa2dlbV9zZXRfbW9kZSgmc25hLT5rZ2VtLCBLR0VNX1JFTkRF UiwgZHN0X2JvKTsKIAlpZiAoIWtnZW1fY2hlY2tfYm8oJnNuYS0+a2dlbSwgZHN0X2JvLCBOVUxM KSkgewpAQCAtMzU1Miw2ICszNTU1LDcgQEAgZ2VuOV9yZW5kZXJfZmlsbChzdHJ1Y3Qgc25hICpz bmEsIHVpbnQ4X3QgYWx1LAogCW9wLT5iYXNlLmZsb2F0c19wZXJfcmVjdCA9IDY7CiAKIAlvcC0+ YmFzZS51LmdlbjkuZmxhZ3MgPSBGSUxMX0ZMQUdTX05PQkxFTkQ7CisJb3AtPmJhc2UudS5nZW45 LndtX2tlcm5lbCA9IEdFTjlfV01fS0VSTkVMX05PTUFTSzsKIAogCWtnZW1fc2V0X21vZGUoJnNu YS0+a2dlbSwgS0dFTV9SRU5ERVIsIGRzdF9ibyk7CiAJaWYgKCFrZ2VtX2NoZWNrX2JvKCZzbmEt PmtnZW0sIGRzdF9ibywgTlVMTCkpIHsKQEAgLTM2MzcsNiArMzY0MSw3IEBAIGdlbjlfcmVuZGVy X2ZpbGxfb25lKHN0cnVjdCBzbmEgKnNuYSwgUGl4bWFwUHRyIGRzdCwgc3RydWN0IGtnZW1fYm8g KmJvLAogCXRtcC5uZWVkX21hZ2ljX2NhX3Bhc3MgPSBmYWxzZTsKIAogCXRtcC51LmdlbjkuZmxh Z3MgPSBGSUxMX0ZMQUdTX05PQkxFTkQ7CisJdG1wLnUuZ2VuOS53bV9rZXJuZWwgPSBHRU45X1dN X0tFUk5FTF9OT01BU0s7CiAKIAlrZ2VtX3NldF9tb2RlKCZzbmEtPmtnZW0sIEtHRU1fUkVOREVS LCBibyk7CiAJaWYgKCFrZ2VtX2NoZWNrX2JvKCZzbmEtPmtnZW0sIGJvLCBOVUxMKSkgewpAQCAt MzcyMyw2ICszNzI4LDcgQEAgZ2VuOV9yZW5kZXJfY2xlYXIoc3RydWN0IHNuYSAqc25hLCBQaXht YXBQdHIgZHN0LCBzdHJ1Y3Qga2dlbV9ibyAqYm8pCiAJdG1wLm5lZWRfbWFnaWNfY2FfcGFzcyA9 IGZhbHNlOwogCiAJdG1wLnUuZ2VuOS5mbGFncyA9IEZJTExfRkxBR1NfTk9CTEVORDsKKwl0bXAu dS5nZW45LndtX2tlcm5lbCA9IEdFTjlfV01fS0VSTkVMX05PTUFTSzsKIAogCWtnZW1fc2V0X21v ZGUoJnNuYS0+a2dlbSwgS0dFTV9SRU5ERVIsIGJvKTsKIAlpZiAoIWtnZW1fY2hlY2tfYm8oJnNu YS0+a2dlbSwgYm8sIE5VTEwpKSB7CkBAIC0zOTY0LDggKzM5NzAsOCBAQCBnZW45X3JlbmRlcl92 aWRlbyhzdHJ1Y3Qgc25hICpzbmEsCiAJCUdFTjlfU0VUX0ZMQUdTKFNBTVBMRVJfT0ZGU0VUKGZp bHRlciwgU0FNUExFUl9FWFRFTkRfUEFELAogCQkJCQkgICAgICBTQU1QTEVSX0ZJTFRFUl9ORUFS RVNULCBTQU1QTEVSX0VYVEVORF9OT05FKSwKIAkJCSAgICAgICBOT19CTEVORCwKLQkJCSAgICAg ICBzZWxlY3RfdmlkZW9fa2VybmVsKHZpZGVvLCBmcmFtZSksCiAJCQkgICAgICAgMik7CisJdG1w LnUuZ2VuOS53bV9rZXJuZWwgPSBzZWxlY3RfdmlkZW9fa2VybmVsKHZpZGVvLCBmcmFtZSk7CiAJ dG1wLnByaXYgPSBmcmFtZTsKIAogCWtnZW1fc2V0X21vZGUoJnNuYS0+a2dlbSwgS0dFTV9SRU5E RVIsIHRtcC5kc3QuYm8pOwpAQCAtNDEzNSw2ICs0MTQxLDkgQEAgc3RhdGljIGJvb2wgZ2VuOV9y ZW5kZXJfc2V0dXAoc3RydWN0IHNuYSAqc25hKQogCQlhc3NlcnQoc3RhdGUtPndtX2tlcm5lbFtt XVswXXxzdGF0ZS0+d21fa2VybmVsW21dWzFdfHN0YXRlLT53bV9rZXJuZWxbbV1bMl0pOwogCX0K IAorCUNPTVBJTEVfVElNRV9BU1NFUlQoR0VOOV9XTV9LRVJORUxfQ09VTlQgPD0KKwkJCSAgICAx IDw8IChzaXplb2YoKChzdHJ1Y3Qgc25hX2NvbXBvc2l0ZV9vcCAqKU5VTEwpLT51Lmdlbjkud21f a2VybmVsKSAqIDgpKTsKKwogCUNPTVBJTEVfVElNRV9BU1NFUlQoU0FNUExFUl9PRkZTRVQoRklM VEVSX0NPVU5ULCBFWFRFTkRfQ09VTlQsIEZJTFRFUl9DT1VOVCwgRVhURU5EX0NPVU5UKSA8PSAw eDdmZik7CiAJc3MgPSBzbmFfc3RhdGljX3N0cmVhbV9tYXAoJmdlbmVyYWwsCiAJCQkJICAgMiAq IHNpemVvZigqc3MpICoKZGlmZiAtLWdpdCBhL3NyYy9zbmEvc25hX3JlbmRlci5oIGIvc3JjL3Nu YS9zbmFfcmVuZGVyLmgKaW5kZXggNjY2OWFmOWQuLmE0ZTViNTZhIDEwMDY0NAotLS0gYS9zcmMv c25hL3NuYV9yZW5kZXIuaAorKysgYi9zcmMvc25hL3NuYV9yZW5kZXIuaApAQCAtMTUxLDYgKzE1 MSw3IEBAIHN0cnVjdCBzbmFfY29tcG9zaXRlX29wIHsKIAogCQlzdHJ1Y3QgewogCQkJdWludDMy X3QgZmxhZ3M7CisJCQl1aW50OF90IHdtX2tlcm5lbDsKIAkJfSBnZW45OwogCX0gdTsKIAotLSAK Mi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpk cmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK