Module Name: src Committed By: jandberg Date: Wed Jul 6 14:34:13 UTC 2022
Modified Files: src/sys/arch/amiga/dev: amidisplaycc.c Log Message: Return display depth correctly from WSDISPLAYIO_GET_FBINFO. (previous workaround to always return 1 no longer needed with latest wsfb) To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/amiga/dev/amidisplaycc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/amiga/dev/amidisplaycc.c diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.39 src/sys/arch/amiga/dev/amidisplaycc.c:1.40 --- src/sys/arch/amiga/dev/amidisplaycc.c:1.39 Sun Feb 6 10:05:56 2022 +++ src/sys/arch/amiga/dev/amidisplaycc.c Wed Jul 6 14:34:13 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: amidisplaycc.c,v 1.39 2022/02/06 10:05:56 jandberg Exp $ */ +/* $NetBSD: amidisplaycc.c,v 1.40 2022/07/06 14:34:13 jandberg Exp $ */ /*- * Copyright (c) 2000 Jukka Andberg. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.39 2022/02/06 10:05:56 jandberg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.40 2022/07/06 14:34:13 jandberg Exp $"); /* * wscons interface to amiga custom chips. Contains the necessary functions @@ -1112,14 +1112,13 @@ amidisplaycc_getfbinfo(struct amidisplay bm = adp->gfxview->bitmap; KASSERT(bm); - /* Depth 1 since current X wsfb driver doesn't support multiple bitplanes */ memset(fbinfo, 0, sizeof(*fbinfo)); - fbinfo->fbi_fbsize = bm->bytes_per_row * bm->rows; + fbinfo->fbi_fbsize = bm->bytes_per_row * bm->rows * adp->gfxdepth; fbinfo->fbi_fboffset = 0; fbinfo->fbi_width = bm->bytes_per_row * 8; fbinfo->fbi_height = bm->rows; fbinfo->fbi_stride = bm->bytes_per_row; - fbinfo->fbi_bitsperpixel = 1; + fbinfo->fbi_bitsperpixel = adp->gfxdepth; fbinfo->fbi_pixeltype = WSFB_CI; fbinfo->fbi_flags = 0; fbinfo->fbi_subtype.fbi_cmapinfo.cmap_entries = 1 << adp->gfxdepth;