From patchwork Tue Mar 26 13:20:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10871109 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 3E23F922 for ; Tue, 26 Mar 2019 13:21:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B4AA28F89 for ; Tue, 26 Mar 2019 13:21:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FC1428FC6; Tue, 26 Mar 2019 13:21:15 +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 AA4B128FD4 for ; Tue, 26 Mar 2019 13:21:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9BC686E074; Tue, 26 Mar 2019 13:20:54 +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 EFC636E06D for ; Tue, 26 Mar 2019 13:20:36 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id d26so10702313ede.10 for ; Tue, 26 Mar 2019 06:20:36 -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=eABN7MUhcZhCJ6eRjV76xpF3ewbo/q0bb+3DvwpeUsA=; b=pHp4ZODXdKU7TaHOtfsGOukVBPZ2JG3GRsLDMIo00bTOVT7RuZvJlq82TfdlLXLSDA mvK8N/AVm9hX8ro4Qr6GCcHtPtURy3Hh6K/rEH6pmxIrjLCP7TZyzL9gCVSzc+ItKEyf MeKTMDt5ILgvP2kUEuHGI3gQBC+R5O7cHjifW9eBSiyrz1bjETwsk5xEqes9O42qmEpf 7tk63MGNtXNQKa2BLcMqTFmToCo62USTZHzqK6V48ItKwkdmqVFgcOomleKNaNDxH8nm vH+AzX09dsnIcDhBIpShMLgkIHr8TcTATT0ZdHbXS+bzL9ri3D2X9POM6QvTd1u0IeFS VaJQ== X-Gm-Message-State: APjAAAVQAaPzFxf4sVKg+LWq2CwsrUUUHzvycEekECwdC9qo9EAmmYBg ykp0Rh2JNou+bjvW9l7uQZJ+iEoevgY= X-Google-Smtp-Source: APXvYqzLGaU54cAjGodqGPPLcRlDE7+sMJMme6YzEVcXK3OTKVmphw9jtUPC6uTnqkVJphOztIKP/Q== X-Received: by 2002:a17:906:6003:: with SMTP id o3mr17463138ejj.128.1553606434719; Tue, 26 Mar 2019 06:20:34 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 06:20:33 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 16/21] drm/radeon: Use drm_fb_helper_fill_info Date: Tue, 26 Mar 2019 14:20:03 +0100 Message-Id: <20190326132008.11781-16-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=eABN7MUhcZhCJ6eRjV76xpF3ewbo/q0bb+3DvwpeUsA=; b=P8JAGE+GONcuBWMAClPM8/70kHfH9Bf0Su4PdkLpEldYSJd7m8oq3yeK3Tb5FSuqHv /iX4JUKxDFfBzU2BlhciwZykZeMaywwDDZNYxxXufNrryNyZg47xRy45PjWkseNtO/Bj uzdji278rYLzaQHPOeIfQjUu1XkhnIFmTNHc8= 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 , amd-gfx@lists.freedesktop.org, Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This should not result in any changes. v2: Rebase Signed-off-by: Daniel Vetter Cc: Alex Deucher Cc: "Christian König" Cc: "David (ChunMing) Zhou" Cc: amd-gfx@lists.freedesktop.org Acked-by: Noralf Trønnes --- drivers/gpu/drm/radeon/radeon_fb.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index d50bff20f7de..1298b84cb1c7 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -42,7 +42,7 @@ * the helper contains a pointer to radeon framebuffer baseclass. */ struct radeon_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct drm_framebuffer fb; struct radeon_device *rdev; }; @@ -247,8 +247,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, /* radeon resume is fragile and needs a vt switch to help it along */ info->skip_vt_switch = false; - info->par = rfbdev; - ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->fb, &mode_cmd, gobj); if (ret) { DRM_ERROR("failed to initialize framebuffer %d\n", ret); @@ -262,10 +260,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, memset_io(rbo->kptr, 0x0, radeon_bo_size(rbo)); - strcpy(info->fix.id, "radeondrmfb"); - - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - info->fbops = &radeonfb_ops; tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start; @@ -274,7 +268,7 @@ static int radeonfb_create(struct drm_fb_helper *helper, info->screen_base = rbo->kptr; info->screen_size = radeon_bo_size(rbo); - drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, &rfbdev->helper, sizes); /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;