From: Daniel Vetter <daniel.vetter-/w4YWyX8dFk@public.gmane.org>
To: DRI Development
<dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>
Cc: "David (ChunMing) Zhou"
<David1.Zhou-5C7GfCeVMHo@public.gmane.org>,
"Daniel Vetter" <daniel.vetter-/w4YWyX8dFk@public.gmane.org>,
"Intel Graphics Development"
<intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org>,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
"Alex Deucher" <alexander.deucher-5C7GfCeVMHo@public.gmane.org>,
"Daniel Vetter"
<daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
"Christian König" <christian.koenig-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 16/21] drm/radeon: Use drm_fb_helper_fill_info
Date: Tue, 26 Mar 2019 14:20:03 +0100 [thread overview]
Message-ID: <20190326132008.11781-16-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20190326132008.11781-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
This should not result in any changes.
v2: Rebase
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: amd-gfx@lists.freedesktop.org
---
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;
--
2.20.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2019-03-26 13:20 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-26 13:19 [PATCH 01/21] drm/fb-helper: Add fill_info() functions Daniel Vetter
2019-03-26 13:19 ` [PATCH 02/21] drm/fb-helper: set fbi->fix.id in fill_info() Daniel Vetter
2019-03-26 13:56 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 03/21] drm/fb_helper: set info->par " Daniel Vetter
2019-03-26 13:57 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 04/21] drm/amdgpu: Use drm_fb_helper_fill_info Daniel Vetter
2019-03-26 14:04 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 05/21] drm/armada: " Daniel Vetter
2019-03-26 14:06 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 06/21] drm/ast: " Daniel Vetter
2019-03-26 14:21 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 07/21] drm/cirrus: " Daniel Vetter
2019-03-26 14:24 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 08/21] drm/exynos: " Daniel Vetter
2019-03-26 14:27 ` Noralf Trønnes
2019-03-27 22:57 ` Inki Dae
2019-03-26 13:19 ` [PATCH 09/21] drm/gma500: " Daniel Vetter
2019-03-26 14:31 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 10/21] drm/hibmc: " Daniel Vetter
2019-03-26 14:32 ` Noralf Trønnes
2019-03-26 13:19 ` [PATCH 11/21] drm/i915: " Daniel Vetter
2019-03-26 14:34 ` Noralf Trønnes
2019-03-27 11:10 ` Joonas Lahtinen
2019-03-27 11:15 ` Daniel Vetter
2019-03-26 13:19 ` [PATCH 12/21] drm/mga200g: " Daniel Vetter
2019-03-26 14:41 ` Noralf Trønnes
2019-03-26 13:20 ` [PATCH 14/21] drm/nouveau: " Daniel Vetter
2019-03-26 14:47 ` Noralf Trønnes
2019-03-26 13:20 ` [PATCH 15/21] drm/omap: " Daniel Vetter
2019-03-26 14:49 ` Noralf Trønnes
[not found] ` <20190326132008.11781-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org>
2019-03-26 13:20 ` [PATCH 13/21] drm/bochs: " Daniel Vetter
2019-03-26 14:42 ` Noralf Trønnes
2019-03-26 14:45 ` Noralf Trønnes
2019-03-26 13:20 ` Daniel Vetter [this message]
2019-03-26 14:51 ` [PATCH 16/21] drm/radeon: " Noralf Trønnes
2019-03-26 13:20 ` [PATCH 17/21] drm/rockchip: " Daniel Vetter
2019-03-26 14:52 ` Noralf Trønnes
2019-03-26 13:20 ` [PATCH 18/21] drm/tegra: " Daniel Vetter
2019-03-26 14:53 ` Noralf Trønnes
2019-03-26 14:55 ` Thierry Reding
2019-03-26 13:20 ` [PATCH 19/21] drm/udl: " Daniel Vetter
2019-03-26 14:58 ` Noralf Trønnes
2019-03-26 13:20 ` [PATCH 20/21] drm/vboxvideo: " Daniel Vetter
2019-03-26 14:59 ` Noralf Trønnes
2019-03-26 13:20 ` [PATCH 21/21] drm/fb-helper: Unexport fill_{var,info} Daniel Vetter
2019-03-26 14:34 ` Alex Deucher
2019-03-26 15:01 ` [PATCH 21/21] drm/fb-helper: Unexport fill_{var, info} Noralf Trønnes
2019-03-27 9:13 ` Daniel Vetter
2019-03-26 13:50 ` [PATCH 01/21] drm/fb-helper: Add fill_info() functions Noralf Trønnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190326132008.11781-16-daniel.vetter@ffwll.ch \
--to=daniel.vetter-/w4ywyx8dfk@public.gmane.org \
--cc=David1.Zhou-5C7GfCeVMHo@public.gmane.org \
--cc=alexander.deucher-5C7GfCeVMHo@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=christian.koenig-5C7GfCeVMHo@public.gmane.org \
--cc=daniel.vetter-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).