From patchwork Thu Jan 24 16:58:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10779593 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 191591515 for ; Thu, 24 Jan 2019 16:59:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 861F030D9D for ; Thu, 24 Jan 2019 16:59:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A6FB30DD6; Thu, 24 Jan 2019 16:59:34 +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 34DC530D9D for ; Thu, 24 Jan 2019 16:59:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D686F6F1DB; Thu, 24 Jan 2019 16:59:07 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@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 D8D356F1D5 for ; Thu, 24 Jan 2019 16:59:01 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id b3so5187103ede.1 for ; Thu, 24 Jan 2019 08:59:01 -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=9qQcrsiNhCbWRX5b9QgBZWTSWBxwH5TFHd3ELzu+8Og=; b=awK4W7HnQgBznB22t7oG6r2WixzGnVCoLBa1cPke99lGxBO3E6wQIv3DoJ1xBbKucl WGIeuwjv5ueMGhEs6gkG3HBrfNoVCcCP4t/JrCfqjEw6wLqI6ND1qP5HQ9WOrZI4QKNg Lt5/NxaTgMTvbexb2uFu+mORqQIjs6Miz3j1L5nrNZO26mQrJj1lzwNYGtxUnVtn+gRc GC1qf5fJa43kQ0OiVDqBocKijBIcWKa/MSyb7ePXf4TS+f3LOQlMFSt5GahBJ+B8HFp0 PAmBwF7f344iKIpVKn0+hszqtXrkDqgHJNUB2exTXz+JqitpLxO1kq0dZdgngAxzroDk mwTQ== X-Gm-Message-State: AJcUukc/g7jjVogMqEhPcEbz6a+JCWYL+ezTxpQ8cHmsW/I3tlNg5GWo 9dnHHwQJ0tOMBdCiinTYXdFiAahdjso= X-Google-Smtp-Source: ALg8bN7CY4mo7IXb7+PZdoXOuKwDfhlTlbKjQriu658Evl3u4yNGiJM8QGdW6wnSzt3bR5VUm2ELYQ== X-Received: by 2002:a50:9fe3:: with SMTP id c90mr7396919edf.163.1548349140404; Thu, 24 Jan 2019 08:59:00 -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.58.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Jan 2019 08:58:59 -0800 (PST) From: Daniel Vetter To: DRI Development Date: Thu, 24 Jan 2019 17:58:19 +0100 Message-Id: <20190124165831.16427-15-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 14/26] drm/i915: 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: Daniel Vetter , Intel Graphics Development , Daniel Vetter Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This changes the fb name from "inteldrmfb" to "i915drmfb". Signed-off-by: Daniel Vetter Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org --- 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 f37d2aee24f5..29800fdcf830 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); /* 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