From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 4/4] drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode Date: Fri, 25 Jan 2019 09:12:15 +0100 Message-ID: <20190125081215.4622-5-thellstrom@vmware.com> References: <20190125081215.4622-1-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from EX13-EDG-OU-002.vmware.com (ex13-edg-ou-002.vmware.com [208.91.0.190]) by gabe.freedesktop.org (Postfix) with ESMTPS id 053D96F287 for ; Fri, 25 Jan 2019 08:12:35 +0000 (UTC) In-Reply-To: <20190125081215.4622-1-thellstrom@vmware.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: hch@lst.de, dri-devel@lists.freedesktop.org, linux-graphics-maintainer@vmware.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+CgpKdXN0IHVzZSBhIHNpbXBsZSBp Zi9lbHNlIGNoYWluIHRvIHNlbGVjdCB0aGUgRE1BIG1vZGUuCgpTaWduZWQtb2ZmLWJ5OiBDaHJp c3RvcGggSGVsbHdpZyA8aGNoQGxzdC5kZT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Zt d2dmeF9kcnYuYyB8IDI1ICsrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA2IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn ZnhfZHJ2LmMKaW5kZXggMTQ1NjEwMWU2N2E5Li4zZTJiY2ZmMzQwMzIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92 bXdnZngvdm13Z2Z4X2Rydi5jCkBAIC01NjYsMzkgKzU2NiwyNiBAQCBzdGF0aWMgaW50IHZtd19k bWFfc2VsZWN0X21vZGUoc3RydWN0IHZtd19wcml2YXRlICpkZXZfcHJpdikKIAkJW3Ztd19kbWFf bWFwX3BvcHVsYXRlXSA9ICJLZWVwaW5nIERNQSBtYXBwaW5ncy4iLAogCQlbdm13X2RtYV9tYXBf YmluZF0gPSAiR2l2aW5nIHVwIERNQSBtYXBwaW5ncyBlYXJseS4ifTsKIAotCWlmIChpbnRlbF9p b21tdV9lbmFibGVkKSB7CisJaWYgKHZtd19mb3JjZV9jb2hlcmVudCkKKwkJZGV2X3ByaXYtPm1h cF9tb2RlID0gdm13X2RtYV9hbGxvY19jb2hlcmVudDsKKwllbHNlIGlmIChpbnRlbF9pb21tdV9l bmFibGVkKQogCQlkZXZfcHJpdi0+bWFwX21vZGUgPSB2bXdfZG1hX21hcF9wb3B1bGF0ZTsKLQkJ Z290byBvdXRfZml4dXA7Ci0JfQotCi0JaWYgKCEodm13X2ZvcmNlX2lvbW11IHx8IHZtd19mb3Jj ZV9jb2hlcmVudCkpIHsKKwllbHNlIGlmICghdm13X2ZvcmNlX2lvbW11KQogCQlkZXZfcHJpdi0+ bWFwX21vZGUgPSB2bXdfZG1hX3BoeXM7Ci0JCURSTV9JTkZPKCJETUEgbWFwIG1vZGU6ICVzXG4i LCBuYW1lc1tkZXZfcHJpdi0+bWFwX21vZGVdKTsKLQkJcmV0dXJuIDA7Ci0JfQotCi0jaWZkZWYg Q09ORklHX1NXSU9UTEIKLQlpZiAoc3dpb3RsYl9ucl90YmwoKSkKKwllbHNlIGlmIChJU19FTkFC TEVEKENPTkZJR19TV0lPVExCKSAmJiBzd2lvdGxiX25yX3RibCgpKQogCQlkZXZfcHJpdi0+bWFw X21vZGUgPSB2bXdfZG1hX2FsbG9jX2NvaGVyZW50OwogCWVsc2UKLSNlbmRpZgogCQlkZXZfcHJp di0+bWFwX21vZGUgPSB2bXdfZG1hX21hcF9wb3B1bGF0ZTsKIAotb3V0X2ZpeHVwOgotCWlmIChk ZXZfcHJpdi0+bWFwX21vZGUgPT0gdm13X2RtYV9tYXBfcG9wdWxhdGUgJiYKLQkgICAgdm13X3Jl c3RyaWN0X2lvbW11KQorCWlmIChkZXZfcHJpdi0+bWFwX21vZGUgPT0gdm13X2RtYV9tYXBfcG9w dWxhdGUgJiYgdm13X3Jlc3RyaWN0X2lvbW11KQogCQlkZXZfcHJpdi0+bWFwX21vZGUgPSB2bXdf ZG1hX21hcF9iaW5kOwogCi0JaWYgKHZtd19mb3JjZV9jb2hlcmVudCkKLQkJZGV2X3ByaXYtPm1h cF9tb2RlID0gdm13X2RtYV9hbGxvY19jb2hlcmVudDsKLQogCS8qIE5vIFRUTSBjb2hlcmVudCBw YWdlIHBvb2w/IEZJWE1FOiBBc2sgVFRNIGluc3RlYWQhICovCiAgICAgICAgIGlmICghKElTX0VO QUJMRUQoQ09ORklHX1NXSU9UTEIpIHx8IElTX0VOQUJMRUQoQ09ORklHX0lOVEVMX0lPTU1VKSkg JiYKIAkgICAgKGRldl9wcml2LT5tYXBfbW9kZSA9PSB2bXdfZG1hX2FsbG9jX2NvaGVyZW50KSkK IAkJcmV0dXJuIC1FSU5WQUw7CiAKIAlEUk1fSU5GTygiRE1BIG1hcCBtb2RlOiAlc1xuIiwgbmFt ZXNbZGV2X3ByaXYtPm1hcF9tb2RlXSk7Ci0KIAlyZXR1cm4gMDsKIH0KIAotLSAKMi4xOS4wLnJj MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==