From patchwork Tue Mar 26 13:19:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871101 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 68B1E1390 for ; Tue, 26 Mar 2019 13:21:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54FF729007 for ; Tue, 26 Mar 2019 13:21:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48D1E2901F; Tue, 26 Mar 2019 13:21:10 +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 02CD929007 for ; Tue, 26 Mar 2019 13:21:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DBFF6E06C; Tue, 26 Mar 2019 13:20:49 +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 910AA6E059 for ; Tue, 26 Mar 2019 13:20:31 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id p20so10247474eds.6 for ; Tue, 26 Mar 2019 06:20:31 -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=PMER7ZM3+sB6RKzUxh30dnufIE4fQPyouiDL4pNGujM=; b=mCal5ARkXJKCkxcwlMnAVJmWXUbCB4f4mZBbYz7yTUwm6zVmBXp6W7cWuFke55GZ31 G6UVUNeDjXgV9LUb5eOgQrwkv9+SkzocyV9eaLyprQ1gXxyWIjTED3GegN+4sabug1w5 nl8Ya13pgDX/LfsJ0xqIhldXOMMx5dQg5mwt986JUMx0xn9IyHE9y+WbIRifCICjmXwu rFKtZXX8uX+QD/7nN0ZM6VOdo/qpug+h1NxvdY+DXw48awnl51Ad9qU9y38grBNLuxuJ rfOOo67SOFz1rGCq3i5y7EPOJG2UJmPmGX/I3mOOrELChjhKth5jsRAgMjq9FK93Ax4u zyKQ== X-Gm-Message-State: APjAAAU6GEJ4SVL4sD9+wGy0hv/V/f07ekbajK3ZALCJMAD6Zo3ZRGcM 8clOMPtIwXHx3g5ypbEXFI7gWC9LG1k= X-Google-Smtp-Source: APXvYqyzHZ97J7Hrs3UmHndMNcHhjSyS8WlhHfXvZM/aaHzkaj1f54oRtKm+SYQmJKfEE24m39QaPw== X-Received: by 2002:aa7:cb57:: with SMTP id w23mr20119226edt.264.1553606429424; Tue, 26 Mar 2019 06:20:29 -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.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:28 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 12/21] drm/mga200g: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:19:59 +0100 Message-Id: <20190326132008.11781-12-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=PMER7ZM3+sB6RKzUxh30dnufIE4fQPyouiDL4pNGujM=; b=D51Tua7t8kG4tjA4p0cb72YsSl74MfePUO9LMtPECyN0IuRgSrcMqu9cXYq4XZzLpD ZQRzpgNH74lw52qpMUOY+llTJnnj18T0wOYZIc1HwsvP49iORpHspZ8w90v3IHyQL89n 46fT+saLrK0otUfSylhExp1jvXdWKRLpyWTEo= 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 , Junwei Zhang , Daniel Vetter , Alex Deucher , Dave Airlie , =?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: Dave Airlie Cc: Alex Deucher Cc: "Christian König" Cc: Junwei Zhang Cc: Daniel Vetter Acked-by: Noralf Trønnes --- drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index 0aaedc554879..71a235c2d848 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -113,7 +113,7 @@ struct mga_framebuffer { }; struct mga_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct mga_framebuffer mfb; void *sysram; int size; diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 6893934b26c0..5b7e64cac004 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c @@ -195,8 +195,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, goto err_alloc_fbi; } - info->par = mfbdev; - ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj); if (ret) goto err_alloc_fbi; @@ -209,17 +207,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper, /* setup helper */ mfbdev->helper.fb = fb; - strcpy(info->fix.id, "mgadrmfb"); - info->fbops = &mgag200fb_ops; /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = mdev->dev->mode_config.fb_base; info->apertures->ranges[0].size = mdev->mc.vram_size; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &mfbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &mfbdev->helper, sizes); info->screen_base = sysram; info->screen_size = size;