Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix CLUT index bug.

This commit is contained in:
uch 2000-05-12 18:09:55 +00:00
parent 55438ab2fb
commit f02836787f
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/hpcmips/tx/tx3912video.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tx3912video.c,v 1.13 2000/05/10 23:57:13 uch Exp $ */
/* $NetBSD: tx3912video.c,v 1.14 2000/05/12 18:09:55 uch Exp $ */
/*-
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@ -230,7 +230,8 @@ tx3912video_hpcfbinit(sc)
fb->hf_pixels_per_pack = 4;
fb->hf_pixel_width = 2;
fb->hf_class_data_length = sizeof(struct hf_gray_tag);
fb->hf_u.hf_gray.hf_flags = 0; /* reserved for future use */
/* reserved for future use */
fb->hf_u.hf_gray.hf_flags = 0;
break;
case 8:
fb->hf_class = HPCFB_CLASS_INDEXCOLOR;
@ -239,7 +240,8 @@ tx3912video_hpcfbinit(sc)
fb->hf_pixels_per_pack = 1;
fb->hf_pixel_width = 8;
fb->hf_class_data_length = sizeof(struct hf_indexed_tag);
fb->hf_u.hf_indexed.hf_flags = 0; /* reserved for future use */
/* reserved for future use */
fb->hf_u.hf_indexed.hf_flags = 0;
break;
}
}
@ -326,8 +328,8 @@ tx3912video_framebuffer_alloc(chip, fb_start, fb_end)
return (1);
/* Allocate V-RAM area */
error = extent_alloc_subregion(ex, fb_start, fb_start + size, size,
TX3912_FRAMEBUFFER_ALIGNMENT,
error = extent_alloc_subregion(ex, fb_start, fb_start + size - 1,
size, TX3912_FRAMEBUFFER_ALIGNMENT,
TX3912_FRAMEBUFFER_BOUNDARY,
EX_FAST|EX_NOWAIT, &addr);
extent_destroy(ex);
@ -510,7 +512,7 @@ tx3912video_ioctl(v, cmd, data, flag, p)
/*
* TX3912 can't change CLUT index. R:G:B = 3:3:2
*/
return (EINVAL);
return (0);
case HPCFBIO_GCONF:
fbconf = (struct hpcfb_fbconf *)data;
@ -656,8 +658,8 @@ tx3912video_clut_get(sc, rgb, beg, cnt)
KASSERT(LEGAL_CLUT_INDEX(beg));
KASSERT(LEGAL_CLUT_INDEX(beg + cnt - 1));
for (i = 0; i < cnt; i++) {
rgb[i] = RGB24(__get_color8((i >> 5) & 0x7),
for (i = beg; i < beg + cnt; i++) {
*rgb++ = RGB24(__get_color8((i >> 5) & 0x7),
__get_color8((i >> 2) & 0x7),
__get_color4(i & 0x3));
}
@ -761,6 +763,8 @@ tx3912video_clut_init(sc)
(dither_level4[2] << 8) |
(dither_level4[1] << 4) |
(dither_level4[0] << 0));
tx3912video_reset(sc->sc_chip);
}
/*

7
sys/arch/hpcmips/tx/tx3912videoreg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: tx3912videoreg.h,v 1.3 2000/05/08 21:57:58 uch Exp $ */
/* $NetBSD: tx3912videoreg.h,v 1.4 2000/05/12 18:09:56 uch Exp $ */
/*-
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@ -363,7 +363,7 @@
#define TX3912_VIDEOCTRL9_PAT2_4_DEFAULT \
DITHER_PATTERN(0, 0, 0, P1010, P0101, P1010, P0101)
#define TX3912_VIDEOCTRL10_PAT4_5_DEFAULT \
DITHER_PATTERN(0, 0, P0111, P1101, P1111, P1011, P1111)
DITHER_PATTERN(0, 0, P0111, P1101, P1111, P1011, P1110)
#define TX3912_VIDEOCTRL11_PAT3_5_DEFAULT \
DITHER_PATTERN(0, 0, P0111, P1010, P0101, P1010, P1101)
#define TX3912_VIDEOCTRL12_PAT6_7_DEFAULT \
@ -371,8 +371,9 @@
#define TX3912_VIDEOCTRL13_PAT5_7_DEFAULT \
DITHER_PATTERN(P0111, P1011, P0101, P1010, P1101, P1110, P1111)
#define TX3912_VIDEOCTRL14_PAT4_7_DEFAULT \
DITHER_PATTERN(P1011, P1001, P1101, P1101, P1100, P0110, P0011)
DITHER_PATTERN(P1011, P1001, P1101, P1100, P0110, P0110, P0011)
/* dither duty cycle : pre-dithered data nible mapping */
#define TX3912_VIDEO_DITHER_DUTYCYCLE_1 15
#define TX3912_VIDEO_DITHER_DUTYCYCLE_6_7 14
#define TX3912_VIDEO_DITHER_DUTYCYCLE_4_5 13