From patchwork Tue Mar 26 13:19:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871077 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 82C89922 for ; Tue, 26 Mar 2019 13:20:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7060A28F88 for ; Tue, 26 Mar 2019 13:20:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EC3C28F92; Tue, 26 Mar 2019 13:20:53 +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 353C529076 for ; Tue, 26 Mar 2019 13:20:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4506A6E057; Tue, 26 Mar 2019 13:20:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2F6A6E061 for ; Tue, 26 Mar 2019 13:20:29 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id s39so5225375edb.2 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=pMbY5TfaRJAxP2S0sitQ07kh0/0L3AV/JF716xVbdyk=; b=cDqlcVUw7pdnTtVp8qc2SN3iuD7NSXi+kTWMG/y4Cde4b/t0JMhkbAN/sbQdmVNnOO g47Di+CmF7+WA4dNxtL4r0n2tDWJqNT66S3nIflmTnklse+kB7JeQF8pYRFD1EGHxYCp 2q1Wg9ntvfyXIAozzhAMW80BzTCA9NlDBLunBCc26AiFcp4lE1sjMEut8c7GnM/WiTxg Piji2NfXrdXG7AOyzfB8AaUWb/jwkOj/VvGRk/rw80nH00BLdy2znKfueD4ydbyzjKO7 1ze1fU2xACglLs1Z0jC/muNbylE59d0c6Kkv7AE9rj1fgXyPMD0DBpU6zfoTez3TdrC0 VieQ== X-Gm-Message-State: APjAAAVJ3XnzZZxuBPm2pSY5ZTZHt1Sm5hYGAoUgcTnxpqlBIEv7s/8W VWjoazsElcoWFSqjXcvm+GNCS+HncBQ= X-Google-Smtp-Source: APXvYqwM0U1nP2E9XptECyEAMveoc4FND5Zge8jwOdeM4sieoyTvp3vo55dN7TJ5lOqDSj5Y3An6lg== X-Received: by 2002:a50:8bb4:: with SMTP id m49mr20807323edm.28.1553606428093; Tue, 26 Mar 2019 06:20:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:27 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 11/21] drm/i915: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:19:58 +0100 Message-Id: <20190326132008.11781-11-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=pMbY5TfaRJAxP2S0sitQ07kh0/0L3AV/JF716xVbdyk=; b=JaivRV3qVqiQZj4re+qGu0C95zHnPlhQrKP9blFoVbvWgEXbCCJCzBjdhp3s+MHNsX sfgBolEDyDkuEOGnB0Mtqrft1g11I5wieDOwnmtqG1BI/rxqcz4/aqFQgbvgGNX64ihC DoV8Qvb7TxOCV/hmZVmDLu3Sv3dxpJr8arp+U= 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 , Rodrigo Vivi , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This changes the fb name from "inteldrmfb" to "i915drmfb". v2: Rebase Signed-off-by: Daniel Vetter Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/i915/intel_fbdev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index f9ab94b99a3c..ef93c27e60b4 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -235,12 +235,8 @@ static int intelfb_create(struct drm_fb_helper *helper, goto out_unpin; } - info->par = helper; - ifbdev->helper.fb = fb; - strcpy(info->fix.id, "inteldrmfb"); - info->fbops = &intelfb_ops; /* setup aperture base/size for vesafb takeover */ @@ -259,8 +255,7 @@ static int intelfb_create(struct drm_fb_helper *helper, info->screen_base = vaddr; info->screen_size = vma->node.size; - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &ifbdev->helper, sizes); /* If the object is shmemfs backed, it will have given us zeroed pages. * If the object is stolen however, it will be full of whatever