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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 E0EE1C432C3 for ; Fri, 15 Nov 2019 09:21:42 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 861192073B for ; Fri, 15 Nov 2019 09:21:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rtNwZ5Z7"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="WfM8FyTO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 861192073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GD+XhFPdKQSXHo2xxOE24gKbJWo5Hzdpifcc1+Jcyww=; b=rtNwZ5Z7z8CtT/ G5XwIDeG5/GtKH3b7TPxGeE1jnutH5j13Sloghw7mSxcSbiURCX1XggV/LeEnkWGmg+oxkilINv/I DqoFOtawGv6NVC35BMMYOpK2PlkibNftK0GMMLkIPBInbU/HCbIdhzXuBXAWN9mUPs4kYQQ7w84lJ VVoq0ERulvdyK2SY+Au6FyvuAkBHD4dWrTR8bHD4nqT+0zuvcw/VkgkYCagpBZ3skXbX1HyWDDp0u U3jgMUAk0erAwL8XAL33YWDB2cHx4a210d0jzyyJANBptbRLLFrpLRXWitcilWfbxBvrFwioRtbZW oz5slsk8nAPq5KnxqSuw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iVXnR-0007W8-Sf; Fri, 15 Nov 2019 09:21:41 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iVXnH-0007Ms-HK for linux-mediatek@lists.infradead.org; Fri, 15 Nov 2019 09:21:33 +0000 Received: by mail-wr1-x442.google.com with SMTP id z10so10116464wrs.12 for ; Fri, 15 Nov 2019 01:21:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=WfM8FyTO7ypE+YMQNKDxQoBKIEgYOliOhA8IHmPKabbGB3iVqRcp9+2Yiz95KojpyN 5RRyo1OFsYseOMJj0ngbATa4TKXxD9cw6JBnsUbQKpNyC8sS9fwiLVyMISJSJt3Y2mwY EujkOzvZYc9UjWmsXzRIqw8m1ryOAtGIjx3UQ= 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=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=Yh+0002J/SxL6J7+XuSJgPwu2k8OhfyplfCVdbBIJTM9QlCLYjz06D2BMbYUcD99Pf TSMW18d6eBU6XtKhIulJyL8E4wyoNslGwpTWTmZeF3epXFFJfpVWgvubI0Viz2Op9n7m BmU+EQa+dHWEaR1NmC7KFgVc0g1tlNCHCUm31owtoViovJweEJntlvbBWZnyDlN1gXpP SfWEIZxp5M1im4f75MkB+kNo3wIXi+lPEpQcNY2WeoAtuslnUmYiWJqc/YlKACzUeeC0 q2Yrf6SnLSayHDyDvlFojp9FNpWzB1zgS3neSXvC3JGx31DZiftUr6HUTvMGhOlm43Sp KETg== X-Gm-Message-State: APjAAAWyoLFkWmiD/pdo7XDuv6LH5brPKCYCr0GOFBzEchPouw+CLVcq JjQC1ZpQXeAH6v1VWUrBVwkLpQ== X-Google-Smtp-Source: APXvYqwnf2/MQXZ679hFBEv5ABxJG5pWkcrTe0XZXAxsR67X5YWu3QoXY4fHOvAlU81ah5/AgJgOLA== X-Received: by 2002:adf:e883:: with SMTP id d3mr13501518wrm.197.1573809690172; Fri, 15 Nov 2019 01:21:30 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 11sm8987506wmi.8.2019.11.15.01.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 01:21:29 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/8] drm/mediatek: don't open-code drm_gem_fb_create Date: Fri, 15 Nov 2019 10:21:15 +0100 Message-Id: <20191115092120.4445-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115092120.4445-1-daniel.vetter@ffwll.ch> References: <20191115092120.4445-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191115_012131_576920_0749B032 X-CRM114-Status: GOOD ( 16.14 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Matthias Brugger , linux-mediatek@lists.infradead.org, Philipp Zabel , CK Hu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Aside: There's a few other fb_create implementations which simply check for valid buffer format (or an approximation thereof), and then call drm_gem_fb_create. For atomic drivers at least we could walk all planes and make sure the format/modifier combo is valid, and remove even more code. For non-atomic drivers that's not possible, since the format list for the primary buffer might be garbage (and most likely it is). Also delete mtk_drm_fb.[hc] since it would now only contain one function. Signed-off-by: Daniel Vetter Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 92 ------------------------ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 13 ---- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 - 4 files changed, 15 insertions(+), 107 deletions(-) delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 84d14213d992..2b1c122066ea 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -16,8 +16,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -27,7 +29,6 @@ #include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_drm_fb.h" #include "mtk_drm_gem.h" #define DRIVER_NAME "mediatek" @@ -115,6 +116,19 @@ static int mtk_atomic_commit(struct drm_device *drm, return 0; } +static struct drm_framebuffer * +mtk_drm_mode_fb_create(struct drm_device *dev, + struct drm_file *file, + const struct drm_mode_fb_cmd2 *cmd) +{ + const struct drm_format_info *info = drm_get_format_info(dev, cmd); + + if (info->num_planes != 1) + return ERR_PTR(-EINVAL); + + return drm_gem_fb_create(dev, file, cmd); +} + static const struct drm_mode_config_funcs mtk_drm_mode_config_funcs = { .fb_create = mtk_drm_mode_fb_create, .atomic_check = drm_atomic_helper_check, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c deleted file mode 100644 index 3f230a28a2dc..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c +++ /dev/null @@ -1,92 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2015 MediaTek Inc. - */ - -#include -#include - -#include -#include -#include -#include -#include - -#include "mtk_drm_drv.h" -#include "mtk_drm_fb.h" -#include "mtk_drm_gem.h" - -static const struct drm_framebuffer_funcs mtk_drm_fb_funcs = { - .create_handle = drm_gem_fb_create_handle, - .destroy = drm_gem_fb_destroy, -}; - -static struct drm_framebuffer *mtk_drm_framebuffer_init(struct drm_device *dev, - const struct drm_mode_fb_cmd2 *mode, - struct drm_gem_object *obj) -{ - const struct drm_format_info *info = drm_get_format_info(dev, mode); - struct drm_framebuffer *fb; - int ret; - - if (info->num_planes != 1) - return ERR_PTR(-EINVAL); - - fb = kzalloc(sizeof(*fb), GFP_KERNEL); - if (!fb) - return ERR_PTR(-ENOMEM); - - drm_helper_mode_fill_fb_struct(dev, fb, mode); - - fb->obj[0] = obj; - - ret = drm_framebuffer_init(dev, fb, &mtk_drm_fb_funcs); - if (ret) { - DRM_ERROR("failed to initialize framebuffer\n"); - kfree(fb); - return ERR_PTR(ret); - } - - return fb; -} - -struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, - struct drm_file *file, - const struct drm_mode_fb_cmd2 *cmd) -{ - const struct drm_format_info *info = drm_get_format_info(dev, cmd); - struct drm_framebuffer *fb; - struct drm_gem_object *gem; - unsigned int width = cmd->width; - unsigned int height = cmd->height; - unsigned int size, bpp; - int ret; - - if (info->num_planes != 1) - return ERR_PTR(-EINVAL); - - gem = drm_gem_object_lookup(file, cmd->handles[0]); - if (!gem) - return ERR_PTR(-ENOENT); - - bpp = info->cpp[0]; - size = (height - 1) * cmd->pitches[0] + width * bpp; - size += cmd->offsets[0]; - - if (gem->size < size) { - ret = -EINVAL; - goto unreference; - } - - fb = mtk_drm_framebuffer_init(dev, cmd, gem); - if (IS_ERR(fb)) { - ret = PTR_ERR(fb); - goto unreference; - } - - return fb; - -unreference: - drm_gem_object_put_unlocked(gem); - return ERR_PTR(ret); -} diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.h b/drivers/gpu/drm/mediatek/mtk_drm_fb.h deleted file mode 100644 index eb64d26001c6..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2015 MediaTek Inc. - */ - -#ifndef MTK_DRM_FB_H -#define MTK_DRM_FB_H - -struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, - struct drm_file *file, - const struct drm_mode_fb_cmd2 *cmd); - -#endif /* MTK_DRM_FB_H */ diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index 3b0cc91c7023..540ef2faa40a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -13,7 +13,6 @@ #include "mtk_drm_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_drm_fb.h" #include "mtk_drm_gem.h" #include "mtk_drm_plane.h" -- 2.24.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 16AB2C432C3 for ; Fri, 15 Nov 2019 09:22:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 DD76F2073A for ; Fri, 15 Nov 2019 09:22:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T9jvZyFa"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="WfM8FyTO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD76F2073A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FQmZHHVzmFt/dRty5INKGANCVneOM5IO2zirjmfSeDs=; b=T9jvZyFakYawXo RmQCU8c+CIyPYTpl5E/o3k8j1MJ2cvu0bfcaf0fnxA4E6cCeMJnRcz92B7qydYNymfTljrndfmgEI yc7KhOEwlXKLt9aEz4B6I30j4DmjORp0dlFxoGYTT1rWFuKiPX1WYMmIA620p09guDJI3j9baCvzj vIoBhpseCCHPEAn678rVkYa/Vg1N+xLGrevvvWcNPRhbkLOZntmd4QeHUFf6YM5L2nUh7Gse5LiR5 3+KT/4ngHpq/fjJiJFbYAK0rI+w5iQmaq+6HKPFKW5yhwGQaCpMRFudj7qhxvHDmLszwOgbOjkAKw 6+LcaKLdeulWwH1qsr7g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iVXnk-0007pN-Rs; Fri, 15 Nov 2019 09:22:00 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iVXnH-0007Mr-HL for linux-arm-kernel@lists.infradead.org; Fri, 15 Nov 2019 09:21:34 +0000 Received: by mail-wr1-x442.google.com with SMTP id f2so10133240wrs.11 for ; Fri, 15 Nov 2019 01:21:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=WfM8FyTO7ypE+YMQNKDxQoBKIEgYOliOhA8IHmPKabbGB3iVqRcp9+2Yiz95KojpyN 5RRyo1OFsYseOMJj0ngbATa4TKXxD9cw6JBnsUbQKpNyC8sS9fwiLVyMISJSJt3Y2mwY EujkOzvZYc9UjWmsXzRIqw8m1ryOAtGIjx3UQ= 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=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=b3NIqevtz0gqkj39HSS3wT3UoJvZN9ExRivBQiIxA/JtWrwWmXujkwfo2uAS4ZpNy0 yiIePOW0BBsgSk/pLyRjOxCmmwiEJf3rm6g43clIwyts+KqRuiKXy3KubFN1+z/5ToD6 B9LId5iWpWvfC/w5HXrLnutnyvFEpJTY2gorRCqJMgNSgt38/0+eJ4vsiT1w9pfMbbZY s0Pnub1dRRf2eCNx/m/BZ6zuRCUwVLLggDYbFGNH4K/s89+O/k3rfjegmkGuQsgOxaP/ PBlfBtSPE2+Qgle90OjhqdEL87R5fm5qyFoLzb4/ZrvqYge/JSNx1cmeyibarzkdEMVA LqhA== X-Gm-Message-State: APjAAAUAWX4HFENAnIP7v5woBHpxK/OOfhSD/q6wy6vf/MnEyaFksRte 2zy5OikcIOiGHoiecapysOFDCw== X-Google-Smtp-Source: APXvYqwnf2/MQXZ679hFBEv5ABxJG5pWkcrTe0XZXAxsR67X5YWu3QoXY4fHOvAlU81ah5/AgJgOLA== X-Received: by 2002:adf:e883:: with SMTP id d3mr13501518wrm.197.1573809690172; Fri, 15 Nov 2019 01:21:30 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 11sm8987506wmi.8.2019.11.15.01.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 01:21:29 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/8] drm/mediatek: don't open-code drm_gem_fb_create Date: Fri, 15 Nov 2019 10:21:15 +0100 Message-Id: <20191115092120.4445-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115092120.4445-1-daniel.vetter@ffwll.ch> References: <20191115092120.4445-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191115_012131_597092_2E782531 X-CRM114-Status: GOOD ( 17.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Matthias Brugger , linux-mediatek@lists.infradead.org, Philipp Zabel , CK Hu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Aside: There's a few other fb_create implementations which simply check for valid buffer format (or an approximation thereof), and then call drm_gem_fb_create. For atomic drivers at least we could walk all planes and make sure the format/modifier combo is valid, and remove even more code. For non-atomic drivers that's not possible, since the format list for the primary buffer might be garbage (and most likely it is). Also delete mtk_drm_fb.[hc] since it would now only contain one function. Signed-off-by: Daniel Vetter Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 16 ++++- drivers/gpu/drm/mediatek/mtk_drm_fb.c | 92 ------------------------ drivers/gpu/drm/mediatek/mtk_drm_fb.h | 13 ---- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 - 4 files changed, 15 insertions(+), 107 deletions(-) delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 84d14213d992..2b1c122066ea 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -16,8 +16,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -27,7 +29,6 @@ #include "mtk_drm_ddp.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_drm_fb.h" #include "mtk_drm_gem.h" #define DRIVER_NAME "mediatek" @@ -115,6 +116,19 @@ static int mtk_atomic_commit(struct drm_device *drm, return 0; } +static struct drm_framebuffer * +mtk_drm_mode_fb_create(struct drm_device *dev, + struct drm_file *file, + const struct drm_mode_fb_cmd2 *cmd) +{ + const struct drm_format_info *info = drm_get_format_info(dev, cmd); + + if (info->num_planes != 1) + return ERR_PTR(-EINVAL); + + return drm_gem_fb_create(dev, file, cmd); +} + static const struct drm_mode_config_funcs mtk_drm_mode_config_funcs = { .fb_create = mtk_drm_mode_fb_create, .atomic_check = drm_atomic_helper_check, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.c b/drivers/gpu/drm/mediatek/mtk_drm_fb.c deleted file mode 100644 index 3f230a28a2dc..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.c +++ /dev/null @@ -1,92 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2015 MediaTek Inc. - */ - -#include -#include - -#include -#include -#include -#include -#include - -#include "mtk_drm_drv.h" -#include "mtk_drm_fb.h" -#include "mtk_drm_gem.h" - -static const struct drm_framebuffer_funcs mtk_drm_fb_funcs = { - .create_handle = drm_gem_fb_create_handle, - .destroy = drm_gem_fb_destroy, -}; - -static struct drm_framebuffer *mtk_drm_framebuffer_init(struct drm_device *dev, - const struct drm_mode_fb_cmd2 *mode, - struct drm_gem_object *obj) -{ - const struct drm_format_info *info = drm_get_format_info(dev, mode); - struct drm_framebuffer *fb; - int ret; - - if (info->num_planes != 1) - return ERR_PTR(-EINVAL); - - fb = kzalloc(sizeof(*fb), GFP_KERNEL); - if (!fb) - return ERR_PTR(-ENOMEM); - - drm_helper_mode_fill_fb_struct(dev, fb, mode); - - fb->obj[0] = obj; - - ret = drm_framebuffer_init(dev, fb, &mtk_drm_fb_funcs); - if (ret) { - DRM_ERROR("failed to initialize framebuffer\n"); - kfree(fb); - return ERR_PTR(ret); - } - - return fb; -} - -struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, - struct drm_file *file, - const struct drm_mode_fb_cmd2 *cmd) -{ - const struct drm_format_info *info = drm_get_format_info(dev, cmd); - struct drm_framebuffer *fb; - struct drm_gem_object *gem; - unsigned int width = cmd->width; - unsigned int height = cmd->height; - unsigned int size, bpp; - int ret; - - if (info->num_planes != 1) - return ERR_PTR(-EINVAL); - - gem = drm_gem_object_lookup(file, cmd->handles[0]); - if (!gem) - return ERR_PTR(-ENOENT); - - bpp = info->cpp[0]; - size = (height - 1) * cmd->pitches[0] + width * bpp; - size += cmd->offsets[0]; - - if (gem->size < size) { - ret = -EINVAL; - goto unreference; - } - - fb = mtk_drm_framebuffer_init(dev, cmd, gem); - if (IS_ERR(fb)) { - ret = PTR_ERR(fb); - goto unreference; - } - - return fb; - -unreference: - drm_gem_object_put_unlocked(gem); - return ERR_PTR(ret); -} diff --git a/drivers/gpu/drm/mediatek/mtk_drm_fb.h b/drivers/gpu/drm/mediatek/mtk_drm_fb.h deleted file mode 100644 index eb64d26001c6..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_drm_fb.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2015 MediaTek Inc. - */ - -#ifndef MTK_DRM_FB_H -#define MTK_DRM_FB_H - -struct drm_framebuffer *mtk_drm_mode_fb_create(struct drm_device *dev, - struct drm_file *file, - const struct drm_mode_fb_cmd2 *cmd); - -#endif /* MTK_DRM_FB_H */ diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index 3b0cc91c7023..540ef2faa40a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -13,7 +13,6 @@ #include "mtk_drm_crtc.h" #include "mtk_drm_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_drm_fb.h" #include "mtk_drm_gem.h" #include "mtk_drm_plane.h" -- 2.24.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 3/8] drm/mediatek: don't open-code drm_gem_fb_create Date: Fri, 15 Nov 2019 10:21:15 +0100 Message-ID: <20191115092120.4445-4-daniel.vetter@ffwll.ch> References: <20191115092120.4445-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191115092120.4445-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: DRI Development Cc: Daniel Vetter , Intel Graphics Development , Matthias Brugger , linux-mediatek@lists.infradead.org, Philipp Zabel , CK Hu , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org QXNpZGU6IFRoZXJlJ3MgYSBmZXcgb3RoZXIgZmJfY3JlYXRlIGltcGxlbWVudGF0aW9ucyB3aGlj aApzaW1wbHkgY2hlY2sgZm9yIHZhbGlkIGJ1ZmZlciBmb3JtYXQgKG9yIGFuIGFwcHJveGltYXRp b24gdGhlcmVvZiksCmFuZCB0aGVuIGNhbGwgZHJtX2dlbV9mYl9jcmVhdGUuIEZvciBhdG9taWMg ZHJpdmVycyBhdCBsZWFzdCB3ZSBjb3VsZAp3YWxrIGFsbCBwbGFuZXMgYW5kIG1ha2Ugc3VyZSB0 aGUgZm9ybWF0L21vZGlmaWVyIGNvbWJvIGlzIHZhbGlkLAphbmQgcmVtb3ZlIGV2ZW4gbW9yZSBj b2RlLgoKRm9yIG5vbi1hdG9taWMgZHJpdmVycyB0aGF0J3Mgbm90IHBvc3NpYmxlLCBzaW5jZSB0 aGUgZm9ybWF0IGxpc3QgZm9yCnRoZSBwcmltYXJ5IGJ1ZmZlciBtaWdodCBiZSBnYXJiYWdlIChh bmQgbW9zdCBsaWtlbHkgaXQgaXMpLgoKQWxzbyBkZWxldGUgbXRrX2RybV9mYi5baGNdIHNpbmNl IGl0IHdvdWxkIG5vdyBvbmx5IGNvbnRhaW4gb25lCmZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IENLIEh1IDxjay5odUBt ZWRpYXRlay5jb20+CkNjOiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJvbml4LmRlPgpD YzogTWF0dGhpYXMgQnJ1Z2dlciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4KQ2M6IGxpbnV4LWFy bS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpDYzogbGludXgtbWVkaWF0ZWtAbGlzdHMuaW5m cmFkZWFkLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jICAg fCAxNiArKysrLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZmIuYyAgICB8IDky IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19k cm1fZmIuaCAgICB8IDEzIC0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX3Bs YW5lLmMgfCAgMSAtCiA0IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDEwNyBkZWxl dGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9mYi5jCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210 a19kcm1fZmIuaAoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMKaW5kZXggODRk MTQyMTNkOTkyLi4yYjFjMTIyMDY2ZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRp YXRlay9tdGtfZHJtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2Rydi5jCkBAIC0xNiw4ICsxNiwxMCBAQAogI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBl ci5oPgogI2luY2x1ZGUgPGRybS9kcm1fZHJ2Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9mYl9oZWxw ZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgogI2luY2x1ZGUgPGRybS9kcm1fZ2Vt Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21hX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9k cm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fb2YuaD4KICNp bmNsdWRlIDxkcm0vZHJtX3Byb2JlX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fdmJsYW5r Lmg+CkBAIC0yNyw3ICsyOSw2IEBACiAjaW5jbHVkZSAibXRrX2RybV9kZHAuaCIKICNpbmNsdWRl ICJtdGtfZHJtX2RkcF9jb21wLmgiCiAjaW5jbHVkZSAibXRrX2RybV9kcnYuaCIKLSNpbmNsdWRl ICJtdGtfZHJtX2ZiLmgiCiAjaW5jbHVkZSAibXRrX2RybV9nZW0uaCIKIAogI2RlZmluZSBEUklW RVJfTkFNRSAibWVkaWF0ZWsiCkBAIC0xMTUsNiArMTE2LDE5IEBAIHN0YXRpYyBpbnQgbXRrX2F0 b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSwKIAlyZXR1cm4gMDsKIH0KIAorc3Rh dGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKgorbXRrX2RybV9tb2RlX2ZiX2NyZWF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAorCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLAorCQkg ICAgICAgY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKmNtZCkKK3sKKwljb25zdCBzdHJ1 Y3QgZHJtX2Zvcm1hdF9pbmZvICppbmZvID0gZHJtX2dldF9mb3JtYXRfaW5mbyhkZXYsIGNtZCk7 CisKKwlpZiAoaW5mby0+bnVtX3BsYW5lcyAhPSAxKQorCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFM KTsKKworCXJldHVybiBkcm1fZ2VtX2ZiX2NyZWF0ZShkZXYsIGZpbGUsIGNtZCk7Cit9CisKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIG10a19kcm1fbW9kZV9jb25m aWdfZnVuY3MgPSB7CiAJLmZiX2NyZWF0ZSA9IG10a19kcm1fbW9kZV9mYl9jcmVhdGUsCiAJLmF0 b21pY19jaGVjayA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfZHJtX2ZiLmMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDNmMjMwYTI4YTJk Yy4uMDAwMDAwMDAwMDAwCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Zi LmMKKysrIC9kZXYvbnVsbApAQCAtMSw5MiArMCwwIEBACi0vLyBTUERYLUxpY2Vuc2UtSWRlbnRp ZmllcjogR1BMLTIuMC1vbmx5Ci0vKgotICogQ29weXJpZ2h0IChjKSAyMDE1IE1lZGlhVGVrIElu Yy4KLSAqLwotCi0jaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi5oPgotI2luY2x1ZGUgPGxpbnV4L2Rt YS1yZXN2Lmg+Ci0KLSNpbmNsdWRlIDxkcm0vZHJtX21vZGVzZXRfaGVscGVyLmg+Ci0jaW5jbHVk ZSA8ZHJtL2RybV9mYl9oZWxwZXIuaD4KLSNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgotI2lu Y2x1ZGUgPGRybS9kcm1fZ2VtLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9nZW1fZnJhbWVidWZmZXJf aGVscGVyLmg+Ci0KLSNpbmNsdWRlICJtdGtfZHJtX2Rydi5oIgotI2luY2x1ZGUgIm10a19kcm1f ZmIuaCIKLSNpbmNsdWRlICJtdGtfZHJtX2dlbS5oIgotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9mcmFtZWJ1ZmZlcl9mdW5jcyBtdGtfZHJtX2ZiX2Z1bmNzID0gewotCS5jcmVhdGVfaGFuZGxl ID0gZHJtX2dlbV9mYl9jcmVhdGVfaGFuZGxlLAotCS5kZXN0cm95ID0gZHJtX2dlbV9mYl9kZXN0 cm95LAotfTsKLQotc3RhdGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm10a19kcm1fZnJhbWVi dWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQljb25zdCBzdHJ1Y3QgZHJt X21vZGVfZmJfY21kMiAqbW9kZSwKLQkJCQkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCi17 Ci0JY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqaW5mbyA9IGRybV9nZXRfZm9ybWF0X2lu Zm8oZGV2LCBtb2RlKTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlpbnQgcmV0Owot Ci0JaWYgKGluZm8tPm51bV9wbGFuZXMgIT0gMSkKLQkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7 Ci0KLQlmYiA9IGt6YWxsb2Moc2l6ZW9mKCpmYiksIEdGUF9LRVJORUwpOwotCWlmICghZmIpCi0J CXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwotCi0JZHJtX2hlbHBlcl9tb2RlX2ZpbGxfZmJfc3Ry dWN0KGRldiwgZmIsIG1vZGUpOwotCi0JZmItPm9ialswXSA9IG9iajsKLQotCXJldCA9IGRybV9m cmFtZWJ1ZmZlcl9pbml0KGRldiwgZmIsICZtdGtfZHJtX2ZiX2Z1bmNzKTsKLQlpZiAocmV0KSB7 Ci0JCURSTV9FUlJPUigiZmFpbGVkIHRvIGluaXRpYWxpemUgZnJhbWVidWZmZXJcbiIpOwotCQlr ZnJlZShmYik7Ci0JCXJldHVybiBFUlJfUFRSKHJldCk7Ci0JfQotCi0JcmV0dXJuIGZiOwotfQot Ci1zdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICptdGtfZHJtX21vZGVfZmJfY3JlYXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCi0JCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0JCQkJ CSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqY21kKQotewotCWNvbnN0IHN0 cnVjdCBkcm1fZm9ybWF0X2luZm8gKmluZm8gPSBkcm1fZ2V0X2Zvcm1hdF9pbmZvKGRldiwgY21k KTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KmdlbTsKLQl1bnNpZ25lZCBpbnQgd2lkdGggPSBjbWQtPndpZHRoOwotCXVuc2lnbmVkIGludCBo ZWlnaHQgPSBjbWQtPmhlaWdodDsKLQl1bnNpZ25lZCBpbnQgc2l6ZSwgYnBwOwotCWludCByZXQ7 Ci0KLQlpZiAoaW5mby0+bnVtX3BsYW5lcyAhPSAxKQotCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFM KTsKLQotCWdlbSA9IGRybV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBjbWQtPmhhbmRsZXNbMF0p OwotCWlmICghZ2VtKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PRU5UKTsKLQotCWJwcCA9IGluZm8t PmNwcFswXTsKLQlzaXplID0gKGhlaWdodCAtIDEpICogY21kLT5waXRjaGVzWzBdICsgd2lkdGgg KiBicHA7Ci0Jc2l6ZSArPSBjbWQtPm9mZnNldHNbMF07Ci0KLQlpZiAoZ2VtLT5zaXplIDwgc2l6 ZSkgewotCQlyZXQgPSAtRUlOVkFMOwotCQlnb3RvIHVucmVmZXJlbmNlOwotCX0KLQotCWZiID0g bXRrX2RybV9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgY21kLCBnZW0pOwotCWlmIChJU19FUlIoZmIp KSB7Ci0JCXJldCA9IFBUUl9FUlIoZmIpOwotCQlnb3RvIHVucmVmZXJlbmNlOwotCX0KLQotCXJl dHVybiBmYjsKLQotdW5yZWZlcmVuY2U6Ci0JZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKGdl bSk7Ci0JcmV0dXJuIEVSUl9QVFIocmV0KTsKLX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX2ZiLmggYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9mYi5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlYjY0ZDI2MDAxYzYuLjAwMDAw MDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9mYi5oCisrKyAv ZGV2L251bGwKQEAgLTEsMTMgKzAsMCBAQAotLyogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQ TC0yLjAtb25seSAqLwotLyoKLSAqIENvcHlyaWdodCAoYykgMjAxNSBNZWRpYVRlayBJbmMuCi0g Ki8KLQotI2lmbmRlZiBNVEtfRFJNX0ZCX0gKLSNkZWZpbmUgTVRLX0RSTV9GQl9ICi0KLXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKm10a19kcm1fbW9kZV9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKLQkJCQkJICAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKLQkJCQkJICAgICAg IGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICpjbWQpOwotCi0jZW5kaWYgLyogTVRLX0RS TV9GQl9IICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fcGxhbmUuYwppbmRleCAz YjBjYzkxYzcwMjMuLjU0MGVmMmZhYTQwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21l ZGlhdGVrL210a19kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9wbGFuZS5jCkBAIC0xMyw3ICsxMyw2IEBACiAjaW5jbHVkZSAibXRrX2RybV9jcnRjLmgi CiAjaW5jbHVkZSAibXRrX2RybV9kZHBfY29tcC5oIgogI2luY2x1ZGUgIm10a19kcm1fZHJ2Lmgi Ci0jaW5jbHVkZSAibXRrX2RybV9mYi5oIgogI2luY2x1ZGUgIm10a19kcm1fZ2VtLmgiCiAjaW5j bHVkZSAibXRrX2RybV9wbGFuZS5oIgogCi0tIAoyLjI0LjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA== 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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 436E5C432C3 for ; Fri, 15 Nov 2019 09:21:48 +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 2472320733 for ; Fri, 15 Nov 2019 09:21:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2472320733 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 F15F26E23F; Fri, 15 Nov 2019 09:21:37 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC2DB6E1F8 for ; Fri, 15 Nov 2019 09:21:31 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id e6so10169686wrw.1 for ; Fri, 15 Nov 2019 01:21:31 -0800 (PST) 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=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=fMoJwLEZjVz0Gxmw10tC/8IDhP9zZonKT8t967cptxvhcsKzpVj6Y8GqKMH4J9r5XC XRfsxkevR/2u6iEudR8f/C/C9Wr0qUs0R8iLOt/SZumU/r7c8m/CofiKiVCTI9G1Ur8A NFYU+JMDrjP5VwFQN7/0AytmMJvarM5kLZfhLuNGaFkKd+c22IMBbeAWvM64hcdUiK50 ADHcpMjliPEolzkkWP2Rfa03/mUu7cPxGq6KtKydrY4+eH2DgwrVB6V09Y9Rr6Lqap2o xUwJaUOfI6SHVzNAkE+uFgmCJOcP1hiWdZKb8fnVMikas9tguWaYkrt27TLJirXxekxG xr1Q== X-Gm-Message-State: APjAAAX2hcjzMeNH8OyHfj/RktZEGl2rQDVHaAgZOGajy48l96biDgT+ DYG3mxHmeMZdUoIQWKzvyzW9AW8GtS0= X-Google-Smtp-Source: APXvYqwnf2/MQXZ679hFBEv5ABxJG5pWkcrTe0XZXAxsR67X5YWu3QoXY4fHOvAlU81ah5/AgJgOLA== X-Received: by 2002:adf:e883:: with SMTP id d3mr13501518wrm.197.1573809690172; Fri, 15 Nov 2019 01:21:30 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 11sm8987506wmi.8.2019.11.15.01.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 01:21:29 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 3/8] drm/mediatek: don't open-code drm_gem_fb_create Date: Fri, 15 Nov 2019 10:21:15 +0100 Message-Id: <20191115092120.4445-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115092120.4445-1-daniel.vetter@ffwll.ch> References: <20191115092120.4445-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=WfM8FyTO7ypE+YMQNKDxQoBKIEgYOliOhA8IHmPKabbGB3iVqRcp9+2Yiz95KojpyN 5RRyo1OFsYseOMJj0ngbATa4TKXxD9cw6JBnsUbQKpNyC8sS9fwiLVyMISJSJt3Y2mwY EujkOzvZYc9UjWmsXzRIqw8m1ryOAtGIjx3UQ= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Matthias Brugger , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191115092115.TynuwmTXWKj1mY3y3uBdFe5bj6pXPc89NNp4rPqshh8@z> QXNpZGU6IFRoZXJlJ3MgYSBmZXcgb3RoZXIgZmJfY3JlYXRlIGltcGxlbWVudGF0aW9ucyB3aGlj aApzaW1wbHkgY2hlY2sgZm9yIHZhbGlkIGJ1ZmZlciBmb3JtYXQgKG9yIGFuIGFwcHJveGltYXRp b24gdGhlcmVvZiksCmFuZCB0aGVuIGNhbGwgZHJtX2dlbV9mYl9jcmVhdGUuIEZvciBhdG9taWMg ZHJpdmVycyBhdCBsZWFzdCB3ZSBjb3VsZAp3YWxrIGFsbCBwbGFuZXMgYW5kIG1ha2Ugc3VyZSB0 aGUgZm9ybWF0L21vZGlmaWVyIGNvbWJvIGlzIHZhbGlkLAphbmQgcmVtb3ZlIGV2ZW4gbW9yZSBj b2RlLgoKRm9yIG5vbi1hdG9taWMgZHJpdmVycyB0aGF0J3Mgbm90IHBvc3NpYmxlLCBzaW5jZSB0 aGUgZm9ybWF0IGxpc3QgZm9yCnRoZSBwcmltYXJ5IGJ1ZmZlciBtaWdodCBiZSBnYXJiYWdlIChh bmQgbW9zdCBsaWtlbHkgaXQgaXMpLgoKQWxzbyBkZWxldGUgbXRrX2RybV9mYi5baGNdIHNpbmNl IGl0IHdvdWxkIG5vdyBvbmx5IGNvbnRhaW4gb25lCmZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IENLIEh1IDxjay5odUBt ZWRpYXRlay5jb20+CkNjOiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJvbml4LmRlPgpD YzogTWF0dGhpYXMgQnJ1Z2dlciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4KQ2M6IGxpbnV4LWFy bS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpDYzogbGludXgtbWVkaWF0ZWtAbGlzdHMuaW5m cmFkZWFkLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jICAg fCAxNiArKysrLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZmIuYyAgICB8IDky IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19k cm1fZmIuaCAgICB8IDEzIC0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX3Bs YW5lLmMgfCAgMSAtCiA0IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDEwNyBkZWxl dGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9mYi5jCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210 a19kcm1fZmIuaAoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMKaW5kZXggODRk MTQyMTNkOTkyLi4yYjFjMTIyMDY2ZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRp YXRlay9tdGtfZHJtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2Rydi5jCkBAIC0xNiw4ICsxNiwxMCBAQAogI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBl ci5oPgogI2luY2x1ZGUgPGRybS9kcm1fZHJ2Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9mYl9oZWxw ZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgogI2luY2x1ZGUgPGRybS9kcm1fZ2Vt Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21hX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9k cm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fb2YuaD4KICNp bmNsdWRlIDxkcm0vZHJtX3Byb2JlX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fdmJsYW5r Lmg+CkBAIC0yNyw3ICsyOSw2IEBACiAjaW5jbHVkZSAibXRrX2RybV9kZHAuaCIKICNpbmNsdWRl ICJtdGtfZHJtX2RkcF9jb21wLmgiCiAjaW5jbHVkZSAibXRrX2RybV9kcnYuaCIKLSNpbmNsdWRl ICJtdGtfZHJtX2ZiLmgiCiAjaW5jbHVkZSAibXRrX2RybV9nZW0uaCIKIAogI2RlZmluZSBEUklW RVJfTkFNRSAibWVkaWF0ZWsiCkBAIC0xMTUsNiArMTE2LDE5IEBAIHN0YXRpYyBpbnQgbXRrX2F0 b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSwKIAlyZXR1cm4gMDsKIH0KIAorc3Rh dGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKgorbXRrX2RybV9tb2RlX2ZiX2NyZWF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAorCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLAorCQkg ICAgICAgY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKmNtZCkKK3sKKwljb25zdCBzdHJ1 Y3QgZHJtX2Zvcm1hdF9pbmZvICppbmZvID0gZHJtX2dldF9mb3JtYXRfaW5mbyhkZXYsIGNtZCk7 CisKKwlpZiAoaW5mby0+bnVtX3BsYW5lcyAhPSAxKQorCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFM KTsKKworCXJldHVybiBkcm1fZ2VtX2ZiX2NyZWF0ZShkZXYsIGZpbGUsIGNtZCk7Cit9CisKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIG10a19kcm1fbW9kZV9jb25m aWdfZnVuY3MgPSB7CiAJLmZiX2NyZWF0ZSA9IG10a19kcm1fbW9kZV9mYl9jcmVhdGUsCiAJLmF0 b21pY19jaGVjayA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfZHJtX2ZiLmMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDNmMjMwYTI4YTJk Yy4uMDAwMDAwMDAwMDAwCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Zi LmMKKysrIC9kZXYvbnVsbApAQCAtMSw5MiArMCwwIEBACi0vLyBTUERYLUxpY2Vuc2UtSWRlbnRp ZmllcjogR1BMLTIuMC1vbmx5Ci0vKgotICogQ29weXJpZ2h0IChjKSAyMDE1IE1lZGlhVGVrIElu Yy4KLSAqLwotCi0jaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi5oPgotI2luY2x1ZGUgPGxpbnV4L2Rt YS1yZXN2Lmg+Ci0KLSNpbmNsdWRlIDxkcm0vZHJtX21vZGVzZXRfaGVscGVyLmg+Ci0jaW5jbHVk ZSA8ZHJtL2RybV9mYl9oZWxwZXIuaD4KLSNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgotI2lu Y2x1ZGUgPGRybS9kcm1fZ2VtLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9nZW1fZnJhbWVidWZmZXJf aGVscGVyLmg+Ci0KLSNpbmNsdWRlICJtdGtfZHJtX2Rydi5oIgotI2luY2x1ZGUgIm10a19kcm1f ZmIuaCIKLSNpbmNsdWRlICJtdGtfZHJtX2dlbS5oIgotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9mcmFtZWJ1ZmZlcl9mdW5jcyBtdGtfZHJtX2ZiX2Z1bmNzID0gewotCS5jcmVhdGVfaGFuZGxl ID0gZHJtX2dlbV9mYl9jcmVhdGVfaGFuZGxlLAotCS5kZXN0cm95ID0gZHJtX2dlbV9mYl9kZXN0 cm95LAotfTsKLQotc3RhdGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm10a19kcm1fZnJhbWVi dWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQljb25zdCBzdHJ1Y3QgZHJt X21vZGVfZmJfY21kMiAqbW9kZSwKLQkJCQkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCi17 Ci0JY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqaW5mbyA9IGRybV9nZXRfZm9ybWF0X2lu Zm8oZGV2LCBtb2RlKTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlpbnQgcmV0Owot Ci0JaWYgKGluZm8tPm51bV9wbGFuZXMgIT0gMSkKLQkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7 Ci0KLQlmYiA9IGt6YWxsb2Moc2l6ZW9mKCpmYiksIEdGUF9LRVJORUwpOwotCWlmICghZmIpCi0J CXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwotCi0JZHJtX2hlbHBlcl9tb2RlX2ZpbGxfZmJfc3Ry dWN0KGRldiwgZmIsIG1vZGUpOwotCi0JZmItPm9ialswXSA9IG9iajsKLQotCXJldCA9IGRybV9m cmFtZWJ1ZmZlcl9pbml0KGRldiwgZmIsICZtdGtfZHJtX2ZiX2Z1bmNzKTsKLQlpZiAocmV0KSB7 Ci0JCURSTV9FUlJPUigiZmFpbGVkIHRvIGluaXRpYWxpemUgZnJhbWVidWZmZXJcbiIpOwotCQlr ZnJlZShmYik7Ci0JCXJldHVybiBFUlJfUFRSKHJldCk7Ci0JfQotCi0JcmV0dXJuIGZiOwotfQot Ci1zdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICptdGtfZHJtX21vZGVfZmJfY3JlYXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCi0JCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0JCQkJ CSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqY21kKQotewotCWNvbnN0IHN0 cnVjdCBkcm1fZm9ybWF0X2luZm8gKmluZm8gPSBkcm1fZ2V0X2Zvcm1hdF9pbmZvKGRldiwgY21k KTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KmdlbTsKLQl1bnNpZ25lZCBpbnQgd2lkdGggPSBjbWQtPndpZHRoOwotCXVuc2lnbmVkIGludCBo ZWlnaHQgPSBjbWQtPmhlaWdodDsKLQl1bnNpZ25lZCBpbnQgc2l6ZSwgYnBwOwotCWludCByZXQ7 Ci0KLQlpZiAoaW5mby0+bnVtX3BsYW5lcyAhPSAxKQotCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFM KTsKLQotCWdlbSA9IGRybV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBjbWQtPmhhbmRsZXNbMF0p OwotCWlmICghZ2VtKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PRU5UKTsKLQotCWJwcCA9IGluZm8t PmNwcFswXTsKLQlzaXplID0gKGhlaWdodCAtIDEpICogY21kLT5waXRjaGVzWzBdICsgd2lkdGgg KiBicHA7Ci0Jc2l6ZSArPSBjbWQtPm9mZnNldHNbMF07Ci0KLQlpZiAoZ2VtLT5zaXplIDwgc2l6 ZSkgewotCQlyZXQgPSAtRUlOVkFMOwotCQlnb3RvIHVucmVmZXJlbmNlOwotCX0KLQotCWZiID0g bXRrX2RybV9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgY21kLCBnZW0pOwotCWlmIChJU19FUlIoZmIp KSB7Ci0JCXJldCA9IFBUUl9FUlIoZmIpOwotCQlnb3RvIHVucmVmZXJlbmNlOwotCX0KLQotCXJl dHVybiBmYjsKLQotdW5yZWZlcmVuY2U6Ci0JZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKGdl bSk7Ci0JcmV0dXJuIEVSUl9QVFIocmV0KTsKLX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX2ZiLmggYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9mYi5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlYjY0ZDI2MDAxYzYuLjAwMDAw MDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9mYi5oCisrKyAv ZGV2L251bGwKQEAgLTEsMTMgKzAsMCBAQAotLyogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQ TC0yLjAtb25seSAqLwotLyoKLSAqIENvcHlyaWdodCAoYykgMjAxNSBNZWRpYVRlayBJbmMuCi0g Ki8KLQotI2lmbmRlZiBNVEtfRFJNX0ZCX0gKLSNkZWZpbmUgTVRLX0RSTV9GQl9ICi0KLXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKm10a19kcm1fbW9kZV9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKLQkJCQkJICAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKLQkJCQkJICAgICAg IGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICpjbWQpOwotCi0jZW5kaWYgLyogTVRLX0RS TV9GQl9IICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fcGxhbmUuYwppbmRleCAz YjBjYzkxYzcwMjMuLjU0MGVmMmZhYTQwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21l ZGlhdGVrL210a19kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9wbGFuZS5jCkBAIC0xMyw3ICsxMyw2IEBACiAjaW5jbHVkZSAibXRrX2RybV9jcnRjLmgi CiAjaW5jbHVkZSAibXRrX2RybV9kZHBfY29tcC5oIgogI2luY2x1ZGUgIm10a19kcm1fZHJ2Lmgi Ci0jaW5jbHVkZSAibXRrX2RybV9mYi5oIgogI2luY2x1ZGUgIm10a19kcm1fZ2VtLmgiCiAjaW5j bHVkZSAibXRrX2RybV9wbGFuZS5oIgogCi0tIAoyLjI0LjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== 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=-9.7 required=3.0 tests=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 C1A45C432C3 for ; Fri, 15 Nov 2019 09:21:40 +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 9E7BC2073A for ; Fri, 15 Nov 2019 09:21:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E7BC2073A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C73456E1F3; Fri, 15 Nov 2019 09:21:32 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81EBE6E1F3 for ; Fri, 15 Nov 2019 09:21:31 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id b3so10118540wrs.13 for ; Fri, 15 Nov 2019 01:21:31 -0800 (PST) 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=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=acBytEoh8UpNNp2wFSHbio8IVSmDomt0GVA7NmZoWloJ05kfryFewj3bjEc8WGoTaK ki5fFeRgfGM+Pl/sTLUgW/0wCXR55yT9UKhWtzlK9AMiD84p/R2LHbrHcOQfz+cTrC1V mGvw8Gh0wbEftJylFwzAF4tWIHd06QL5HdM71nua1PMjlgdH9X5xeoA8TfaCHUWUTx3T XyZzrxKCy9OE3KwiFr8Ry4ZqzUBp4klggGDwMFtF094Jwc8mEEi7+5t0TXDetR56zmeI GvjxNo9IKPibzrfXAjz8tPZ4oCh6EPPyCgp6JtMXf6E3VrQIdhZ7TcsxKPODb0xcpWjm kVCA== X-Gm-Message-State: APjAAAWTx0cjKUQBeGYykzbWGhyLOwoZFVx9CnOQu7d1xMRq3mCnxhQX 6fzUAZ/paZOUJOY3rvhcl5sbjA== X-Google-Smtp-Source: APXvYqwnf2/MQXZ679hFBEv5ABxJG5pWkcrTe0XZXAxsR67X5YWu3QoXY4fHOvAlU81ah5/AgJgOLA== X-Received: by 2002:adf:e883:: with SMTP id d3mr13501518wrm.197.1573809690172; Fri, 15 Nov 2019 01:21:30 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-96.fiber7.init7.net. [212.51.149.96]) by smtp.gmail.com with ESMTPSA id 11sm8987506wmi.8.2019.11.15.01.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 01:21:29 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Fri, 15 Nov 2019 10:21:15 +0100 Message-Id: <20191115092120.4445-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191115092120.4445-1-daniel.vetter@ffwll.ch> References: <20191115092120.4445-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tGjIM2+uUqMORVIasokc3/CvFp+wprfDfEiecNEi+4o=; b=WfM8FyTO7ypE+YMQNKDxQoBKIEgYOliOhA8IHmPKabbGB3iVqRcp9+2Yiz95KojpyN 5RRyo1OFsYseOMJj0ngbATa4TKXxD9cw6JBnsUbQKpNyC8sS9fwiLVyMISJSJt3Y2mwY EujkOzvZYc9UjWmsXzRIqw8m1ryOAtGIjx3UQ= Subject: [Intel-gfx] [PATCH 3/8] drm/mediatek: don't open-code drm_gem_fb_create X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Matthias Brugger , linux-mediatek@lists.infradead.org, Philipp Zabel , CK Hu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Message-ID: <20191115092115.AEMsVEOGHXzw45qAp4QuX49wt8aYXhpQ5bV8Fe0YYr8@z> QXNpZGU6IFRoZXJlJ3MgYSBmZXcgb3RoZXIgZmJfY3JlYXRlIGltcGxlbWVudGF0aW9ucyB3aGlj aApzaW1wbHkgY2hlY2sgZm9yIHZhbGlkIGJ1ZmZlciBmb3JtYXQgKG9yIGFuIGFwcHJveGltYXRp b24gdGhlcmVvZiksCmFuZCB0aGVuIGNhbGwgZHJtX2dlbV9mYl9jcmVhdGUuIEZvciBhdG9taWMg ZHJpdmVycyBhdCBsZWFzdCB3ZSBjb3VsZAp3YWxrIGFsbCBwbGFuZXMgYW5kIG1ha2Ugc3VyZSB0 aGUgZm9ybWF0L21vZGlmaWVyIGNvbWJvIGlzIHZhbGlkLAphbmQgcmVtb3ZlIGV2ZW4gbW9yZSBj b2RlLgoKRm9yIG5vbi1hdG9taWMgZHJpdmVycyB0aGF0J3Mgbm90IHBvc3NpYmxlLCBzaW5jZSB0 aGUgZm9ybWF0IGxpc3QgZm9yCnRoZSBwcmltYXJ5IGJ1ZmZlciBtaWdodCBiZSBnYXJiYWdlIChh bmQgbW9zdCBsaWtlbHkgaXQgaXMpLgoKQWxzbyBkZWxldGUgbXRrX2RybV9mYi5baGNdIHNpbmNl IGl0IHdvdWxkIG5vdyBvbmx5IGNvbnRhaW4gb25lCmZ1bmN0aW9uLgoKU2lnbmVkLW9mZi1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IENLIEh1IDxjay5odUBt ZWRpYXRlay5jb20+CkNjOiBQaGlsaXBwIFphYmVsIDxwLnphYmVsQHBlbmd1dHJvbml4LmRlPgpD YzogTWF0dGhpYXMgQnJ1Z2dlciA8bWF0dGhpYXMuYmdnQGdtYWlsLmNvbT4KQ2M6IGxpbnV4LWFy bS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpDYzogbGludXgtbWVkaWF0ZWtAbGlzdHMuaW5m cmFkZWFkLm9yZwotLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Rydi5jICAg fCAxNiArKysrLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZmIuYyAgICB8IDky IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19k cm1fZmIuaCAgICB8IDEzIC0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX3Bs YW5lLmMgfCAgMSAtCiA0IGZpbGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDEwNyBkZWxl dGlvbnMoLSkKIGRlbGV0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9mYi5jCiBkZWxldGUgbW9kZSAxMDA2NDQgZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210 a19kcm1fZmIuaAoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZHJ2LmMKaW5kZXggODRk MTQyMTNkOTkyLi4yYjFjMTIyMDY2ZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRp YXRlay9tdGtfZHJtX2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJt X2Rydi5jCkBAIC0xNiw4ICsxNiwxMCBAQAogI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljX2hlbHBl ci5oPgogI2luY2x1ZGUgPGRybS9kcm1fZHJ2Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9mYl9oZWxw ZXIuaD4KKyNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgogI2luY2x1ZGUgPGRybS9kcm1fZ2Vt Lmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9nZW1fY21hX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9k cm1fZ2VtX2ZyYW1lYnVmZmVyX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fb2YuaD4KICNp bmNsdWRlIDxkcm0vZHJtX3Byb2JlX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fdmJsYW5r Lmg+CkBAIC0yNyw3ICsyOSw2IEBACiAjaW5jbHVkZSAibXRrX2RybV9kZHAuaCIKICNpbmNsdWRl ICJtdGtfZHJtX2RkcF9jb21wLmgiCiAjaW5jbHVkZSAibXRrX2RybV9kcnYuaCIKLSNpbmNsdWRl ICJtdGtfZHJtX2ZiLmgiCiAjaW5jbHVkZSAibXRrX2RybV9nZW0uaCIKIAogI2RlZmluZSBEUklW RVJfTkFNRSAibWVkaWF0ZWsiCkBAIC0xMTUsNiArMTE2LDE5IEBAIHN0YXRpYyBpbnQgbXRrX2F0 b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRybSwKIAlyZXR1cm4gMDsKIH0KIAorc3Rh dGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKgorbXRrX2RybV9tb2RlX2ZiX2NyZWF0ZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAorCQkgICAgICAgc3RydWN0IGRybV9maWxlICpmaWxlLAorCQkg ICAgICAgY29uc3Qgc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgKmNtZCkKK3sKKwljb25zdCBzdHJ1 Y3QgZHJtX2Zvcm1hdF9pbmZvICppbmZvID0gZHJtX2dldF9mb3JtYXRfaW5mbyhkZXYsIGNtZCk7 CisKKwlpZiAoaW5mby0+bnVtX3BsYW5lcyAhPSAxKQorCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFM KTsKKworCXJldHVybiBkcm1fZ2VtX2ZiX2NyZWF0ZShkZXYsIGZpbGUsIGNtZCk7Cit9CisKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIG10a19kcm1fbW9kZV9jb25m aWdfZnVuY3MgPSB7CiAJLmZiX2NyZWF0ZSA9IG10a19kcm1fbW9kZV9mYl9jcmVhdGUsCiAJLmF0 b21pY19jaGVjayA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fZmIuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRl ay9tdGtfZHJtX2ZiLmMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDNmMjMwYTI4YTJk Yy4uMDAwMDAwMDAwMDAwCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZWRpYXRlay9tdGtfZHJtX2Zi LmMKKysrIC9kZXYvbnVsbApAQCAtMSw5MiArMCwwIEBACi0vLyBTUERYLUxpY2Vuc2UtSWRlbnRp ZmllcjogR1BMLTIuMC1vbmx5Ci0vKgotICogQ29weXJpZ2h0IChjKSAyMDE1IE1lZGlhVGVrIElu Yy4KLSAqLwotCi0jaW5jbHVkZSA8bGludXgvZG1hLWJ1Zi5oPgotI2luY2x1ZGUgPGxpbnV4L2Rt YS1yZXN2Lmg+Ci0KLSNpbmNsdWRlIDxkcm0vZHJtX21vZGVzZXRfaGVscGVyLmg+Ci0jaW5jbHVk ZSA8ZHJtL2RybV9mYl9oZWxwZXIuaD4KLSNpbmNsdWRlIDxkcm0vZHJtX2ZvdXJjYy5oPgotI2lu Y2x1ZGUgPGRybS9kcm1fZ2VtLmg+Ci0jaW5jbHVkZSA8ZHJtL2RybV9nZW1fZnJhbWVidWZmZXJf aGVscGVyLmg+Ci0KLSNpbmNsdWRlICJtdGtfZHJtX2Rydi5oIgotI2luY2x1ZGUgIm10a19kcm1f ZmIuaCIKLSNpbmNsdWRlICJtdGtfZHJtX2dlbS5oIgotCi1zdGF0aWMgY29uc3Qgc3RydWN0IGRy bV9mcmFtZWJ1ZmZlcl9mdW5jcyBtdGtfZHJtX2ZiX2Z1bmNzID0gewotCS5jcmVhdGVfaGFuZGxl ID0gZHJtX2dlbV9mYl9jcmVhdGVfaGFuZGxlLAotCS5kZXN0cm95ID0gZHJtX2dlbV9mYl9kZXN0 cm95LAotfTsKLQotc3RhdGljIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm10a19kcm1fZnJhbWVi dWZmZXJfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJCQljb25zdCBzdHJ1Y3QgZHJt X21vZGVfZmJfY21kMiAqbW9kZSwKLQkJCQkJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCi17 Ci0JY29uc3Qgc3RydWN0IGRybV9mb3JtYXRfaW5mbyAqaW5mbyA9IGRybV9nZXRfZm9ybWF0X2lu Zm8oZGV2LCBtb2RlKTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlpbnQgcmV0Owot Ci0JaWYgKGluZm8tPm51bV9wbGFuZXMgIT0gMSkKLQkJcmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7 Ci0KLQlmYiA9IGt6YWxsb2Moc2l6ZW9mKCpmYiksIEdGUF9LRVJORUwpOwotCWlmICghZmIpCi0J CXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwotCi0JZHJtX2hlbHBlcl9tb2RlX2ZpbGxfZmJfc3Ry dWN0KGRldiwgZmIsIG1vZGUpOwotCi0JZmItPm9ialswXSA9IG9iajsKLQotCXJldCA9IGRybV9m cmFtZWJ1ZmZlcl9pbml0KGRldiwgZmIsICZtdGtfZHJtX2ZiX2Z1bmNzKTsKLQlpZiAocmV0KSB7 Ci0JCURSTV9FUlJPUigiZmFpbGVkIHRvIGluaXRpYWxpemUgZnJhbWVidWZmZXJcbiIpOwotCQlr ZnJlZShmYik7Ci0JCXJldHVybiBFUlJfUFRSKHJldCk7Ci0JfQotCi0JcmV0dXJuIGZiOwotfQot Ci1zdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICptdGtfZHJtX21vZGVfZmJfY3JlYXRlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsCi0JCQkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCi0JCQkJ CSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZmJfY21kMiAqY21kKQotewotCWNvbnN0IHN0 cnVjdCBkcm1fZm9ybWF0X2luZm8gKmluZm8gPSBkcm1fZ2V0X2Zvcm1hdF9pbmZvKGRldiwgY21k KTsKLQlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsKLQlzdHJ1Y3QgZHJtX2dlbV9vYmplY3Qg KmdlbTsKLQl1bnNpZ25lZCBpbnQgd2lkdGggPSBjbWQtPndpZHRoOwotCXVuc2lnbmVkIGludCBo ZWlnaHQgPSBjbWQtPmhlaWdodDsKLQl1bnNpZ25lZCBpbnQgc2l6ZSwgYnBwOwotCWludCByZXQ7 Ci0KLQlpZiAoaW5mby0+bnVtX3BsYW5lcyAhPSAxKQotCQlyZXR1cm4gRVJSX1BUUigtRUlOVkFM KTsKLQotCWdlbSA9IGRybV9nZW1fb2JqZWN0X2xvb2t1cChmaWxlLCBjbWQtPmhhbmRsZXNbMF0p OwotCWlmICghZ2VtKQotCQlyZXR1cm4gRVJSX1BUUigtRU5PRU5UKTsKLQotCWJwcCA9IGluZm8t PmNwcFswXTsKLQlzaXplID0gKGhlaWdodCAtIDEpICogY21kLT5waXRjaGVzWzBdICsgd2lkdGgg KiBicHA7Ci0Jc2l6ZSArPSBjbWQtPm9mZnNldHNbMF07Ci0KLQlpZiAoZ2VtLT5zaXplIDwgc2l6 ZSkgewotCQlyZXQgPSAtRUlOVkFMOwotCQlnb3RvIHVucmVmZXJlbmNlOwotCX0KLQotCWZiID0g bXRrX2RybV9mcmFtZWJ1ZmZlcl9pbml0KGRldiwgY21kLCBnZW0pOwotCWlmIChJU19FUlIoZmIp KSB7Ci0JCXJldCA9IFBUUl9FUlIoZmIpOwotCQlnb3RvIHVucmVmZXJlbmNlOwotCX0KLQotCXJl dHVybiBmYjsKLQotdW5yZWZlcmVuY2U6Ci0JZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKGdl bSk7Ci0JcmV0dXJuIEVSUl9QVFIocmV0KTsKLX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9tZWRpYXRlay9tdGtfZHJtX2ZiLmggYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2Ry bV9mYi5oCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBlYjY0ZDI2MDAxYzYuLjAwMDAw MDAwMDAwMAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9mYi5oCisrKyAv ZGV2L251bGwKQEAgLTEsMTMgKzAsMCBAQAotLyogU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEdQ TC0yLjAtb25seSAqLwotLyoKLSAqIENvcHlyaWdodCAoYykgMjAxNSBNZWRpYVRlayBJbmMuCi0g Ki8KLQotI2lmbmRlZiBNVEtfRFJNX0ZCX0gKLSNkZWZpbmUgTVRLX0RSTV9GQl9ICi0KLXN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKm10a19kcm1fbW9kZV9mYl9jcmVhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKLQkJCQkJICAgICAgIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKLQkJCQkJICAgICAg IGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICpjbWQpOwotCi0jZW5kaWYgLyogTVRLX0RS TV9GQl9IICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRrX2RybV9w bGFuZS5jIGIvZHJpdmVycy9ncHUvZHJtL21lZGlhdGVrL210a19kcm1fcGxhbmUuYwppbmRleCAz YjBjYzkxYzcwMjMuLjU0MGVmMmZhYTQwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21l ZGlhdGVrL210a19kcm1fcGxhbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVkaWF0ZWsvbXRr X2RybV9wbGFuZS5jCkBAIC0xMyw3ICsxMyw2IEBACiAjaW5jbHVkZSAibXRrX2RybV9jcnRjLmgi CiAjaW5jbHVkZSAibXRrX2RybV9kZHBfY29tcC5oIgogI2luY2x1ZGUgIm10a19kcm1fZHJ2Lmgi Ci0jaW5jbHVkZSAibXRrX2RybV9mYi5oIgogI2luY2x1ZGUgIm10a19kcm1fZ2VtLmgiCiAjaW5j bHVkZSAibXRrX2RybV9wbGFuZS5oIgogCi0tIAoyLjI0LjAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==