From patchwork Tue Mar 26 13:20:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871089 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 C220F922 for ; Tue, 26 Mar 2019 13:21:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B04C2286D1 for ; Tue, 26 Mar 2019 13:21:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEC4F2906C; Tue, 26 Mar 2019 13:21:01 +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 4AC5C286D1 for ; Tue, 26 Mar 2019 13:21:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1B6C6E069; Tue, 26 Mar 2019 13:20:44 +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 3F2936E068 for ; Tue, 26 Mar 2019 13:20:42 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id q14so10722153edr.5 for ; Tue, 26 Mar 2019 06:20:42 -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=+56PIy9tn2OfGguxyaaSn6r4OcvRHTOL0jgqVYdmcGo=; b=RMJr+DDnRBl+6I1G1kR02Xh2HsWDVM6XtUZwbxffpVyoXUt3NTps1fY+vg3Ajro7M/ r8L3OMbDG0STa9bqcJj8ZAah9fzAoED2qupOnupa8UWRh/Soe5jq3lad1NGo4y9rAY0n 9EErpnnpojZjzU/fPrf85UQlCIKUfOV7HQ9sX9vi2dMzUo4gd0Mytc5sMw5q+2stpoiR GcYnYbXIcc48dsxuITxsZDXUrUKjlmTQo0I0onm7UEuMnIeMQPtHnayerTF7ezkwcUld HEeevKM21wJtDtcObUQnc0f7ZhaUFlMlVVsjphV2yEeEk50k/Bsc+Br2nws4pcpC5wFn Jw+w== X-Gm-Message-State: APjAAAV1+W5g5jq2uq+GVShjH1ahDJBNumjNU0IFdGUk0g/j5dRyDIM7 7f6SUURzqdiEhfMoLe5REKqFcQ== X-Google-Smtp-Source: APXvYqzbXE/S6KtuHOPfJjqxjzKFv2guNAeERGViNewkq0SUuCaEAwaW0hQd+cWiDTwLCE5ftK/YQQ== X-Received: by 2002:a05:6402:88a:: with SMTP id e10mr19908814edy.88.1553606440143; Tue, 26 Mar 2019 06:20:40 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:39 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Tue, 26 Mar 2019 14:20:07 +0100 Message-Id: <20190326132008.11781-20-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=+56PIy9tn2OfGguxyaaSn6r4OcvRHTOL0jgqVYdmcGo=; b=OMwAcnbIdHMUEhA+L/nXrr+3jHiUMSip6wTVexNINycm/P/+BwlkDBdw55Nrix8RDV WcRnQKJDtpLAvMvLRI5wsxYm2rXfQO5ma4HMJuyJMiKUSqENTtX+9DyaXOErqH7XK1qY YV7NYBs55OE/iUpy9ld9qkDweKxRZXAp9PenE= Subject: [Intel-gfx] [PATCH 20/21] drm/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. v3: Rebase Reviewed-by: Greg Kroah-Hartman (v2) Signed-off-by: Daniel Vetter Cc: Greg Kroah-Hartman Cc: Hans de Goede Cc: Daniel Vetter Cc: Alexander Kapshuk Cc: Bartlomiej Zolnierkiewicz Reviewed-by: Noralf Trønnes --- drivers/gpu/drm/vboxvideo/vbox_fb.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vboxvideo/vbox_fb.c b/drivers/gpu/drm/vboxvideo/vbox_fb.c index 83a04afd1766..b724fe7c0c30 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_fb.c +++ b/drivers/gpu/drm/vboxvideo/vbox_fb.c @@ -90,13 +90,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; /* @@ -106,9 +102,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, sizes); gpu_addr = vbox_bo_gpu_offset(bo); info->fix.smem_start = info->apertures->ranges[0].base + gpu_addr;