Module Name: src
Committed By: martin
Date: Fri Nov 28 10:03:03 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_fb.c
src/sys/external/bsd/drm2/radeon [netbsd-7]: radeondrmkmsfb.c
radeondrmkmsfb.h
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #272):
sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c: revision 1.5
sys/external/bsd/drm2/radeon/radeondrmkmsfb.h: revision 1.2
sys/external/bsd/drm2/radeon/radeondrmkmsfb.c: revision 1.5
Use correct linebytes.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
cvs rdiff -u -r1.1 -r1.1.4.1 \
src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4.4.1
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4 Sat Jul 26 06:37:53 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Fri Nov 28 10:03:03 2014
@@ -255,6 +255,7 @@ static int radeonfb_create(struct drm_fb
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);
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.3 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.3.4.1
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.3 Sat Jul 26 07:02:13 2014
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Fri Nov 28 10:03:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.3 2014/07/26 07:02:13 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.3.4.1 2014/11/28 10:03:03 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.3 2014/07/26 07:02:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeondrmkmsfb.c,v 1.3.4.1 2014/11/28 10:03:03 martin Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -165,8 +165,7 @@ radeonfb_setconfig_task(struct radeon_ta
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",
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.1 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.1.4.1
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.1 Fri Jul 25 12:35:03 2014
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h Fri Nov 28 10:03:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.h,v 1.1 2014/07/25 12:35:03 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.h,v 1.1.4.1 2014/11/28 10:03:03 martin 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_ */
