From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeykumar Sankaran Subject: [PATCH v2 5/6] drm/msm/dpu: clean up redundant hw type Date: Fri, 7 Dec 2018 18:38:37 -0800 Message-ID: <1544236718-26900-6-git-send-email-jsanka@codeaurora.org> References: <1544236718-26900-1-git-send-email-jsanka@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1544236718-26900-1-git-send-email-jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: hoegsberg-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, Jeykumar Sankaran , jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org c3RydWN0IGRwdV9od19ibGsgaGFzIGh3IGJsb2NrIHR5cGUgaW5mby4gUmVtb3ZlIGR1cGxpY2F0 ZQp0eXBlIHRyYWNraW5nIGluIHN0cnVjdCBkcHVfcm1faHdfYmxrLgoKY2hhbmdlcyBpbiB2MjoK CS0gcmVtb3ZlIHJlZHVuZGFudCB0eXBlIGluIHRyYWNlIGFwaSdzIChTZWFuIFBhdWwpCgpTaWdu ZWQtb2ZmLWJ5OiBKZXlrdW1hciBTYW5rYXJhbiA8anNhbmthQGNvZGVhdXJvcmEub3JnPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV9ybS5jICAgIHwgMjIgKysrKystLS0t LS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEvZHB1X3RyYWNlLmgg fCAyOCArKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDE2IGlu c2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tc20vZGlzcC9kcHUxL2RwdV9ybS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNwL2RwdTEv ZHB1X3JtLmMKaW5kZXggNWNlODliOS4uZTdmYzlhNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL21zbS9kaXNwL2RwdTEvZHB1X3JtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9kaXNw L2RwdTEvZHB1X3JtLmMKQEAgLTM4LDE0ICszOCwxMiBAQCBzdHJ1Y3QgZHB1X3JtX3JlcXVpcmVt ZW50cyB7CiAvKioKICAqIHN0cnVjdCBkcHVfcm1faHdfYmxrIC0gaGFyZHdhcmUgYmxvY2sgdHJh Y2tpbmcgbGlzdCBtZW1iZXIKICAqIEBsaXN0OglMaXN0IGhlYWQgZm9yIGxpc3Qgb2YgYWxsIGhh cmR3YXJlIGJsb2NrcyB0cmFja2luZyBpdGVtcwotICogQHR5cGU6CVR5cGUgb2YgaGFyZHdhcmUg YmxvY2sgdGhpcyBzdHJ1Y3R1cmUgdHJhY2tzCiAgKiBAaWQ6CQlIYXJkd2FyZSBJRCBudW1iZXIs IHdpdGhpbiBpdCdzIG93biBzcGFjZSwgaWUuIExNX1gKICAqIEBlbmNfaWQ6CUVuY29kZXIgaWQg dG8gd2hpY2ggdGhpcyBibGsgaXMgYmluZGVkCiAgKiBAaHc6CQlQb2ludGVyIHRvIHRoZSBoYXJk d2FyZSByZWdpc3RlciBhY2Nlc3Mgb2JqZWN0IGZvciB0aGlzIGJsb2NrCiAgKi8KIHN0cnVjdCBk cHVfcm1faHdfYmxrIHsKIAlzdHJ1Y3QgbGlzdF9oZWFkIGxpc3Q7Ci0JZW51bSBkcHVfaHdfYmxr X3R5cGUgdHlwZTsKIAl1aW50MzJfdCBpZDsKIAl1aW50MzJfdCBlbmNfaWQ7CiAJc3RydWN0IGRw dV9od19ibGsgKmh3OwpAQCAtODYsMTIgKzg0LDYgQEAgc3RhdGljIGJvb2wgX2RwdV9ybV9nZXRf aHdfbG9ja2VkKHN0cnVjdCBkcHVfcm0gKnJtLCBzdHJ1Y3QgZHB1X3JtX2h3X2l0ZXIgKmkpCiAJ aS0+YmxrID0gbGlzdF9wcmVwYXJlX2VudHJ5KGktPmJsaywgYmxrX2xpc3QsIGxpc3QpOwogCiAJ bGlzdF9mb3JfZWFjaF9lbnRyeV9jb250aW51ZShpLT5ibGssIGJsa19saXN0LCBsaXN0KSB7Ci0J CWlmIChpLT5ibGstPnR5cGUgIT0gaS0+dHlwZSkgewotCQkJRFBVX0VSUk9SKCJmb3VuZCBpbmNv cnJlY3QgYmxvY2sgdHlwZSAlZCBvbiAlZCBsaXN0XG4iLAotCQkJCQlpLT5ibGstPnR5cGUsIGkt PnR5cGUpOwotCQkJcmV0dXJuIGZhbHNlOwotCQl9Ci0KIAkJaWYgKGktPmVuY19pZCA9PSBpLT5i bGstPmVuY19pZCkgewogCQkJaS0+aHcgPSBpLT5ibGstPmh3OwogCQkJRFBVX0RFQlVHKCJmb3Vu ZCB0eXBlICVkIGlkICVkIGZvciBlbmMgJWRcbiIsCkBAIC0xNTEsNyArMTQzLDcgQEAgaW50IGRw dV9ybV9kZXN0cm95KHN0cnVjdCBkcHVfcm0gKnJtKQogCQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3Nh ZmUoaHdfY3VyLCBod19ueHQsICZybS0+aHdfYmxrc1t0eXBlXSwKIAkJCQlsaXN0KSB7CiAJCQls aXN0X2RlbCgmaHdfY3VyLT5saXN0KTsKLQkJCV9kcHVfcm1faHdfZGVzdHJveShod19jdXItPnR5 cGUsIGh3X2N1ci0+aHcpOworCQkJX2RwdV9ybV9od19kZXN0cm95KHR5cGUsIGh3X2N1ci0+aHcp OwogCQkJa2ZyZWUoaHdfY3VyKTsKIAkJfQogCX0KQEAgLTIxMyw3ICsyMDUsNiBAQCBzdGF0aWMg aW50IF9kcHVfcm1faHdfYmxrX2NyZWF0ZSgKIAkJcmV0dXJuIC1FTk9NRU07CiAJfQogCi0JYmxr LT50eXBlID0gdHlwZTsKIAlibGstPmlkID0gaWQ7CiAJYmxrLT5odyA9IGh3OwogCWJsay0+ZW5j X2lkID0gMDsKQEAgLTQ1OCw4ICs0NDksNyBAQCBzdGF0aWMgaW50IF9kcHVfcm1fcmVzZXJ2ZV9s bXMoc3RydWN0IGRwdV9ybSAqcm0sIHVpbnQzMl90IGVuY19pZCwKIAkJbG1baV0tPmVuY19pZCA9 IGVuY19pZDsKIAkJcHBbaV0tPmVuY19pZCA9IGVuY19pZDsKIAotCQl0cmFjZV9kcHVfcm1fcmVz ZXJ2ZV9sbXMobG1baV0tPmlkLCBsbVtpXS0+dHlwZSwgZW5jX2lkLAotCQkJCQkgcHBbaV0tPmlk KTsKKwkJdHJhY2VfZHB1X3JtX3Jlc2VydmVfbG1zKGxtW2ldLT5pZCwgZW5jX2lkLCBwcFtpXS0+ aWQpOwogCX0KIAogCXJldHVybiByYzsKQEAgLTUxMCw4ICs1MDAsNyBAQCBzdGF0aWMgaW50IF9k cHVfcm1fcmVzZXJ2ZV9jdGxzKAogCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoY3Rscykg JiYgaSA8IG51bV9jdGxzOyBpKyspIHsKIAkJY3Rsc1tpXS0+ZW5jX2lkID0gZW5jX2lkOwotCQl0 cmFjZV9kcHVfcm1fcmVzZXJ2ZV9jdGxzKGN0bHNbaV0tPmlkLCBjdGxzW2ldLT50eXBlLAotCQkJ CQkgIGVuY19pZCk7CisJCXRyYWNlX2RwdV9ybV9yZXNlcnZlX2N0bHMoY3Rsc1tpXS0+aWQsIGVu Y19pZCk7CiAJfQogCiAJcmV0dXJuIDA7CkBAIC01MzgsOCArNTI3LDcgQEAgc3RhdGljIGludCBf ZHB1X3JtX3Jlc2VydmVfaW50ZigKIAkJfQogCiAJCWl0ZXIuYmxrLT5lbmNfaWQgPSBlbmNfaWQ7 Ci0JCXRyYWNlX2RwdV9ybV9yZXNlcnZlX2ludGYoaXRlci5ibGstPmlkLCBpdGVyLmJsay0+dHlw ZSwKLQkJCQkJICBlbmNfaWQpOworCQl0cmFjZV9kcHVfcm1fcmVzZXJ2ZV9pbnRmKGl0ZXIuYmxr LT5pZCwgZW5jX2lkKTsKIAkJYnJlYWs7CiAJfQogCkBAIC02MjgsNyArNjE2LDcgQEAgc3RhdGlj IHZvaWQgX2RwdV9ybV9yZWxlYXNlX3Jlc2VydmF0aW9uKHN0cnVjdCBkcHVfcm0gKnJtLCB1aW50 MzJfdCBlbmNfaWQpCiAJCQlpZiAoYmxrLT5lbmNfaWQgPT0gZW5jX2lkKSB7CiAJCQkJYmxrLT5l bmNfaWQgPSAwOwogCQkJCURQVV9ERUJVRygicmVsIGVuYyAlZCAlZCAlZFxuIiwgZW5jX2lkLAot CQkJCQkgIGJsay0+dHlwZSwgYmxrLT5pZCk7CisJCQkJCSAgdHlwZSwgYmxrLT5pZCk7CiAJCQl9 CiAJCX0KIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Rpc3AvZHB1MS9kcHVf dHJhY2UuaCBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV90cmFjZS5oCmluZGV4 IGM3OGI1MjEuLjhiYjQ2MDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9k cHUxL2RwdV90cmFjZS5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vZGlzcC9kcHUxL2RwdV90 cmFjZS5oCkBAIC04MzEsNDggKzgzMSw0MiBAQAogKTsKIAogREVDTEFSRV9FVkVOVF9DTEFTUyhk cHVfcm1faXRlcl90ZW1wbGF0ZSwKLQlUUF9QUk9UTyh1aW50MzJfdCBpZCwgZW51bSBkcHVfaHdf YmxrX3R5cGUgdHlwZSwgdWludDMyX3QgZW5jX2lkKSwKLQlUUF9BUkdTKGlkLCB0eXBlLCBlbmNf aWQpLAorCVRQX1BST1RPKHVpbnQzMl90IGlkLCB1aW50MzJfdCBlbmNfaWQpLAorCVRQX0FSR1Mo aWQsIGVuY19pZCksCiAJVFBfU1RSVUNUX19lbnRyeSgKIAkJX19maWVsZCgJdWludDMyX3QsCQlp ZAkpCi0JCV9fZmllbGQoCWVudW0gZHB1X2h3X2Jsa190eXBlLAl0eXBlCSkKIAkJX19maWVsZCgJ dWludDMyX3QsCQllbmNfaWQJKQogCSksCiAJVFBfZmFzdF9hc3NpZ24oCiAJCV9fZW50cnktPmlk ID0gaWQ7Ci0JCV9fZW50cnktPnR5cGUgPSB0eXBlOwogCQlfX2VudHJ5LT5lbmNfaWQgPSBlbmNf aWQ7CiAJKSwKLQlUUF9wcmludGsoImlkOiVkIHR5cGU6JWQgZW5jX2lkOiV1IiwgX19lbnRyeS0+ aWQsIF9fZW50cnktPnR5cGUsCi0JCSAgX19lbnRyeS0+ZW5jX2lkKQorCVRQX3ByaW50aygiaWQ6 JWQgZW5jX2lkOiV1IiwgX19lbnRyeS0+aWQsIF9fZW50cnktPmVuY19pZCkKICk7CiBERUZJTkVf RVZFTlQoZHB1X3JtX2l0ZXJfdGVtcGxhdGUsIGRwdV9ybV9yZXNlcnZlX2ludGYsCi0JVFBfUFJP VE8odWludDMyX3QgaWQsIGVudW0gZHB1X2h3X2Jsa190eXBlIHR5cGUsIHVpbnQzMl90IGVuY19p ZCksCi0JVFBfQVJHUyhpZCwgdHlwZSwgZW5jX2lkKQorCVRQX1BST1RPKHVpbnQzMl90IGlkLCB1 aW50MzJfdCBlbmNfaWQpLAorCVRQX0FSR1MoaWQsIGVuY19pZCkKICk7CiBERUZJTkVfRVZFTlQo ZHB1X3JtX2l0ZXJfdGVtcGxhdGUsIGRwdV9ybV9yZXNlcnZlX2N0bHMsCi0JVFBfUFJPVE8odWlu dDMyX3QgaWQsIGVudW0gZHB1X2h3X2Jsa190eXBlIHR5cGUsIHVpbnQzMl90IGVuY19pZCksCi0J VFBfQVJHUyhpZCwgdHlwZSwgZW5jX2lkKQorCVRQX1BST1RPKHVpbnQzMl90IGlkLCB1aW50MzJf dCBlbmNfaWQpLAorCVRQX0FSR1MoaWQsIGVuY19pZCkKICk7CiAKIFRSQUNFX0VWRU5UKGRwdV9y bV9yZXNlcnZlX2xtcywKLQlUUF9QUk9UTyh1aW50MzJfdCBpZCwgZW51bSBkcHVfaHdfYmxrX3R5 cGUgdHlwZSwgdWludDMyX3QgZW5jX2lkLAotCQkgdWludDMyX3QgcHBfaWQpLAotCVRQX0FSR1Mo aWQsIHR5cGUsIGVuY19pZCwgcHBfaWQpLAorCVRQX1BST1RPKHVpbnQzMl90IGlkLCB1aW50MzJf dCBlbmNfaWQsIHVpbnQzMl90IHBwX2lkKSwKKwlUUF9BUkdTKGlkLCBlbmNfaWQsIHBwX2lkKSwK IAlUUF9TVFJVQ1RfX2VudHJ5KAogCQlfX2ZpZWxkKAl1aW50MzJfdCwJCWlkCSkKLQkJX19maWVs ZCgJZW51bSBkcHVfaHdfYmxrX3R5cGUsCXR5cGUJKQogCQlfX2ZpZWxkKAl1aW50MzJfdCwJCWVu Y19pZAkpCiAJCV9fZmllbGQoCXVpbnQzMl90LAkJcHBfaWQJKQogCSksCiAJVFBfZmFzdF9hc3Np Z24oCiAJCV9fZW50cnktPmlkID0gaWQ7Ci0JCV9fZW50cnktPnR5cGUgPSB0eXBlOwogCQlfX2Vu dHJ5LT5lbmNfaWQgPSBlbmNfaWQ7CiAJCV9fZW50cnktPnBwX2lkID0gcHBfaWQ7CiAJKSwKLQlU UF9wcmludGsoImlkOiVkIHR5cGU6JWQgZW5jX2lkOiV1IHBwX2lkOiV1IiwgX19lbnRyeS0+aWQs Ci0JCSAgX19lbnRyeS0+dHlwZSwgX19lbnRyeS0+ZW5jX2lkLCBfX2VudHJ5LT5wcF9pZCkKKwlU UF9wcmludGsoImlkOiVkIGVuY19pZDoldSBwcF9pZDoldSIsIF9fZW50cnktPmlkLAorCQkgIF9f ZW50cnktPmVuY19pZCwgX19lbnRyeS0+cHBfaWQpCiApOwogCiBUUkFDRV9FVkVOVChkcHVfdmJp Zl93YWl0X3hpbl9oYWx0X2ZhaWwsCi0tIApUaGUgUXVhbGNvbW0gSW5ub3ZhdGlvbiBDZW50ZXIs IEluYy4gaXMgYSBtZW1iZXIgb2YgdGhlIENvZGUgQXVyb3JhIEZvcnVtLAphIExpbnV4IEZvdW5k YXRpb24gQ29sbGFib3JhdGl2ZSBQcm9qZWN0CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpGcmVlZHJlbm8gbWFpbGluZyBsaXN0CkZyZWVkcmVub0BsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9mcmVlZHJlbm8K