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=-8.2 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,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 4CC7FC432C0 for ; Fri, 22 Nov 2019 07:52:51 +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 1980120659 for ; Fri, 22 Nov 2019 07:52:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dgC1Dpde"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="iK81P2fm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1980120659 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com 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: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qC1XLWOrjnSO0WeYX22A3L1t+R9XI6gMRx7/fGqGJlk=; b=dgC1DpdepxkB2I aBQBnfMAG3XdiJitL7GdOpGPKMBNIQhkiZwD2Hz7/EJOwmKYMki1kRmcZMTLtOq7AA3Dbz2qsdYMA T6jgR+ejvhU1cTRJpuhsP2iZzdbRpbD5D6phuFRVjG7DcsaSbfDaXqln73PM6JaDncD5D2JSdae9E 9Wx1NLl0W9zgILFxXNUb+WQIkHrBrQz/pxzzn0IKdYn2Vb6pAMTqR+GLcbNS7hXhO+eVTgM7LeIbQ sbrbPBeG6mT16Y6e1rZJCAWg2fXsjxaS8eXowpMOZtb+WoGO1uB0PwUK19+vY3AfumrVFV/vvF1nZ /leB6O0EtG75TVzYP8aA==; 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 1iY3kI-0008Mv-Mp; Fri, 22 Nov 2019 07:52:50 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iY3kG-0008MI-Aa; Fri, 22 Nov 2019 07:52:50 +0000 X-UUID: 5944717b177f4bb4989fa8b0e514854b-20191121 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=fO3a2sHaDCK8cWgJ43PTivPYbDuLooH3WDQSaJqbvHY=; b=iK81P2fmuTSk5PNsJZmzcUZrwGPnToV8gLgLwKDbs0d4j8vb9hDOK06ERkS54YgJXkHAJq24Dl61wS9QyhtHRVVHzz4V9ZgOgtdy1kt/paqF0KzCZVL6l/A25qqU8koLcXszNQSQ/wwkmHLROuawFVFYsHhRvgANCXylRS6R45I=; X-UUID: 5944717b177f4bb4989fa8b0e514854b-20191121 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1949494477; Thu, 21 Nov 2019 23:52:43 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 21 Nov 2019 23:42:47 -0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 22 Nov 2019 15:42:35 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 22 Nov 2019 15:42:41 +0800 Message-ID: <1574408559.21408.2.camel@mtksdaap41> Subject: Re: [PATCH 3/8] drm/mediatek: don't open-code drm_gem_fb_create From: CK Hu To: Daniel Vetter Date: Fri, 22 Nov 2019 15:42:39 +0800 In-Reply-To: <20191115092120.4445-4-daniel.vetter@ffwll.ch> References: <20191115092120.4445-1-daniel.vetter@ffwll.ch> <20191115092120.4445-4-daniel.vetter@ffwll.ch> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: C567D168B7777EC4FDDD0886CBDB15D4E42E703B2427E1E245C023CAFA23D1982000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191121_235248_375757_8B77F147 X-CRM114-Status: GOOD ( 18.81 ) 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: Intel Graphics Development , DRI Development , linux-mediatek@lists.infradead.org, Philipp Zabel , Matthias Brugger , 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 Hi, Daniel: On Fri, 2019-11-15 at 10:21 +0100, Daniel Vetter wrote: > 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. Acked-by: CK Hu > > 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" > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek