diff options
| author | nonaka <nonaka@NetBSD.org> | 2014-11-18 09:28:36 +0000 |
|---|---|---|
| committer | nonaka <nonaka@NetBSD.org> | 2014-11-18 09:28:36 +0000 |
| commit | 0fb8e5bfe5117d514b6fe46a1ff3d55c2c9df968 (patch) | |
| tree | 71972f40fe624ddefca3e1964a8fac1e220be8b5 | |
| parent | 803c7a86d405efb4a38f0e7e01e7fc258fd6ccb6 (diff) | |
Use correct linebytes.
| -rw-r--r-- | sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c | 1 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/radeon/radeondrmkmsfb.c | 7 | ||||
| -rw-r--r-- | sys/external/bsd/drm2/radeon/radeondrmkmsfb.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c index 2bde60f2fac..29b2c9f99b0 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c @@ -255,6 +255,7 @@ static int radeonfb_create(struct drm_fb_helper *helper, rfa.rfa_fb_helper = helper; rfa.rfa_fb_sizes = *sizes; rfa.rfa_fb_ptr = rbo->kptr; + rfa.rfa_fb_linebytes = mode_cmd.pitches[0]; helper->fbdev = config_found_ia(rdev->ddev->dev, "radeonfbbus", &rfa, NULL); diff --git a/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c b/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c index 87ea00aca66..29e03acf163 100644 --- a/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c +++ b/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: radeondrmkmsfb.c,v 1.4 2014/11/12 16:07:17 chs Exp $ */ +/* $NetBSD: radeondrmkmsfb.c,v 1.5 2014/11/18 09:28:36 nonaka Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.4 2014/11/12 16:07:17 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.5 2014/11/18 09:28:36 nonaka Exp $"); #ifdef _KERNEL_OPT #include "vga.h" @@ -171,8 +171,7 @@ radeonfb_setconfig_task(struct radeon_task *task) prop_dictionary_set_uint32(dict, "width", sizes->fb_width); prop_dictionary_set_uint32(dict, "height", sizes->fb_height); prop_dictionary_set_uint8(dict, "depth", sizes->surface_bpp); - prop_dictionary_set_uint16(dict, "linebytes", - roundup2((sizes->fb_width * howmany(sizes->surface_bpp, 8)), 64)); + prop_dictionary_set_uint16(dict, "linebytes", rfa->rfa_fb_linebytes); prop_dictionary_set_uint32(dict, "address", 0); /* XXX >32-bit */ CTASSERT(sizeof(uintptr_t) <= sizeof(uint64_t)); prop_dictionary_set_uint64(dict, "virtual_address", diff --git a/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h b/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h index 53f1d4a76fe..a886501fdd4 100644 --- a/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h +++ b/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h @@ -1,4 +1,4 @@ -/* $NetBSD: radeondrmkmsfb.h,v 1.1 2014/07/25 12:35:03 riastradh Exp $ */ +/* $NetBSD: radeondrmkmsfb.h,v 1.2 2014/11/18 09:28:36 nonaka Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -39,6 +39,7 @@ struct radeonfb_attach_args { struct drm_fb_helper *rfa_fb_helper; struct drm_fb_helper_surface_size rfa_fb_sizes; void *rfa_fb_ptr; + uint32_t rfa_fb_linebytes; }; #endif /* _RADEON_RADEONDRMKMS_H_ */ |
