From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82B91C47427 for ; Sat, 26 Sep 2020 04:25:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C69B2078B for ; Sat, 26 Sep 2020 04:25:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="zvgDh4o5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C69B2078B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E6006ED94; Sat, 26 Sep 2020 04:25:05 +0000 (UTC) Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A6E86ED8E for ; Sat, 26 Sep 2020 04:25:02 +0000 (UTC) Received: by mail-pj1-x1044.google.com with SMTP id t7so492352pjd.3 for ; Fri, 25 Sep 2020 21:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=06XEeGHHOGK/ICro7P5tlQH3HvkQIwMvcU78rykFbzY=; b=zvgDh4o5Ge79q49paWYi3m66nq39k6wE7QrzuzFKjgrLCt8H6LTyl4Xw3VTyN+n9lY rky20HuPWlBlj+KWAX4O2GSLc8Q5OdlMwGIpopsrMZZVxaeOBONzNdNKIXPGsPKDWlwW 5xWD+b3YsxF3/Ld8pR2QpunLtPqhxmZAbGkAepYz9x2gwNkc2yNwvU6723eJIZ6E8fLA hPV1S9ltYjCPplxqTslDhPUnjJOt02AAgpJvKtwqlYNuwnb8jFmPfHvU7RycoOAt/JWQ dC9V7Mcf9aJ6DwzrM1Hbtajy0ROoW+thxsif1+wjUq+KfX54sUSUBQoh/WCqDfF0bkpE 73aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=06XEeGHHOGK/ICro7P5tlQH3HvkQIwMvcU78rykFbzY=; b=BhDqWApW766PUjeEsyaQ+9ExKaaI+F6dA2uuNi5VGR2xpfejg4xc7IJEoLe98Y36o3 RjFWRwD559mRf4hM8bLl+7/ncwbRcmkhUV7vvu4savAn/7KubE7a8fIB/sIBsIkFyc8S 7niXALAwpyYNro99PAB7TRvTP5Fwya6w38sHFHqIJKhfZPa2xkLEsZm74d5Pn7j4i01y 64TKoylUS00Teaf+0jnY/th3K/tj0pGBOFAYAHSDlxiPH8lb3/tQDaUMgRva/P5Vf3nr NdBh+ooCDTVBgBttd7ne4Y8ez7JH3KerTpsdri2MGAA4d4H+JPf4di4fthHPebEcJhLO yL7Q== X-Gm-Message-State: AOAM532nHJzb0rKlJJvxkkQP03jGlRD+VOjzCEBVKTRjVfl/f2tFniqT JdX4sqde74NwFU0YJh2K9RBr3Q== X-Google-Smtp-Source: ABdhPJwGMjuNMK0u01WspM91aYEUZeR21jjDkWdw78qV4eHRAn/Uu873Er9oNPryyHIHXILdP7eGZQ== X-Received: by 2002:a17:90a:aa94:: with SMTP id l20mr668572pjq.95.1601094301975; Fri, 25 Sep 2020 21:25:01 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id a5sm3585886pgk.13.2020.09.25.21.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 21:25:01 -0700 (PDT) From: John Stultz To: lkml Subject: [RFC][PATCH 3/6] dma-buf: heaps: Remove heap-helpers code Date: Sat, 26 Sep 2020 04:24:50 +0000 Message-Id: <20200926042453.67517-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200926042453.67517-1-john.stultz@linaro.org> References: <20200926042453.67517-1-john.stultz@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sandeep Patil , dri-devel@lists.freedesktop.org, Ezequiel Garcia , Robin Murphy , James Jones , Liam Mark , Laura Abbott , Hridya Valsaraju , =?UTF-8?q?=C3=98rjan=20Eide?= , Suren Baghdasaryan , linux-media@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" VGhlIGhlYXAtaGVscGVycyBjb2RlIHdhcyBub3QgYXMgZ2VuZXJpYyBhcyBpbml0aWFsbHkgaG9w ZWQKYW5kIGl0IGlzIG5vdyBub3QgYmVpbmcgdXNlZCwgc28gcmVtb3ZlIGl0IGZyb20gdGhlIHRy ZWUuCgpDYzogU3VtaXQgU2Vtd2FsIDxzdW1pdC5zZW13YWxAbGluYXJvLm9yZz4KQ2M6IExpYW0g TWFyayA8bG1hcmtAY29kZWF1cm9yYS5vcmc+CkNjOiBMYXVyYSBBYmJvdHQgPGxhYmJvdHRAa2Vy bmVsLm9yZz4KQ2M6IEJyaWFuIFN0YXJrZXkgPEJyaWFuLlN0YXJrZXlAYXJtLmNvbT4KQ2M6IEhy aWR5YSBWYWxzYXJhanUgPGhyaWR5YUBnb29nbGUuY29tPgpDYzogU3VyZW4gQmFnaGRhc2FyeWFu IDxzdXJlbmJAZ29vZ2xlLmNvbT4KQ2M6IFNhbmRlZXAgUGF0aWwgPHNzcGF0aWxAZ29vZ2xlLmNv bT4KQ2M6IMOYcmphbiBFaWRlIDxvcmphbi5laWRlQGFybS5jb20+CkNjOiBSb2JpbiBNdXJwaHkg PHJvYmluLm11cnBoeUBhcm0uY29tPgpDYzogRXplcXVpZWwgR2FyY2lhIDxlemVxdWllbEBjb2xs YWJvcmEuY29tPgpDYzogU2ltb24gU2VyIDxjb250YWN0QGVtZXJzaW9uLmZyPgpDYzogSmFtZXMg Sm9uZXMgPGpham9uZXNAbnZpZGlhLmNvbT4KQ2M6IGxpbnV4LW1lZGlhQHZnZXIua2VybmVsLm9y ZwpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpTaWduZWQtb2ZmLWJ5OiBKb2hu IFN0dWx0eiA8am9obi5zdHVsdHpAbGluYXJvLm9yZz4KLS0tCiBkcml2ZXJzL2RtYS1idWYvaGVh cHMvTWFrZWZpbGUgICAgICAgfCAgIDEgLQogZHJpdmVycy9kbWEtYnVmL2hlYXBzL2hlYXAtaGVs cGVycy5jIHwgMjcxIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9kbWEtYnVm L2hlYXBzL2hlYXAtaGVscGVycy5oIHwgIDUzIC0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzMjUg ZGVsZXRpb25zKC0pCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9kbWEtYnVmL2hlYXBzL2hl YXAtaGVscGVycy5jCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9kbWEtYnVmL2hlYXBzL2hl YXAtaGVscGVycy5oCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEtYnVmL2hlYXBzL01ha2VmaWxl IGIvZHJpdmVycy9kbWEtYnVmL2hlYXBzL01ha2VmaWxlCmluZGV4IDZlNTRjZGVjM2RhMC4uOTc0 NDY3NzkxMDMyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2RtYS1idWYvaGVhcHMvTWFrZWZpbGUKKysr IGIvZHJpdmVycy9kbWEtYnVmL2hlYXBzL01ha2VmaWxlCkBAIC0xLDQgKzEsMyBAQAogIyBTUERY LUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMAotb2JqLXkJCQkJCSs9IGhlYXAtaGVscGVycy5v CiBvYmotJChDT05GSUdfRE1BQlVGX0hFQVBTX1NZU1RFTSkJKz0gc3lzdGVtX2hlYXAubwogb2Jq LSQoQ09ORklHX0RNQUJVRl9IRUFQU19DTUEpCQkrPSBjbWFfaGVhcC5vCmRpZmYgLS1naXQgYS9k cml2ZXJzL2RtYS1idWYvaGVhcHMvaGVhcC1oZWxwZXJzLmMgYi9kcml2ZXJzL2RtYS1idWYvaGVh cHMvaGVhcC1oZWxwZXJzLmMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDlmOTY0Y2Ez ZjU5Yy4uMDAwMDAwMDAwMDAwCi0tLSBhL2RyaXZlcnMvZG1hLWJ1Zi9oZWFwcy9oZWFwLWhlbHBl cnMuYworKysgL2Rldi9udWxsCkBAIC0xLDI3MSArMCwwIEBACi0vLyBTUERYLUxpY2Vuc2UtSWRl bnRpZmllcjogR1BMLTIuMAotI2luY2x1ZGUgPGxpbnV4L2RldmljZS5oPgotI2luY2x1ZGUgPGxp bnV4L2RtYS1idWYuaD4KLSNpbmNsdWRlIDxsaW51eC9lcnIuaD4KLSNpbmNsdWRlIDxsaW51eC9o aWdobWVtLmg+Ci0jaW5jbHVkZSA8bGludXgvaWRyLmg+Ci0jaW5jbHVkZSA8bGludXgvbGlzdC5o PgotI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4KLSNpbmNsdWRlIDxsaW51eC91YWNjZXNzLmg+Ci0j aW5jbHVkZSA8bGludXgvdm1hbGxvYy5oPgotI2luY2x1ZGUgPHVhcGkvbGludXgvZG1hLWhlYXAu aD4KLQotI2luY2x1ZGUgImhlYXAtaGVscGVycy5oIgotCi12b2lkIGluaXRfaGVhcF9oZWxwZXJf YnVmZmVyKHN0cnVjdCBoZWFwX2hlbHBlcl9idWZmZXIgKmJ1ZmZlciwKLQkJCSAgICAgdm9pZCAo KmZyZWUpKHN0cnVjdCBoZWFwX2hlbHBlcl9idWZmZXIgKikpCi17Ci0JYnVmZmVyLT5wcml2X3Zp cnQgPSBOVUxMOwotCW11dGV4X2luaXQoJmJ1ZmZlci0+bG9jayk7Ci0JYnVmZmVyLT52bWFwX2Nu dCA9IDA7Ci0JYnVmZmVyLT52YWRkciA9IE5VTEw7Ci0JYnVmZmVyLT5wYWdlY291bnQgPSAwOwot CWJ1ZmZlci0+cGFnZXMgPSBOVUxMOwotCUlOSVRfTElTVF9IRUFEKCZidWZmZXItPmF0dGFjaG1l bnRzKTsKLQlidWZmZXItPmZyZWUgPSBmcmVlOwotfQotCi1zdHJ1Y3QgZG1hX2J1ZiAqaGVhcF9o ZWxwZXJfZXhwb3J0X2RtYWJ1ZihzdHJ1Y3QgaGVhcF9oZWxwZXJfYnVmZmVyICpidWZmZXIsCi0J CQkJCSAgaW50IGZkX2ZsYWdzKQotewotCURFRklORV9ETUFfQlVGX0VYUE9SVF9JTkZPKGV4cF9p bmZvKTsKLQotCWV4cF9pbmZvLm9wcyA9ICZoZWFwX2hlbHBlcl9vcHM7Ci0JZXhwX2luZm8uc2l6 ZSA9IGJ1ZmZlci0+c2l6ZTsKLQlleHBfaW5mby5mbGFncyA9IGZkX2ZsYWdzOwotCWV4cF9pbmZv LnByaXYgPSBidWZmZXI7Ci0KLQlyZXR1cm4gZG1hX2J1Zl9leHBvcnQoJmV4cF9pbmZvKTsKLX0K LQotc3RhdGljIHZvaWQgKmRtYV9oZWFwX21hcF9rZXJuZWwoc3RydWN0IGhlYXBfaGVscGVyX2J1 ZmZlciAqYnVmZmVyKQotewotCXZvaWQgKnZhZGRyOwotCi0JdmFkZHIgPSB2bWFwKGJ1ZmZlci0+ cGFnZXMsIGJ1ZmZlci0+cGFnZWNvdW50LCBWTV9NQVAsIFBBR0VfS0VSTkVMKTsKLQlpZiAoIXZh ZGRyKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKLQotCXJldHVybiB2YWRkcjsKLX0KLQot c3RhdGljIHZvaWQgZG1hX2hlYXBfYnVmZmVyX2Rlc3Ryb3koc3RydWN0IGhlYXBfaGVscGVyX2J1 ZmZlciAqYnVmZmVyKQotewotCWlmIChidWZmZXItPnZtYXBfY250ID4gMCkgewotCQlXQVJOKDEs ICIlczogYnVmZmVyIHN0aWxsIG1hcHBlZCBpbiB0aGUga2VybmVsXG4iLCBfX2Z1bmNfXyk7Ci0J CXZ1bm1hcChidWZmZXItPnZhZGRyKTsKLQl9Ci0KLQlidWZmZXItPmZyZWUoYnVmZmVyKTsKLX0K LQotc3RhdGljIHZvaWQgKmRtYV9oZWFwX2J1ZmZlcl92bWFwX2dldChzdHJ1Y3QgaGVhcF9oZWxw ZXJfYnVmZmVyICpidWZmZXIpCi17Ci0Jdm9pZCAqdmFkZHI7Ci0KLQlpZiAoYnVmZmVyLT52bWFw X2NudCkgewotCQlidWZmZXItPnZtYXBfY250Kys7Ci0JCXJldHVybiBidWZmZXItPnZhZGRyOwot CX0KLQl2YWRkciA9IGRtYV9oZWFwX21hcF9rZXJuZWwoYnVmZmVyKTsKLQlpZiAoSVNfRVJSKHZh ZGRyKSkKLQkJcmV0dXJuIHZhZGRyOwotCWJ1ZmZlci0+dmFkZHIgPSB2YWRkcjsKLQlidWZmZXIt PnZtYXBfY250Kys7Ci0JcmV0dXJuIHZhZGRyOwotfQotCi1zdGF0aWMgdm9pZCBkbWFfaGVhcF9i dWZmZXJfdm1hcF9wdXQoc3RydWN0IGhlYXBfaGVscGVyX2J1ZmZlciAqYnVmZmVyKQotewotCWlm ICghLS1idWZmZXItPnZtYXBfY250KSB7Ci0JCXZ1bm1hcChidWZmZXItPnZhZGRyKTsKLQkJYnVm ZmVyLT52YWRkciA9IE5VTEw7Ci0JfQotfQotCi1zdHJ1Y3QgZG1hX2hlYXBzX2F0dGFjaG1lbnQg ewotCXN0cnVjdCBkZXZpY2UgKmRldjsKLQlzdHJ1Y3Qgc2dfdGFibGUgdGFibGU7Ci0Jc3RydWN0 IGxpc3RfaGVhZCBsaXN0OwotfTsKLQotc3RhdGljIGludCBkbWFfaGVhcF9hdHRhY2goc3RydWN0 IGRtYV9idWYgKmRtYWJ1ZiwKLQkJCSAgIHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmF0dGFj aG1lbnQpCi17Ci0Jc3RydWN0IGRtYV9oZWFwc19hdHRhY2htZW50ICphOwotCXN0cnVjdCBoZWFw X2hlbHBlcl9idWZmZXIgKmJ1ZmZlciA9IGRtYWJ1Zi0+cHJpdjsKLQlpbnQgcmV0OwotCi0JYSA9 IGt6YWxsb2Moc2l6ZW9mKCphKSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKCFhKQotCQlyZXR1cm4gLUVO T01FTTsKLQotCXJldCA9IHNnX2FsbG9jX3RhYmxlX2Zyb21fcGFnZXMoJmEtPnRhYmxlLCBidWZm ZXItPnBhZ2VzLAotCQkJCQlidWZmZXItPnBhZ2Vjb3VudCwgMCwKLQkJCQkJYnVmZmVyLT5wYWdl Y291bnQgPDwgUEFHRV9TSElGVCwKLQkJCQkJR0ZQX0tFUk5FTCk7Ci0JaWYgKHJldCkgewotCQlr ZnJlZShhKTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KLQlhLT5kZXYgPSBhdHRhY2htZW50LT5kZXY7 Ci0JSU5JVF9MSVNUX0hFQUQoJmEtPmxpc3QpOwotCi0JYXR0YWNobWVudC0+cHJpdiA9IGE7Ci0K LQltdXRleF9sb2NrKCZidWZmZXItPmxvY2spOwotCWxpc3RfYWRkKCZhLT5saXN0LCAmYnVmZmVy LT5hdHRhY2htZW50cyk7Ci0JbXV0ZXhfdW5sb2NrKCZidWZmZXItPmxvY2spOwotCi0JcmV0dXJu IDA7Ci19Ci0KLXN0YXRpYyB2b2lkIGRtYV9oZWFwX2RldGFjaChzdHJ1Y3QgZG1hX2J1ZiAqZG1h YnVmLAotCQkJICAgIHN0cnVjdCBkbWFfYnVmX2F0dGFjaG1lbnQgKmF0dGFjaG1lbnQpCi17Ci0J c3RydWN0IGRtYV9oZWFwc19hdHRhY2htZW50ICphID0gYXR0YWNobWVudC0+cHJpdjsKLQlzdHJ1 Y3QgaGVhcF9oZWxwZXJfYnVmZmVyICpidWZmZXIgPSBkbWFidWYtPnByaXY7Ci0KLQltdXRleF9s b2NrKCZidWZmZXItPmxvY2spOwotCWxpc3RfZGVsKCZhLT5saXN0KTsKLQltdXRleF91bmxvY2so JmJ1ZmZlci0+bG9jayk7Ci0KLQlzZ19mcmVlX3RhYmxlKCZhLT50YWJsZSk7Ci0Ja2ZyZWUoYSk7 Ci19Ci0KLXN0YXRpYwotc3RydWN0IHNnX3RhYmxlICpkbWFfaGVhcF9tYXBfZG1hX2J1ZihzdHJ1 Y3QgZG1hX2J1Zl9hdHRhY2htZW50ICphdHRhY2htZW50LAotCQkJCSAgICAgIGVudW0gZG1hX2Rh dGFfZGlyZWN0aW9uIGRpcmVjdGlvbikKLXsKLQlzdHJ1Y3QgZG1hX2hlYXBzX2F0dGFjaG1lbnQg KmEgPSBhdHRhY2htZW50LT5wcml2OwotCXN0cnVjdCBzZ190YWJsZSAqdGFibGU7Ci0KLQl0YWJs ZSA9ICZhLT50YWJsZTsKLQotCWlmICghZG1hX21hcF9zZyhhdHRhY2htZW50LT5kZXYsIHRhYmxl LT5zZ2wsIHRhYmxlLT5uZW50cywKLQkJCWRpcmVjdGlvbikpCi0JCXRhYmxlID0gRVJSX1BUUigt RU5PTUVNKTsKLQlyZXR1cm4gdGFibGU7Ci19Ci0KLXN0YXRpYyB2b2lkIGRtYV9oZWFwX3VubWFw X2RtYV9idWYoc3RydWN0IGRtYV9idWZfYXR0YWNobWVudCAqYXR0YWNobWVudCwKLQkJCQkgICBz dHJ1Y3Qgc2dfdGFibGUgKnRhYmxlLAotCQkJCSAgIGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRp cmVjdGlvbikKLXsKLQlkbWFfdW5tYXBfc2coYXR0YWNobWVudC0+ZGV2LCB0YWJsZS0+c2dsLCB0 YWJsZS0+bmVudHMsIGRpcmVjdGlvbik7Ci19Ci0KLXN0YXRpYyB2bV9mYXVsdF90IGRtYV9oZWFw X3ZtX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQotewotCXN0cnVjdCB2bV9hcmVhX3N0cnVj dCAqdm1hID0gdm1mLT52bWE7Ci0Jc3RydWN0IGhlYXBfaGVscGVyX2J1ZmZlciAqYnVmZmVyID0g dm1hLT52bV9wcml2YXRlX2RhdGE7Ci0KLQlpZiAodm1mLT5wZ29mZiA+IGJ1ZmZlci0+cGFnZWNv dW50KQotCQlyZXR1cm4gVk1fRkFVTFRfU0lHQlVTOwotCi0Jdm1mLT5wYWdlID0gYnVmZmVyLT5w YWdlc1t2bWYtPnBnb2ZmXTsKLQlnZXRfcGFnZSh2bWYtPnBhZ2UpOwotCi0JcmV0dXJuIDA7Ci19 Ci0KLXN0YXRpYyBjb25zdCBzdHJ1Y3Qgdm1fb3BlcmF0aW9uc19zdHJ1Y3QgZG1hX2hlYXBfdm1f b3BzID0gewotCS5mYXVsdCA9IGRtYV9oZWFwX3ZtX2ZhdWx0LAotfTsKLQotc3RhdGljIGludCBk bWFfaGVhcF9tbWFwKHN0cnVjdCBkbWFfYnVmICpkbWFidWYsIHN0cnVjdCB2bV9hcmVhX3N0cnVj dCAqdm1hKQotewotCXN0cnVjdCBoZWFwX2hlbHBlcl9idWZmZXIgKmJ1ZmZlciA9IGRtYWJ1Zi0+ cHJpdjsKLQotCWlmICgodm1hLT52bV9mbGFncyAmIChWTV9TSEFSRUQgfCBWTV9NQVlTSEFSRSkp ID09IDApCi0JCXJldHVybiAtRUlOVkFMOwotCi0Jdm1hLT52bV9vcHMgPSAmZG1hX2hlYXBfdm1f b3BzOwotCXZtYS0+dm1fcHJpdmF0ZV9kYXRhID0gYnVmZmVyOwotCi0JcmV0dXJuIDA7Ci19Ci0K LXN0YXRpYyB2b2lkIGRtYV9oZWFwX2RtYV9idWZfcmVsZWFzZShzdHJ1Y3QgZG1hX2J1ZiAqZG1h YnVmKQotewotCXN0cnVjdCBoZWFwX2hlbHBlcl9idWZmZXIgKmJ1ZmZlciA9IGRtYWJ1Zi0+cHJp djsKLQotCWRtYV9oZWFwX2J1ZmZlcl9kZXN0cm95KGJ1ZmZlcik7Ci19Ci0KLXN0YXRpYyBpbnQg ZG1hX2hlYXBfZG1hX2J1Zl9iZWdpbl9jcHVfYWNjZXNzKHN0cnVjdCBkbWFfYnVmICpkbWFidWYs Ci0JCQkJCSAgICAgZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyZWN0aW9uKQotewotCXN0cnVj dCBoZWFwX2hlbHBlcl9idWZmZXIgKmJ1ZmZlciA9IGRtYWJ1Zi0+cHJpdjsKLQlzdHJ1Y3QgZG1h X2hlYXBzX2F0dGFjaG1lbnQgKmE7Ci0JaW50IHJldCA9IDA7Ci0KLQltdXRleF9sb2NrKCZidWZm ZXItPmxvY2spOwotCi0JaWYgKGJ1ZmZlci0+dm1hcF9jbnQpCi0JCWludmFsaWRhdGVfa2VybmVs X3ZtYXBfcmFuZ2UoYnVmZmVyLT52YWRkciwgYnVmZmVyLT5zaXplKTsKLQotCWxpc3RfZm9yX2Vh Y2hfZW50cnkoYSwgJmJ1ZmZlci0+YXR0YWNobWVudHMsIGxpc3QpIHsKLQkJZG1hX3N5bmNfc2df Zm9yX2NwdShhLT5kZXYsIGEtPnRhYmxlLnNnbCwgYS0+dGFibGUubmVudHMsCi0JCQkJICAgIGRp cmVjdGlvbik7Ci0JfQotCW11dGV4X3VubG9jaygmYnVmZmVyLT5sb2NrKTsKLQotCXJldHVybiBy ZXQ7Ci19Ci0KLXN0YXRpYyBpbnQgZG1hX2hlYXBfZG1hX2J1Zl9lbmRfY3B1X2FjY2VzcyhzdHJ1 Y3QgZG1hX2J1ZiAqZG1hYnVmLAotCQkJCQkgICBlbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXJl Y3Rpb24pCi17Ci0Jc3RydWN0IGhlYXBfaGVscGVyX2J1ZmZlciAqYnVmZmVyID0gZG1hYnVmLT5w cml2OwotCXN0cnVjdCBkbWFfaGVhcHNfYXR0YWNobWVudCAqYTsKLQotCW11dGV4X2xvY2soJmJ1 ZmZlci0+bG9jayk7Ci0KLQlpZiAoYnVmZmVyLT52bWFwX2NudCkKLQkJZmx1c2hfa2VybmVsX3Zt YXBfcmFuZ2UoYnVmZmVyLT52YWRkciwgYnVmZmVyLT5zaXplKTsKLQotCWxpc3RfZm9yX2VhY2hf ZW50cnkoYSwgJmJ1ZmZlci0+YXR0YWNobWVudHMsIGxpc3QpIHsKLQkJZG1hX3N5bmNfc2dfZm9y X2RldmljZShhLT5kZXYsIGEtPnRhYmxlLnNnbCwgYS0+dGFibGUubmVudHMsCi0JCQkJICAgICAg IGRpcmVjdGlvbik7Ci0JfQotCW11dGV4X3VubG9jaygmYnVmZmVyLT5sb2NrKTsKLQotCXJldHVy biAwOwotfQotCi1zdGF0aWMgdm9pZCAqZG1hX2hlYXBfZG1hX2J1Zl92bWFwKHN0cnVjdCBkbWFf YnVmICpkbWFidWYpCi17Ci0Jc3RydWN0IGhlYXBfaGVscGVyX2J1ZmZlciAqYnVmZmVyID0gZG1h YnVmLT5wcml2OwotCXZvaWQgKnZhZGRyOwotCi0JbXV0ZXhfbG9jaygmYnVmZmVyLT5sb2NrKTsK LQl2YWRkciA9IGRtYV9oZWFwX2J1ZmZlcl92bWFwX2dldChidWZmZXIpOwotCW11dGV4X3VubG9j aygmYnVmZmVyLT5sb2NrKTsKLQotCXJldHVybiB2YWRkcjsKLX0KLQotc3RhdGljIHZvaWQgZG1h X2hlYXBfZG1hX2J1Zl92dW5tYXAoc3RydWN0IGRtYV9idWYgKmRtYWJ1Ziwgdm9pZCAqdmFkZHIp Ci17Ci0Jc3RydWN0IGhlYXBfaGVscGVyX2J1ZmZlciAqYnVmZmVyID0gZG1hYnVmLT5wcml2Owot Ci0JbXV0ZXhfbG9jaygmYnVmZmVyLT5sb2NrKTsKLQlkbWFfaGVhcF9idWZmZXJfdm1hcF9wdXQo YnVmZmVyKTsKLQltdXRleF91bmxvY2soJmJ1ZmZlci0+bG9jayk7Ci19Ci0KLWNvbnN0IHN0cnVj dCBkbWFfYnVmX29wcyBoZWFwX2hlbHBlcl9vcHMgPSB7Ci0JLm1hcF9kbWFfYnVmID0gZG1hX2hl YXBfbWFwX2RtYV9idWYsCi0JLnVubWFwX2RtYV9idWYgPSBkbWFfaGVhcF91bm1hcF9kbWFfYnVm LAotCS5tbWFwID0gZG1hX2hlYXBfbW1hcCwKLQkucmVsZWFzZSA9IGRtYV9oZWFwX2RtYV9idWZf cmVsZWFzZSwKLQkuYXR0YWNoID0gZG1hX2hlYXBfYXR0YWNoLAotCS5kZXRhY2ggPSBkbWFfaGVh cF9kZXRhY2gsCi0JLmJlZ2luX2NwdV9hY2Nlc3MgPSBkbWFfaGVhcF9kbWFfYnVmX2JlZ2luX2Nw dV9hY2Nlc3MsCi0JLmVuZF9jcHVfYWNjZXNzID0gZG1hX2hlYXBfZG1hX2J1Zl9lbmRfY3B1X2Fj Y2VzcywKLQkudm1hcCA9IGRtYV9oZWFwX2RtYV9idWZfdm1hcCwKLQkudnVubWFwID0gZG1hX2hl YXBfZG1hX2J1Zl92dW5tYXAsCi19OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEtYnVmL2hlYXBz L2hlYXAtaGVscGVycy5oIGIvZHJpdmVycy9kbWEtYnVmL2hlYXBzL2hlYXAtaGVscGVycy5oCmRl bGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCA4MDVkMmRmODgwMjQuLjAwMDAwMDAwMDAwMAot LS0gYS9kcml2ZXJzL2RtYS1idWYvaGVhcHMvaGVhcC1oZWxwZXJzLmgKKysrIC9kZXYvbnVsbApA QCAtMSw1MyArMCwwIEBACi0vKiBTUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogR1BMLTIuMCAqLwot LyoKLSAqIERNQUJVRiBIZWFwcyBoZWxwZXIgY29kZQotICoKLSAqIENvcHlyaWdodCAoQykgMjAx MSBHb29nbGUsIEluYy4KLSAqIENvcHlyaWdodCAoQykgMjAxOSBMaW5hcm8gTHRkLgotICovCi0K LSNpZm5kZWYgX0hFQVBfSEVMUEVSU19ICi0jZGVmaW5lIF9IRUFQX0hFTFBFUlNfSAotCi0jaW5j bHVkZSA8bGludXgvZG1hLWhlYXAuaD4KLSNpbmNsdWRlIDxsaW51eC9saXN0Lmg+Ci0KLS8qKgot ICogc3RydWN0IGhlYXBfaGVscGVyX2J1ZmZlciAtIGhlbHBlciBidWZmZXIgbWV0YWRhdGEKLSAq IEBoZWFwOgkJYmFjayBwb2ludGVyIHRvIHRoZSBoZWFwIHRoZSBidWZmZXIgY2FtZSBmcm9tCi0g KiBAZG1hYnVmOgkJYmFja2luZyBkbWEtYnVmIGZvciB0aGlzIGJ1ZmZlcgotICogQHNpemU6CQlz aXplIG9mIHRoZSBidWZmZXIKLSAqIEBwcml2X3ZpcnQJCXBvaW50ZXIgdG8gaGVhcCBzcGVjaWZp YyBwcml2YXRlIHZhbHVlCi0gKiBAbG9jawkJbXV0ZXh0IHRvIHByb3RlY3QgdGhlIGRhdGEgaW4g dGhpcyBzdHJ1Y3R1cmUKLSAqIEB2bWFwX2NudAkJY291bnQgb2Ygdm1hcCByZWZlcmVuY2VzIG9u IHRoZSBidWZmZXIKLSAqIEB2YWRkcgkJdm1hcCdlZCB2aXJ0dWFsIGFkZHJlc3MKLSAqIEBwYWdl Y291bnQJCW51bWJlciBvZiBwYWdlcyBpbiB0aGUgYnVmZmVyCi0gKiBAcGFnZXMJCWxpc3Qgb2Yg cGFnZSBwb2ludGVycwotICogQGF0dGFjaG1lbnRzCQlsaXN0IG9mIGRldmljZSBhdHRhY2htZW50 cwotICoKLSAqIEBmcmVlCQloZWFwIGNhbGxiYWNrIHRvIGZyZWUgdGhlIGJ1ZmZlcgotICovCi1z dHJ1Y3QgaGVhcF9oZWxwZXJfYnVmZmVyIHsKLQlzdHJ1Y3QgZG1hX2hlYXAgKmhlYXA7Ci0Jc3Ry dWN0IGRtYV9idWYgKmRtYWJ1ZjsKLQlzaXplX3Qgc2l6ZTsKLQotCXZvaWQgKnByaXZfdmlydDsK LQlzdHJ1Y3QgbXV0ZXggbG9jazsKLQlpbnQgdm1hcF9jbnQ7Ci0Jdm9pZCAqdmFkZHI7Ci0JcGdv ZmZfdCBwYWdlY291bnQ7Ci0Jc3RydWN0IHBhZ2UgKipwYWdlczsKLQlzdHJ1Y3QgbGlzdF9oZWFk IGF0dGFjaG1lbnRzOwotCi0Jdm9pZCAoKmZyZWUpKHN0cnVjdCBoZWFwX2hlbHBlcl9idWZmZXIg KmJ1ZmZlcik7Ci19OwotCi12b2lkIGluaXRfaGVhcF9oZWxwZXJfYnVmZmVyKHN0cnVjdCBoZWFw X2hlbHBlcl9idWZmZXIgKmJ1ZmZlciwKLQkJCSAgICAgdm9pZCAoKmZyZWUpKHN0cnVjdCBoZWFw X2hlbHBlcl9idWZmZXIgKikpOwotCi1zdHJ1Y3QgZG1hX2J1ZiAqaGVhcF9oZWxwZXJfZXhwb3J0 X2RtYWJ1ZihzdHJ1Y3QgaGVhcF9oZWxwZXJfYnVmZmVyICpidWZmZXIsCi0JCQkJCSAgaW50IGZk X2ZsYWdzKTsKLQotZXh0ZXJuIGNvbnN0IHN0cnVjdCBkbWFfYnVmX29wcyBoZWFwX2hlbHBlcl9v cHM7Ci0jZW5kaWYgLyogX0hFQVBfSEVMUEVSU19IICovCi0tIAoyLjE3LjEKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxp c3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B7F8C47426 for ; Sat, 26 Sep 2020 04:25:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1774207C4 for ; Sat, 26 Sep 2020 04:25:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="zvgDh4o5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730050AbgIZEZN (ORCPT ); Sat, 26 Sep 2020 00:25:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730020AbgIZEZC (ORCPT ); Sat, 26 Sep 2020 00:25:02 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E4AFC0613CE for ; Fri, 25 Sep 2020 21:25:02 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id q4so488179pjh.5 for ; Fri, 25 Sep 2020 21:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=06XEeGHHOGK/ICro7P5tlQH3HvkQIwMvcU78rykFbzY=; b=zvgDh4o5Ge79q49paWYi3m66nq39k6wE7QrzuzFKjgrLCt8H6LTyl4Xw3VTyN+n9lY rky20HuPWlBlj+KWAX4O2GSLc8Q5OdlMwGIpopsrMZZVxaeOBONzNdNKIXPGsPKDWlwW 5xWD+b3YsxF3/Ld8pR2QpunLtPqhxmZAbGkAepYz9x2gwNkc2yNwvU6723eJIZ6E8fLA hPV1S9ltYjCPplxqTslDhPUnjJOt02AAgpJvKtwqlYNuwnb8jFmPfHvU7RycoOAt/JWQ dC9V7Mcf9aJ6DwzrM1Hbtajy0ROoW+thxsif1+wjUq+KfX54sUSUBQoh/WCqDfF0bkpE 73aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=06XEeGHHOGK/ICro7P5tlQH3HvkQIwMvcU78rykFbzY=; b=AeHYoNMHQnngPFERstIvCNU5IbdHWQ+gdoEbPQXIMU+cbFNmxJhfCwVV41y3tl2eQ2 5mHP+VcKQkEdmdKeYXDoxoP63RHFnskWfwVEgi2LfDJGdbBlN5UAbk8J6X7iLjV2M5oa lPdstTHG8d20j6ETFCCSeCYQ94lxwPdnJzkWu2bdLS5VFfcriRD8Bzg01p3FcldSSb38 AdE4efgBKn7mJ9Bj0DJ239l9Pp+/zISeD/Ic4lDvBCi4SDXtZGbXM4KzcwCNG8XuGCnV YlWqy4SQ1D9Cv6lOaRbXvDL+1DJfwFMDOwADtxkxcwKty1BtT0BIcUoC1QqCTCpuwHOo +Glw== X-Gm-Message-State: AOAM533m5yIEUn+JpDNTvOiYKeZrYGfjmIeR4/A3PctZI+0cj3X0r8tk pq6+1LyNxRQR7V6jLqhV1QWBeQ== X-Google-Smtp-Source: ABdhPJwGMjuNMK0u01WspM91aYEUZeR21jjDkWdw78qV4eHRAn/Uu873Er9oNPryyHIHXILdP7eGZQ== X-Received: by 2002:a17:90a:aa94:: with SMTP id l20mr668572pjq.95.1601094301975; Fri, 25 Sep 2020 21:25:01 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id a5sm3585886pgk.13.2020.09.25.21.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2020 21:25:01 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Sumit Semwal , Liam Mark , Laura Abbott , Brian Starkey , Hridya Valsaraju , Suren Baghdasaryan , Sandeep Patil , =?UTF-8?q?=C3=98rjan=20Eide?= , Robin Murphy , Ezequiel Garcia , Simon Ser , James Jones , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [RFC][PATCH 3/6] dma-buf: heaps: Remove heap-helpers code Date: Sat, 26 Sep 2020 04:24:50 +0000 Message-Id: <20200926042453.67517-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200926042453.67517-1-john.stultz@linaro.org> References: <20200926042453.67517-1-john.stultz@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The heap-helpers code was not as generic as initially hoped and it is now not being used, so remove it from the tree. Cc: Sumit Semwal Cc: Liam Mark Cc: Laura Abbott Cc: Brian Starkey Cc: Hridya Valsaraju Cc: Suren Baghdasaryan Cc: Sandeep Patil Cc: Ørjan Eide Cc: Robin Murphy Cc: Ezequiel Garcia Cc: Simon Ser Cc: James Jones Cc: linux-media@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: John Stultz --- drivers/dma-buf/heaps/Makefile | 1 - drivers/dma-buf/heaps/heap-helpers.c | 271 --------------------------- drivers/dma-buf/heaps/heap-helpers.h | 53 ------ 3 files changed, 325 deletions(-) delete mode 100644 drivers/dma-buf/heaps/heap-helpers.c delete mode 100644 drivers/dma-buf/heaps/heap-helpers.h diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile index 6e54cdec3da0..974467791032 100644 --- a/drivers/dma-buf/heaps/Makefile +++ b/drivers/dma-buf/heaps/Makefile @@ -1,4 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y += heap-helpers.o obj-$(CONFIG_DMABUF_HEAPS_SYSTEM) += system_heap.o obj-$(CONFIG_DMABUF_HEAPS_CMA) += cma_heap.o diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c deleted file mode 100644 index 9f964ca3f59c..000000000000 --- a/drivers/dma-buf/heaps/heap-helpers.c +++ /dev/null @@ -1,271 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "heap-helpers.h" - -void init_heap_helper_buffer(struct heap_helper_buffer *buffer, - void (*free)(struct heap_helper_buffer *)) -{ - buffer->priv_virt = NULL; - mutex_init(&buffer->lock); - buffer->vmap_cnt = 0; - buffer->vaddr = NULL; - buffer->pagecount = 0; - buffer->pages = NULL; - INIT_LIST_HEAD(&buffer->attachments); - buffer->free = free; -} - -struct dma_buf *heap_helper_export_dmabuf(struct heap_helper_buffer *buffer, - int fd_flags) -{ - DEFINE_DMA_BUF_EXPORT_INFO(exp_info); - - exp_info.ops = &heap_helper_ops; - exp_info.size = buffer->size; - exp_info.flags = fd_flags; - exp_info.priv = buffer; - - return dma_buf_export(&exp_info); -} - -static void *dma_heap_map_kernel(struct heap_helper_buffer *buffer) -{ - void *vaddr; - - vaddr = vmap(buffer->pages, buffer->pagecount, VM_MAP, PAGE_KERNEL); - if (!vaddr) - return ERR_PTR(-ENOMEM); - - return vaddr; -} - -static void dma_heap_buffer_destroy(struct heap_helper_buffer *buffer) -{ - if (buffer->vmap_cnt > 0) { - WARN(1, "%s: buffer still mapped in the kernel\n", __func__); - vunmap(buffer->vaddr); - } - - buffer->free(buffer); -} - -static void *dma_heap_buffer_vmap_get(struct heap_helper_buffer *buffer) -{ - void *vaddr; - - if (buffer->vmap_cnt) { - buffer->vmap_cnt++; - return buffer->vaddr; - } - vaddr = dma_heap_map_kernel(buffer); - if (IS_ERR(vaddr)) - return vaddr; - buffer->vaddr = vaddr; - buffer->vmap_cnt++; - return vaddr; -} - -static void dma_heap_buffer_vmap_put(struct heap_helper_buffer *buffer) -{ - if (!--buffer->vmap_cnt) { - vunmap(buffer->vaddr); - buffer->vaddr = NULL; - } -} - -struct dma_heaps_attachment { - struct device *dev; - struct sg_table table; - struct list_head list; -}; - -static int dma_heap_attach(struct dma_buf *dmabuf, - struct dma_buf_attachment *attachment) -{ - struct dma_heaps_attachment *a; - struct heap_helper_buffer *buffer = dmabuf->priv; - int ret; - - a = kzalloc(sizeof(*a), GFP_KERNEL); - if (!a) - return -ENOMEM; - - ret = sg_alloc_table_from_pages(&a->table, buffer->pages, - buffer->pagecount, 0, - buffer->pagecount << PAGE_SHIFT, - GFP_KERNEL); - if (ret) { - kfree(a); - return ret; - } - - a->dev = attachment->dev; - INIT_LIST_HEAD(&a->list); - - attachment->priv = a; - - mutex_lock(&buffer->lock); - list_add(&a->list, &buffer->attachments); - mutex_unlock(&buffer->lock); - - return 0; -} - -static void dma_heap_detach(struct dma_buf *dmabuf, - struct dma_buf_attachment *attachment) -{ - struct dma_heaps_attachment *a = attachment->priv; - struct heap_helper_buffer *buffer = dmabuf->priv; - - mutex_lock(&buffer->lock); - list_del(&a->list); - mutex_unlock(&buffer->lock); - - sg_free_table(&a->table); - kfree(a); -} - -static -struct sg_table *dma_heap_map_dma_buf(struct dma_buf_attachment *attachment, - enum dma_data_direction direction) -{ - struct dma_heaps_attachment *a = attachment->priv; - struct sg_table *table; - - table = &a->table; - - if (!dma_map_sg(attachment->dev, table->sgl, table->nents, - direction)) - table = ERR_PTR(-ENOMEM); - return table; -} - -static void dma_heap_unmap_dma_buf(struct dma_buf_attachment *attachment, - struct sg_table *table, - enum dma_data_direction direction) -{ - dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction); -} - -static vm_fault_t dma_heap_vm_fault(struct vm_fault *vmf) -{ - struct vm_area_struct *vma = vmf->vma; - struct heap_helper_buffer *buffer = vma->vm_private_data; - - if (vmf->pgoff > buffer->pagecount) - return VM_FAULT_SIGBUS; - - vmf->page = buffer->pages[vmf->pgoff]; - get_page(vmf->page); - - return 0; -} - -static const struct vm_operations_struct dma_heap_vm_ops = { - .fault = dma_heap_vm_fault, -}; - -static int dma_heap_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma) -{ - struct heap_helper_buffer *buffer = dmabuf->priv; - - if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) == 0) - return -EINVAL; - - vma->vm_ops = &dma_heap_vm_ops; - vma->vm_private_data = buffer; - - return 0; -} - -static void dma_heap_dma_buf_release(struct dma_buf *dmabuf) -{ - struct heap_helper_buffer *buffer = dmabuf->priv; - - dma_heap_buffer_destroy(buffer); -} - -static int dma_heap_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, - enum dma_data_direction direction) -{ - struct heap_helper_buffer *buffer = dmabuf->priv; - struct dma_heaps_attachment *a; - int ret = 0; - - mutex_lock(&buffer->lock); - - if (buffer->vmap_cnt) - invalidate_kernel_vmap_range(buffer->vaddr, buffer->size); - - list_for_each_entry(a, &buffer->attachments, list) { - dma_sync_sg_for_cpu(a->dev, a->table.sgl, a->table.nents, - direction); - } - mutex_unlock(&buffer->lock); - - return ret; -} - -static int dma_heap_dma_buf_end_cpu_access(struct dma_buf *dmabuf, - enum dma_data_direction direction) -{ - struct heap_helper_buffer *buffer = dmabuf->priv; - struct dma_heaps_attachment *a; - - mutex_lock(&buffer->lock); - - if (buffer->vmap_cnt) - flush_kernel_vmap_range(buffer->vaddr, buffer->size); - - list_for_each_entry(a, &buffer->attachments, list) { - dma_sync_sg_for_device(a->dev, a->table.sgl, a->table.nents, - direction); - } - mutex_unlock(&buffer->lock); - - return 0; -} - -static void *dma_heap_dma_buf_vmap(struct dma_buf *dmabuf) -{ - struct heap_helper_buffer *buffer = dmabuf->priv; - void *vaddr; - - mutex_lock(&buffer->lock); - vaddr = dma_heap_buffer_vmap_get(buffer); - mutex_unlock(&buffer->lock); - - return vaddr; -} - -static void dma_heap_dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) -{ - struct heap_helper_buffer *buffer = dmabuf->priv; - - mutex_lock(&buffer->lock); - dma_heap_buffer_vmap_put(buffer); - mutex_unlock(&buffer->lock); -} - -const struct dma_buf_ops heap_helper_ops = { - .map_dma_buf = dma_heap_map_dma_buf, - .unmap_dma_buf = dma_heap_unmap_dma_buf, - .mmap = dma_heap_mmap, - .release = dma_heap_dma_buf_release, - .attach = dma_heap_attach, - .detach = dma_heap_detach, - .begin_cpu_access = dma_heap_dma_buf_begin_cpu_access, - .end_cpu_access = dma_heap_dma_buf_end_cpu_access, - .vmap = dma_heap_dma_buf_vmap, - .vunmap = dma_heap_dma_buf_vunmap, -}; diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h deleted file mode 100644 index 805d2df88024..000000000000 --- a/drivers/dma-buf/heaps/heap-helpers.h +++ /dev/null @@ -1,53 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * DMABUF Heaps helper code - * - * Copyright (C) 2011 Google, Inc. - * Copyright (C) 2019 Linaro Ltd. - */ - -#ifndef _HEAP_HELPERS_H -#define _HEAP_HELPERS_H - -#include -#include - -/** - * struct heap_helper_buffer - helper buffer metadata - * @heap: back pointer to the heap the buffer came from - * @dmabuf: backing dma-buf for this buffer - * @size: size of the buffer - * @priv_virt pointer to heap specific private value - * @lock mutext to protect the data in this structure - * @vmap_cnt count of vmap references on the buffer - * @vaddr vmap'ed virtual address - * @pagecount number of pages in the buffer - * @pages list of page pointers - * @attachments list of device attachments - * - * @free heap callback to free the buffer - */ -struct heap_helper_buffer { - struct dma_heap *heap; - struct dma_buf *dmabuf; - size_t size; - - void *priv_virt; - struct mutex lock; - int vmap_cnt; - void *vaddr; - pgoff_t pagecount; - struct page **pages; - struct list_head attachments; - - void (*free)(struct heap_helper_buffer *buffer); -}; - -void init_heap_helper_buffer(struct heap_helper_buffer *buffer, - void (*free)(struct heap_helper_buffer *)); - -struct dma_buf *heap_helper_export_dmabuf(struct heap_helper_buffer *buffer, - int fd_flags); - -extern const struct dma_buf_ops heap_helper_ops; -#endif /* _HEAP_HELPERS_H */ -- 2.17.1