From patchwork Tue Mar 26 13:19:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871057 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 8AC0514DE for ; Tue, 26 Mar 2019 13:20:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77EB128FC1 for ; Tue, 26 Mar 2019 13:20:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C4CD28FA0; Tue, 26 Mar 2019 13:20:41 +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 304B028FA2 for ; Tue, 26 Mar 2019 13:20:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E3E856E05E; Tue, 26 Mar 2019 13:20:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id AC1836E04E for ; Tue, 26 Mar 2019 13:20:24 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id x10so10672397edh.11 for ; Tue, 26 Mar 2019 06:20:24 -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=cExhJenTibsxCDagCVn3I2EQq6KV75KVw0OrxKrFx1Q=; b=Pzz/a290tA3Fpcmz5tVdRzXbWCZ1URZvXVrKWXbQurmbPbXC9agTHuj608w9SQK/SM /Hi0L22pWa5LDoyeJeeDjFPdwFNYcH+NXigJN7PnSGYEhFq5aKBuxIyf8+1tQedJMytE S6afbDcjRc9BPkhVF93iSWq3x9jO0xVhSlrxtd4xSt/TvupYhQvcyufD/G3Anq5bpu+4 7Gm4goTR0EHxLWt/KpA8Vvm9LAKVNCReyfZJ7Y+hI3iRRHRSmb7JbO91yseOqZqYXXsL /dJhTJtR2k84BuJfYRee07m8eWjUkqtouihkp5JXNW06urMQg75YRM95y/PHMYl6SDte +uIw== X-Gm-Message-State: APjAAAUJds0fC3fq+cuvnnq3atJh47wuwn5tasCrRzeUbkem8PJzQ8t/ ne8q8wRCuAvYbf16aTZD9SG4/rWwucs= X-Google-Smtp-Source: APXvYqzw22YMM1cjOg4+vbbMGqEtV2G2fcZaZamNxtt25DS9nLxLP4S3C4FQD+kZrSGz6EvaFTSZNw== X-Received: by 2002:aa7:dd0a:: with SMTP id i10mr20018655edv.35.1553606422612; Tue, 26 Mar 2019 06:20:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:21 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 07/21] drm/cirrus: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:19:54 +0100 Message-Id: <20190326132008.11781-7-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=cExhJenTibsxCDagCVn3I2EQq6KV75KVw0OrxKrFx1Q=; b=UuVagqcMRVBG8Ylh3NuX1YeSbo8eyZDNQE0I2rFrBsxQBlfGwNQDPFArEwaGOx0TXV Mx2UgdD+JnCnfbokFVJxMK4jpxye5hgyDxU7iB98VfFRfCFTSM8+MEeBopeDBNYVs+eP b3D5Cz3l21UnI1kRR5j+2DznML4kqHE6OnxUY= 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 , Gerd Hoffmann , Daniel Vetter 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: Gerd Hoffmann Acked-by: Noralf Trønnes --- drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h index f2b2e0d169fa..915709739257 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.h +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h @@ -143,7 +143,7 @@ struct cirrus_device { struct cirrus_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct drm_framebuffer *gfb; void *sysram; int size; diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c index 39df62acac69..2e6128069fc3 100644 --- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c @@ -195,8 +195,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper, goto err_vfree; } - info->par = gfbdev; - fb = kzalloc(sizeof(*fb), GFP_KERNEL); if (!fb) { ret = -ENOMEM; @@ -214,13 +212,9 @@ static int cirrusfb_create(struct drm_fb_helper *helper, /* setup helper */ gfbdev->helper.fb = fb; - strcpy(info->fix.id, "cirrusdrmfb"); - info->fbops = &cirrusfb_ops; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &gfbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &gfbdev->helper, sizes); /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = cdev->dev->mode_config.fb_base;