From patchwork Tue Mar 26 13:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871097 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 19F06922 for ; Tue, 26 Mar 2019 13:21:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 07F902902B for ; Tue, 26 Mar 2019 13:21:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F010B2901F; Tue, 26 Mar 2019 13:21:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A562729076 for ; Tue, 26 Mar 2019 13:21:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E70F26E068; Tue, 26 Mar 2019 13:20:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3907F6E057 for ; Tue, 26 Mar 2019 13:20:29 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id x10so10672653edh.11 for ; Tue, 26 Mar 2019 06:20:29 -0700 (PDT) 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=xTrKBtAF/vst0Q7kErpFnW3Wo/9qa2k5cuoPn1zJ5ns=; b=X30XyVcyj1hdcn4zJKUN+9GOk9aO0qLQnCY2rbiZUY7Ia3uUixSpz4MI0pL8i2v7M6 ShUloMB/k2xl6Dh+uK+dkxbkq/vSn/5dJSgNpokt09zHZEoDnNd5/JT+3wcii8BctI/A 38yQpEDUDjz1IEwVJZQg1zM7G60++s1cmlvoEer48DSagb4gUtrHp7b0NkprNSYS3m2K /8ywYn7afSCurlkI9aRf3Pt/pQyN/DcYtyRFiePoksiNDnOr+JAqU+x6xtmKwImTBas6 L1RDZN4YraYLV8m05nnXnvg7Q7Ycl99Mdn7tPxTayQ+Y7P40wAXeK4TYEij7uOo2Co// PSIA== X-Gm-Message-State: APjAAAXWz/3eUBtqTxL1O/ypKUeTacvyyjuzJRu+jaRpFAoTIuLjeU8f S2U1dkcExLPtg76/s/+sphJC6M6Xdqc= X-Google-Smtp-Source: APXvYqwTsK20emDMjWfxBQeNr5hWbqO/wWPxVmCHmVzZq9NQAwUV/MMHkq4dwlHv/nr8AjdIgMTA0g== X-Received: by 2002:a50:a325:: with SMTP id 34mr19322414edn.286.1553606426699; Tue, 26 Mar 2019 06:20:26 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id d10sm3668547ejh.66.2019.03.26.06.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:25 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/21] drm/hibmc: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:19:57 +0100 Message-Id: <20190326132008.11781-10-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190326132008.11781-1-daniel.vetter@ffwll.ch> References: <20190326132008.11781-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=xTrKBtAF/vst0Q7kErpFnW3Wo/9qa2k5cuoPn1zJ5ns=; b=DjFF+qle8pKF6RqnGBk2gv1rIRfTFGSiyhQkMI2Vh4XJ6hROn02tIZnJfMlwv/eZej LUa+X0yZ4lz7dyEAymr3ZwjTdplge4htDh9YOq4Ldmv1y7KRu8zNWy2ods4Z5ae7OeUZ /OgcIX/7+dXrDBDl4xyPIcD/mvoyN45LPTGG0= 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: Ajit Negi , Daniel Vetter , Intel Graphics Development , John Garry , Xinliang Liu , Junwei Zhang , Souptick Joarder , Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: Junwei Zhang Cc: Xinliang Liu Cc: "Christian König" Cc: Ajit Negi Cc: Souptick Joarder Cc: Daniel Vetter Cc: John Garry Acked-by: Noralf Trønnes --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 3c168ae77b0c..0a381c22de26 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -31,7 +31,7 @@ struct hibmc_framebuffer { }; struct hibmc_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct hibmc_framebuffer *fb; int size; }; diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c index de9d7cc97e44..8026859aa07d 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c @@ -116,8 +116,6 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, goto out_release_fbi; } - info->par = hi_fbdev; - hi_fbdev->fb = hibmc_framebuffer_init(priv->dev, &mode_cmd, gobj); if (IS_ERR(hi_fbdev->fb)) { ret = PTR_ERR(hi_fbdev->fb); @@ -129,14 +127,9 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, priv->fbdev->size = size; hi_fbdev->helper.fb = &hi_fbdev->fb->fb; - strcpy(info->fix.id, "hibmcdrmfb"); - info->fbops = &hibmc_drm_fb_ops; - drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0], - hi_fbdev->fb->fb.format->depth); - drm_fb_helper_fill_var(info, &priv->fbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &priv->fbdev->helper, sizes); info->screen_base = bo->kmap.virtual; info->screen_size = size;