From patchwork Thu Jan 24 16:58:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10779643 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 EBC7817F0 for ; Thu, 24 Jan 2019 17:00:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BFD9731064 for ; Thu, 24 Jan 2019 17:00:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDD8F31247; Thu, 24 Jan 2019 17:00:08 +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 5815931064 for ; Thu, 24 Jan 2019 17:00:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 634DF6F1E5; Thu, 24 Jan 2019 16:59:22 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@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 A83076F1E5 for ; Thu, 24 Jan 2019 16:59:18 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id d39so5132727edb.12 for ; Thu, 24 Jan 2019 08:59:18 -0800 (PST) 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=+UAAPx+BgrgHdLdQvugk7y4kz1lrmpckZ5JC+s/lpXU=; b=rNWCkIzOE6lmWNLIjPCZ1daQtViG49WQWHkMVV+FGroXp+P7WEHhuEzBBa0air4K0B H59BfrPNtVcmrJDxhGIAGP9RAmE7OSkaFEF8kLvVhH4+e4QG3QObUp6iu7ApmHREXvxx D+tvKM+KbrbuI6slfGm74dIU+fM8LOY+cfg3leD5Iu6Wrj9zmAlaVNLQfAiO5/pzr66s 5tCFy/HqTYl5haYlN3Xb2x45L5W6a3Gj4qU0rfEF4bR2IBT6VfgXJ2Z5HUk/x+fM7WIm epgqvWjlGVPmEb1mD7YG3ljeNvfHDxiWvk6XEPqY+pR2fPVKApPQ9arPo3cZXEHIR1hA gazg== X-Gm-Message-State: AJcUukfet/DH/4p1yvn6bidAeF7ITApJgV2w6G7CGL2MzEXnJTIMc+mO Il3e5lQDtmp1RGVSwmbG84O5xw== X-Google-Smtp-Source: ALg8bN6n6ecE5GA0q2ExzXPRyR3htrTO8NjkdZcyrVQEn7RuOt+w1mMcY54kGRctBhPtpHifwuZZWg== X-Received: by 2002:aa7:c981:: with SMTP id c1mr7421736edt.54.1548349156481; Thu, 24 Jan 2019 08:59:16 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id w31sm11219233edw.82.2019.01.24.08.59.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jan 2019 08:59:15 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Thu, 24 Jan 2019 17:58:29 +0100 Message-Id: <20190124165831.16427-25-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124165831.16427-1-daniel.vetter@ffwll.ch> References: <20190124165831.16427-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 24/26] staging/vboxvideo: Use drm_fb_helper_fill_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Kapshuk , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , Greg Kroah-Hartman , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This should not result in any changes. v2: Rebase over vbox changes - vbox gained it's own line to fill fix.id. Signed-off-by: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Hans de Goede Cc: Daniel Vetter Cc: Alexander Kapshuk Cc: Bartlomiej Zolnierkiewicz Reviewed-by: Greg Kroah-Hartman --- drivers/staging/vboxvideo/vbox_fb.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/vboxvideo/vbox_fb.c b/drivers/staging/vboxvideo/vbox_fb.c index 397496cf0bdf..1da4cb7647b8 100644 --- a/drivers/staging/vboxvideo/vbox_fb.c +++ b/drivers/staging/vboxvideo/vbox_fb.c @@ -88,13 +88,9 @@ int vboxfb_create(struct drm_fb_helper *helper, if (IS_ERR(info->screen_base)) return PTR_ERR(info->screen_base); - info->par = helper; - fb = &vbox->afb.base; helper->fb = fb; - strcpy(info->fix.id, "vboxdrmfb"); - info->fbops = &vboxfb_ops; /* @@ -104,9 +100,7 @@ int vboxfb_create(struct drm_fb_helper *helper, info->apertures->ranges[0].base = pci_resource_start(pdev, 0); info->apertures->ranges[0].size = pci_resource_len(pdev, 0); - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - drm_fb_helper_fill_var(info, helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, helper); gpu_addr = vbox_bo_gpu_offset(bo); info->fix.smem_start = info->apertures->ranges[0].base + gpu_addr;