From patchwork Tue Mar 26 13:19:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871053 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 E743B922 for ; Tue, 26 Mar 2019 13:20:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D220D28FA2 for ; Tue, 26 Mar 2019 13:20:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D060B28F9D; Tue, 26 Mar 2019 13:20:38 +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=ham 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 6E19328FA2 for ; Tue, 26 Mar 2019 13:20:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 243716E051; Tue, 26 Mar 2019 13:20:25 +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 EEE7A6E04E for ; Tue, 26 Mar 2019 13:20:22 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id x10so10672331edh.11 for ; Tue, 26 Mar 2019 06:20:22 -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=+yQgS1SVaHNFv1LKtC/3HzX19NpZu2ytWnBcgG746pU=; b=IgmN0iEEskXVNSkFefEMxGVTy8uwXP32d8/qPo07HXNt8Hee/CPOgaw95alzt8ql/U CZUN1CpXuMdSk/Jb1F0c0Tk3uGbRp9MRIoE7+TM7XAo6G8y6h/ezzxdH3FhRLD5ysxOR c7Cc2rsibntAapeDu0Wu6arBGTxqUg4FYgUWrqGJZGXNRGJJx76D5tWRVb6NR1HOqkyY dGNpzsiJ5BOQlwghD45VakNS9nKN6UmP/Z0aWvXCqkZUu8QbfExxcvkARo/Eo/dCmDwX u6ZBrauv4sl4XN7uAOIgXqojSl6DHx7Krxdk2ha6QctcGsRorNLaTG3ve3LZEB1XJhVm jPjA== X-Gm-Message-State: APjAAAVx3FMxy2mPTaoZOqXlX05VtRe3Lgvz+Wpq+80rr8SMtT/YUGjh VeyqsPVI8GPAaTA0aGlTkpfLd8mQxhU= X-Google-Smtp-Source: APXvYqyDoDSSzH8swFCvlY8+uVx0QhjzQKHUFoT9c84nswsVRV1cXtfQ7AveOStsKHravUSciy7S6g== X-Received: by 2002:a50:ca8d:: with SMTP id x13mr20343653edh.56.1553606421272; Tue, 26 Mar 2019 06:20:21 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/21] drm/ast: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:19:53 +0100 Message-Id: <20190326132008.11781-6-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=+yQgS1SVaHNFv1LKtC/3HzX19NpZu2ytWnBcgG746pU=; b=FRYmtum6tFrSpIUIvmSzToIgo+bQu3q3aA+rYHFVu5dZKSp6OZI06Exl/vT7VR8piN CVOHe1BTRYe2Pl992o6B3GYOGzDzQLwac+V8YyAvu4vOkw3cNNFw2sZugJ/vK7bNyBjo Lvr9f9+QtoYJoJWebNkd1OfcHf0yHVZp0HmEg= 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: Sam Bobroff , Daniel Vetter , Intel Graphics Development , YueHaibing , Alex Deucher , Daniel Vetter , Junwei Zhang , Dave Airlie , Sean Paul , =?utf-8?q?Ch?= =?utf-8?q?ristian_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: Dave Airlie Cc: Junwei Zhang Cc: Alex Deucher Cc: "Christian König" Cc: Daniel Vetter Cc: Sean Paul Cc: YueHaibing Cc: Sam Bobroff Acked-by: Noralf Trønnes --- drivers/gpu/drm/ast/ast_drv.h | 2 +- drivers/gpu/drm/ast/ast_fb.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index bfc65040dfcb..ffce4608e0c5 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -259,7 +259,7 @@ struct ast_framebuffer { }; struct ast_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct ast_framebuffer afb; void *sysram; int size; diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c index 2c9f8dd9733a..e718d0f60d6b 100644 --- a/drivers/gpu/drm/ast/ast_fb.c +++ b/drivers/gpu/drm/ast/ast_fb.c @@ -217,8 +217,6 @@ static int astfb_create(struct drm_fb_helper *helper, ret = PTR_ERR(info); goto out; } - info->par = afbdev; - ret = ast_framebuffer_init(dev, &afbdev->afb, &mode_cmd, gobj); if (ret) goto out; @@ -229,15 +227,12 @@ static int astfb_create(struct drm_fb_helper *helper, fb = &afbdev->afb.base; afbdev->helper.fb = fb; - strcpy(info->fix.id, "astdrmfb"); - info->fbops = &astfb_ops; info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0); - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &afbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &afbdev->helper, sizes); info->screen_base = sysram; info->screen_size = size;