leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: sm750fb: change definition of DE_STRETCH_FORMAT fields

Browse Source 
Use stratight-forward definition of DE_STRETCH_FORMAT register fields
and use open-coded implementation for register manipulation

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2016-02-15 19:54:02 +02:00 committed by Greg Kroah-Hartman
parent 7124080feb
commit f7a61fde48
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/sm750fb/sm750_accel.c
View File

@ -41,20 +41,16 @@ void hw_de_init(struct lynx_accel *accel)
write_dpr(accel, DE_MASKS, 0xFFFFFFFF);
/* dpr1c */
reg = FIELD_SET(0, DE_STRETCH_FORMAT, PATTERN_XY, NORMAL)|
FIELD_VALUE(0, DE_STRETCH_FORMAT, PATTERN_Y, 0)|
FIELD_VALUE(0, DE_STRETCH_FORMAT, PATTERN_X, 0)|
FIELD_SET(0, DE_STRETCH_FORMAT, ADDRESSING, XY)|
FIELD_VALUE(0, DE_STRETCH_FORMAT, SOURCE_HEIGHT, 3);
reg = 0x3;
clr = FIELD_CLEAR(DE_STRETCH_FORMAT, PATTERN_XY)&
FIELD_CLEAR(DE_STRETCH_FORMAT, PATTERN_Y)&
FIELD_CLEAR(DE_STRETCH_FORMAT, PATTERN_X)&
FIELD_CLEAR(DE_STRETCH_FORMAT, ADDRESSING)&
FIELD_CLEAR(DE_STRETCH_FORMAT, SOURCE_HEIGHT);
clr = DE_STRETCH_FORMAT_PATTERN_XY | DE_STRETCH_FORMAT_PATTERN_Y_MASK |
DE_STRETCH_FORMAT_PATTERN_X_MASK |
DE_STRETCH_FORMAT_ADDRESSING_MASK |
DE_STRETCH_FORMAT_SOURCE_HEIGHT_MASK;
/* DE_STRETCH bpp format need be initialized in setMode routine */
write_dpr(accel, DE_STRETCH_FORMAT, (read_dpr(accel, DE_STRETCH_FORMAT) & clr) | reg);
write_dpr(accel, DE_STRETCH_FORMAT,
(read_dpr(accel, DE_STRETCH_FORMAT) & ~clr) | reg);
/* disable clipping and transparent */
write_dpr(accel, DE_CLIP_TL, 0); /* dpr2c */
@ -80,7 +76,9 @@ void hw_set2dformat(struct lynx_accel *accel, int fmt)
/* fmt=0,1,2 for 8,16,32,bpp on sm718/750/502 */
reg = read_dpr(accel, DE_STRETCH_FORMAT);
reg = FIELD_VALUE(reg, DE_STRETCH_FORMAT, PIXEL_FORMAT, fmt);
reg &= ~DE_STRETCH_FORMAT_PIXEL_FORMAT_MASK;
reg |= ((fmt << DE_STRETCH_FORMAT_PIXEL_FORMAT_SHIFT) &
DE_STRETCH_FORMAT_PIXEL_FORMAT_MASK);
write_dpr(accel, DE_STRETCH_FORMAT, reg);
}

31
drivers/staging/sm750fb/sm750_accel.h
View File

@ -109,21 +109,22 @@
#define DE_BACKGROUND_COLOR 31:0
#define DE_STRETCH_FORMAT 0x00001C
#define DE_STRETCH_FORMAT_PATTERN_XY 30:30
#define DE_STRETCH_FORMAT_PATTERN_XY_NORMAL 0
#define DE_STRETCH_FORMAT_PATTERN_XY_OVERWRITE 1
#define DE_STRETCH_FORMAT_PATTERN_Y 29:27
#define DE_STRETCH_FORMAT_PATTERN_X 25:23
#define DE_STRETCH_FORMAT_PIXEL_FORMAT 21:20
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_8 0
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_16 1
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_32 2
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_24 3
#define DE_STRETCH_FORMAT_ADDRESSING 19:16
#define DE_STRETCH_FORMAT_ADDRESSING_XY 0
#define DE_STRETCH_FORMAT_ADDRESSING_LINEAR 15
#define DE_STRETCH_FORMAT_SOURCE_HEIGHT 11:0
#define DE_STRETCH_FORMAT_PATTERN_XY BIT(30)
#define DE_STRETCH_FORMAT_PATTERN_Y_SHIFT 27
#define DE_STRETCH_FORMAT_PATTERN_Y_MASK (0x7 << 27)
#define DE_STRETCH_FORMAT_PATTERN_X_SHIFT 23
#define DE_STRETCH_FORMAT_PATTERN_X_MASK (0x7 << 23)
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_SHIFT 20
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_MASK (0x3 << 20)
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_8 (0x0 << 20)
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_16 (0x1 << 20)
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_32 (0x2 << 20)
#define DE_STRETCH_FORMAT_PIXEL_FORMAT_24 (0x3 << 20)
#define DE_STRETCH_FORMAT_ADDRESSING_SHIFT 16
#define DE_STRETCH_FORMAT_ADDRESSING_MASK (0xf << 16)
#define DE_STRETCH_FORMAT_ADDRESSING_XY (0x0 << 16)
#define DE_STRETCH_FORMAT_ADDRESSING_LINEAR (0xf << 16)
#define DE_STRETCH_FORMAT_SOURCE_HEIGHT_MASK 0xfff
#define DE_COLOR_COMPARE 0x000020
#define DE_COLOR_COMPARE_COLOR 23:0