From patchwork Tue Mar 26 13:19:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871063 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 9B98814DE for ; Tue, 26 Mar 2019 13:20:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 873B528FC1 for ; Tue, 26 Mar 2019 13:20:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85CFC29077; Tue, 26 Mar 2019 13:20:45 +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 37E1B28FF9 for ; Tue, 26 Mar 2019 13:20:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 019746E05C; Tue, 26 Mar 2019 13:20:30 +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 0061B6E05F for ; Tue, 26 Mar 2019 13:20:26 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id d26so10701797ede.10 for ; Tue, 26 Mar 2019 06:20:26 -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=KhOWaExkRCrZ3M4KGs0sS3Kpfa/m/jgUC/3/JkFzOz8=; b=gwMuczs0GF8xcWx2XXEHy1pxLVkAqi+hdqsdirvuIgQ7ln7aBP6FkCA3W3ozVX8LWi VENST8jzXkuBo8/cS8gG6etrbKocBSuFlBHkZcW8SBVPivjtJXkS1Z1TDEqw2AG5vywi 9SyPQpubfwhB+cFB8UT645eoglgtEim5jKM/j+Ovlug/y3Ts0Ny/Dj2LVrV4Tp9GKekA Ey9KpARmIZhtAhlis//BAGaqOuMQByA7ZevglAvLcClv6mMM2eeFWIDrFcXYL8VUl3zQ TM57h6enJEbhT/hI0rW2XqVfW8ZQIJHOj90dCRI3Otx1bTAFhcZenI4iw3daslTGa4so eYbg== X-Gm-Message-State: APjAAAUNepGsBkCbtbV1uPDk3TDl4h/4Bu7/ffdJEpnMWGN6tIO4bGU0 SpBn1yayoI7EfJuoBbsl4OwB1C7Sjk0= X-Google-Smtp-Source: APXvYqy09JeMNw5KQPzmGleHQQqG5mFYMHgKMshiBrSh6TmEnriEHlIWqExrJqe5P9SBRhY1YaEGAA== X-Received: by 2002:aa7:d383:: with SMTP id x3mr20241686edq.61.1553606425323; Tue, 26 Mar 2019 06:20:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:24 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/21] drm/gma500: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:19:56 +0100 Message-Id: <20190326132008.11781-9-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=KhOWaExkRCrZ3M4KGs0sS3Kpfa/m/jgUC/3/JkFzOz8=; b=JHW5kF8iTZQcOK8Dxqz5BIvRZWctXq1PpNdw4uJpGpajyQTLMah1DzH1EzFFJ5RKgb ZDfzFIev3NYt3gOseuMY0m42NaGY/kPUg0F63cDnRJ3tJN8wBBUj9nfwYa9MNHCgCbP/ 5Y5rpFlW/ElBDHd3KRoK2m1ZbaGoWY3slq9VA= 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 , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This will change the fb name from "psbdrmfb" to "gma500drmfb". v2: Rebase Signed-off-by: Daniel Vetter Cc: Patrik Jakobsson Acked-by: Noralf Trønnes --- drivers/gpu/drm/gma500/framebuffer.c | 7 +------ drivers/gpu/drm/gma500/framebuffer.h | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index c934b3df1f81..a9d3a4a30ab8 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -389,7 +389,6 @@ static int psbfb_create(struct psb_fbdev *fbdev, ret = PTR_ERR(info); goto out; } - info->par = fbdev; mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth); @@ -402,9 +401,6 @@ static int psbfb_create(struct psb_fbdev *fbdev, fbdev->psb_fb_helper.fb = fb; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - strcpy(info->fix.id, "psbdrmfb"); - if (dev_priv->ops->accel_2d && pitch_lines > 8) /* 2D engine */ info->fbops = &psbfb_ops; else if (gtt_roll) { /* GTT rolling seems best */ @@ -427,8 +423,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, info->apertures->ranges[0].size = dev_priv->gtt.stolen_size; } - drm_fb_helper_fill_var(info, &fbdev->psb_fb_helper, - sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &fbdev->psb_fb_helper, sizes); info->fix.mmio_start = pci_resource_start(dev->pdev, 0); info->fix.mmio_len = pci_resource_len(dev->pdev, 0); diff --git a/drivers/gpu/drm/gma500/framebuffer.h b/drivers/gpu/drm/gma500/framebuffer.h index 23dc3c5f8f0d..e8e6357f033b 100644 --- a/drivers/gpu/drm/gma500/framebuffer.h +++ b/drivers/gpu/drm/gma500/framebuffer.h @@ -34,7 +34,7 @@ struct psb_framebuffer { }; struct psb_fbdev { - struct drm_fb_helper psb_fb_helper; + struct drm_fb_helper psb_fb_helper; /* must be first */ struct psb_framebuffer pfb; };