From patchwork Wed May 18 16:07:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102328 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2721770qge; Wed, 18 May 2016 09:08:18 -0700 (PDT) X-Received: by 10.98.92.71 with SMTP id q68mr12402609pfb.138.1463587698315; Wed, 18 May 2016 09:08:18 -0700 (PDT) Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTP id c10si12907261pat.170.2016.05.18.09.08.18; Wed, 18 May 2016 09:08:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 B41546E888; Wed, 18 May 2016 16:08:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6A226E87E; Wed, 18 May 2016 16:08:05 +0000 (UTC) Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0Ma9tP-1bIGY02kuN-00LpBC; Wed, 18 May 2016 18:07:47 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH 3/5] drm: mediatek: fixup drm_gem_object_lookup API change Date: Wed, 18 May 2016 18:07:31 +0200 Message-Id: <1463587653-3035181-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463587653-3035181-1-git-send-email-arnd@arndb.de> References: <1463587653-3035181-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:6ZHdP2hov9QHc9KslieTVRTMya3Q7GmXEdLlxaxcwBrvIQilyy/ s8Qc/AYV5rXaUFhci7yN6btkaJwP4GkbKcNNHusW9Bu/CjCdag3V4U7B0Ta6egNeTHErtw3 UU004a6rzftwd4jiD9Rm4vhHK0g972wzVqUs8G+7MygDT0uZ/z0xF/T1kaKL8+cVPvWpGRn RHgPOn1LZ5vD/NVKbo4SA== X-UI-Out-Filterresults: notjunk:1; V01:K0:VgPS6mUYZ9M=:G1nM6hGXQZ0y0yC86LSfyL BiyRBdXZm50m5pXmWkE4Ds2sO9LZ6Pi7MtVLj5LIsEjNZHXGOXFLrGJe2rg6Gwtu2fTPrCVty HrtJemEgXDWUdXgMglST2z3tfvSIMaV+3mrxaIGZGHuahEKjmW8daVoRfkfogHWmltfBDvpHd MN/sVAU3JK3DDYF/R5hKaf9MuQ/8+JA6ynDzDy+RiXwNR9pTGOX4kCRApOTMCmFNhGXQ9wPd8 JrCByn5bvlWax38buecxQkmhb5TnjREOhK3BHyITKbJ7zbv2QF2KzD6z2OWUR3Ijn399y6sgZ o/t/AgF+IsnUpH90TlbW1kOLJJSXG3p6b8e57w0kPGVAid+kdSg4+KRWBZwNa9k3gG1GUlNQa /FfxXnK7VKRPLiD/nENECY0kAoEXdzzdhqVrU/PjvDRJgzqjFT6IeWzR+3sMnU9uK7nsdzIYc fpJyI6NBX2q51XDbb6UR2H5ep1aV4+tXewQQ0x5ZeylKXavJJtyFEda6JfxLzuBF7OdF/RktH HWYfEZY+GljnF2Az5oNccBWrpfyVPkS2cEpNFq31jtai9ssgp4ZcEEN2aUgQ+LN8+MTnOZRup 2JaXgSZRpSmVgcCxzchyCtLUHtfjyBZDyCUyXMu1gpJpBiw8t3PjLeUOyJRvMPuzOptUaDYu2 42W31//QZVzuf5V2X33UxKUDd7lKFKspfNq4LPl+OJ0Vi0JeSIeUeY80MMa4GibHkUPrOvAFG 0oKJCwYD/Ltmscoi Cc: Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Arnd Bergmann , nouveau@lists.freedesktop.org, Seung-Woo Kim , Russell King , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Alex Deucher , Kyungmin Park , Kukjin Kim , linux-mediatek@lists.infradead.org, Ben Skeggs , Matthias Brugger , =?utf-8?q?Christian_K?= =?utf-8?b?w7ZuaWc=?= , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The drm_gem_object_lookup() function prototype changed while this driver was added, so it fails to build now: drivers/gpu/drm/mediatek/mtk_drm_gem.c: In function 'mtk_drm_gem_dumb_map_offset': drivers/gpu/drm/mediatek/mtk_drm_gem.c:142:30: error: passing argument 1 of 'drm_gem_object_lookup' from incompatible pointer type [-Werror=incompatible-pointer-types] obj = drm_gem_object_lookup(dev, file_priv, handle); This fixes the new caller as well. Signed-off-by: Arnd Bergmann Fixes: a8ad0bd84f98 ("drm: Remove unused drm_device from drm_gem_object_lookup()") --- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c index 33d30c19f35f..147df85399ab 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_fb.c @@ -138,7 +138,7 @@ struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, if (drm_format_num_planes(cmd->pixel_format) != 1) return ERR_PTR(-EINVAL); - gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); + gem = drm_gem_object_lookup(file, cmd->handles[0]); if (!gem) return ERR_PTR(-ENOENT); diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index a773bfaea913..fa2ec0cd00e8 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -139,7 +139,7 @@ int mtk_drm_gem_dumb_map_offset(struct drm_file *file_priv, struct drm_gem_object *obj; int ret; - obj = drm_gem_object_lookup(dev, file_priv, handle); + obj = drm_gem_object_lookup(file_priv, handle); if (!obj) { DRM_ERROR("failed to lookup gem object.\n"); return -EINVAL;