From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 4/4] drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode Date: Sat, 5 Jan 2019 09:01:08 +0100 Message-ID: <20190105080108.14837-5-hch@lst.de> References: <20190105080108.14837-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190105080108.14837-1-hch@lst.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: thellstrom@vmware.com Cc: iommu@lists.linux-foundation.org, linux-graphics-maintainer@vmware.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: iommu@lists.linux-foundation.org SnVzdCB1c2UgYSBzaW1wbGUgaWYvZWxzZSBjaGFpbiB0byBzZWxlY3QgdGhlIERNQSBtb2RlLgoK U2lnbmVkLW9mZi1ieTogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMgfCAyNSArKysrKystLS0tLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYyBiL2RyaXZlcnMv Z3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5jCmluZGV4IGMyMDYwZjZjYzllOC4uODYzODc3MzVh OTBiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwpAQCAtNTY2LDM0ICs1NjYsMjEg QEAgc3RhdGljIGludCB2bXdfZG1hX3NlbGVjdF9tb2RlKHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJCVt2bXdfZG1hX21hcF9wb3B1bGF0ZV0gPSAiS2VlcGluZyBETUEgbWFwcGluZ3Mu IiwKIAkJW3Ztd19kbWFfbWFwX2JpbmRdID0gIkdpdmluZyB1cCBETUEgbWFwcGluZ3MgZWFybHku In07CiAKLQlpZiAoaW50ZWxfaW9tbXVfZW5hYmxlZCkgeworCWlmICh2bXdfZm9yY2VfY29oZXJl bnQpCisJCWRldl9wcml2LT5tYXBfbW9kZSA9IHZtd19kbWFfYWxsb2NfY29oZXJlbnQ7CisJZWxz ZSBpZiAoaW50ZWxfaW9tbXVfZW5hYmxlZCkKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2Rt YV9tYXBfcG9wdWxhdGU7Ci0JCWdvdG8gb3V0X2ZpeHVwOwotCX0KLQotCWlmICghKHZtd19mb3Jj ZV9pb21tdSB8fCB2bXdfZm9yY2VfY29oZXJlbnQpKSB7CisJZWxzZSBpZiAoIXZtd19mb3JjZV9p b21tdSkKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2RtYV9waHlzOwotCQlEUk1fSU5GTygi RE1BIG1hcCBtb2RlOiAlc1xuIiwgbmFtZXNbZGV2X3ByaXYtPm1hcF9tb2RlXSk7Ci0JCXJldHVy biAwOwotCX0KLQotI2lmZGVmIENPTkZJR19TV0lPVExCCi0JaWYgKHN3aW90bGJfbnJfdGJsKCkp CisJZWxzZSBpZiAoSVNfRU5BQkxFRChDT05GSUdfU1dJT1RMQikgJiYgc3dpb3RsYl9ucl90Ymwo KSkKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2RtYV9hbGxvY19jb2hlcmVudDsKIAllbHNl Ci0jZW5kaWYKIAkJZGV2X3ByaXYtPm1hcF9tb2RlID0gdm13X2RtYV9tYXBfcG9wdWxhdGU7CiAK LW91dF9maXh1cDoKLQlpZiAoZGV2X3ByaXYtPm1hcF9tb2RlID09IHZtd19kbWFfbWFwX3BvcHVs YXRlICYmCi0JICAgIHZtd19yZXN0cmljdF9pb21tdSkKKwlpZiAoZGV2X3ByaXYtPm1hcF9tb2Rl ID09IHZtd19kbWFfbWFwX3BvcHVsYXRlICYmIHZtd19yZXN0cmljdF9pb21tdSkKIAkJZGV2X3By aXYtPm1hcF9tb2RlID0gdm13X2RtYV9tYXBfYmluZDsKIAotCWlmICh2bXdfZm9yY2VfY29oZXJl bnQpCi0JCWRldl9wcml2LT5tYXBfbW9kZSA9IHZtd19kbWFfYWxsb2NfY29oZXJlbnQ7Ci0KIAlE Uk1fSU5GTygiRE1BIG1hcCBtb2RlOiAlc1xuIiwgbmFtZXNbZGV2X3ByaXYtPm1hcF9tb2RlXSk7 Ci0KIAlyZXR1cm4gMDsKIH0KIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwK