From patchwork Fri Dec 13 22:24:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22412 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 902FF23FBA for ; Fri, 13 Dec 2013 22:27:24 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf7438296pbc.0 for ; Fri, 13 Dec 2013 14:27:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=OBBmII4cyCpav7TgfPvK2W/T81kKS267QjzQ6s+tbic=; b=Yy/ACL0Dx6BvrWuAc/gLDAi4+ak3LkZgjhYglRVtAFjWprLhWZqfMaDKbCubWlsbqI ndIUlgKtrg1+vKpJVtCLjJBBxfImvN0s6o6LzR+HtODVLbHmWeGBc5pu+lTEpJQUIqh/ Z3puRT+DxCQEwQ/QK9UXmuKGA0HwP3gxwIhTvDdI4Hp+YtpsBNV7p5nUDO73ybLEIo6o CL0zuD5P8kBSIXoAAv7b021hyZCmvKPocKo4lxBva1Caq2zQrR1Eq/kNn4zRRB4xPFDo XtXi3LUHGyKHmwgPXfI/UvlZKIr8Z3hMMC99fJrayfGkun04f2MdPSMLnwxc2r58Rtsx cJKg== X-Gm-Message-State: ALoCoQk++dd1B+Bu2ChDi/mBdKHSxsYIj2L9bxLg0rU/Ik2lNNtYCwwTVUapkIkR26pgPkx4hRA8 X-Received: by 10.66.153.137 with SMTP id vg9mr2718681pab.43.1386973643897; Fri, 13 Dec 2013 14:27:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.81.229 with SMTP id d5ls1182571qey.64.gmail; Fri, 13 Dec 2013 14:27:23 -0800 (PST) X-Received: by 10.220.97.69 with SMTP id k5mr2193336vcn.45.1386973643665; Fri, 13 Dec 2013 14:27:23 -0800 (PST) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id dp7si1192009ved.111.2013.12.13.14.27.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:27:23 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.46; Received: by mail-vb0-f46.google.com with SMTP id w20so1716026vbb.19 for ; Fri, 13 Dec 2013 14:27:23 -0800 (PST) X-Received: by 10.52.103.35 with SMTP id ft3mr1866303vdb.5.1386973643571; Fri, 13 Dec 2013 14:27:23 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73539vcz; Fri, 13 Dec 2013 14:27:23 -0800 (PST) X-Received: by 10.68.195.70 with SMTP id ic6mr6058839pbc.112.1386973642843; Fri, 13 Dec 2013 14:27:22 -0800 (PST) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by mx.google.com with ESMTPS id pk8si2488548pab.242.2013.12.13.14.27.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:27:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.192.182 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.192.182; Received: by mail-pd0-f182.google.com with SMTP id v10so3053827pde.13 for ; Fri, 13 Dec 2013 14:27:22 -0800 (PST) X-Received: by 10.68.138.226 with SMTP id qt2mr5954732pbb.65.1386973642462; Fri, 13 Dec 2013 14:27:22 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id qz9sm7457908pbc.3.2013.12.13.14.27.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:27:21 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , Benjamin Gaignard , John Stultz Subject: [PATCH 047/115] gpu: ion: fix carveout ops Date: Fri, 13 Dec 2013 14:24:21 -0800 Message-Id: <1386973529-4884-48-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Benjamin Gaignard when using carveout heap ion_buffer_create function failed because map_dma and unmap_dma operations aren't set by carveout heap. Signed-off-by: Benjamin Gaignard [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion_carveout_heap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c index daa348e..fd64168 100644 --- a/drivers/staging/android/ion/ion_carveout_heap.c +++ b/drivers/staging/android/ion/ion_carveout_heap.c @@ -142,6 +142,8 @@ static struct ion_heap_ops carveout_heap_ops = { .allocate = ion_carveout_heap_allocate, .free = ion_carveout_heap_free, .phys = ion_carveout_heap_phys, + .map_dma = ion_carveout_heap_map_dma, + .unmap_dma = ion_carveout_heap_unmap_dma, .map_user = ion_carveout_heap_map_user, .map_kernel = ion_carveout_heap_map_kernel, .unmap_kernel = ion_carveout_heap_unmap_kernel,