openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: sm750fb: change definition of DE_DIMENSION fields 

Use stratight-forward definition of DE_DIMENSION 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:53:59 +02:00 committed by Greg Kroah-Hartman
parent aeaab18678
commit 0fab34b5a1
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,8 +119,8 @@ int hw_fillrect(struct lynx_accel *accel,
(y & DE_DESTINATION_Y_MASK)); /* dpr4 */
write_dpr(accel, DE_DIMENSION,
FIELD_VALUE(0, DE_DIMENSION, X, width)|
FIELD_VALUE(0, DE_DIMENSION, Y_ET, height)); /* dpr8 */
((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) |
(height & DE_DIMENSION_Y_ET_MASK)); /* dpr8 */
deCtrl =
FIELD_SET(0, DE_CONTROL, STATUS, START)|
@ -261,8 +261,8 @@ unsigned int rop2) /* ROP value */
((dx << DE_DESTINATION_X_SHIFT) & DE_DESTINATION_X_MASK) |
(dy & DE_DESTINATION_Y_MASK)); /* dpr04 */
write_dpr(accel, DE_DIMENSION,
FIELD_VALUE(0, DE_DIMENSION, X, width) |
FIELD_VALUE(0, DE_DIMENSION, Y_ET, height)); /* dpr08 */
((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) |
(height & DE_DIMENSION_Y_ET_MASK)); /* dpr08 */
de_ctrl = FIELD_VALUE(0, DE_CONTROL, ROP, rop2) |
FIELD_SET(0, DE_CONTROL, ROP_SELECT, ROP2) |
@ -359,8 +359,8 @@ int hw_imageblit(struct lynx_accel *accel,
(dy & DE_DESTINATION_Y_MASK)); /* dpr04 */
write_dpr(accel, DE_DIMENSION,
FIELD_VALUE(0, DE_DIMENSION, X, width) |
FIELD_VALUE(0, DE_DIMENSION, Y_ET, height)); /* dpr08 */
((width << DE_DIMENSION_X_SHIFT) & DE_DIMENSION_X_MASK) |
(height & DE_DIMENSION_Y_ET_MASK)); /* dpr08 */
write_dpr(accel, DE_FOREGROUND, fColor);
write_dpr(accel, DE_BACKGROUND, bColor);

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

@ -34,8 +34,9 @@
#define DE_DESTINATION_Y_MASK 0xffff
#define DE_DIMENSION 0x8
#define DE_DIMENSION_X 28:16
#define DE_DIMENSION_Y_ET 15:0
#define DE_DIMENSION_X_SHIFT 16
#define DE_DIMENSION_X_MASK (0x1fff << 16)
#define DE_DIMENSION_Y_ET_MASK 0x1fff
#define DE_CONTROL 0xC
#define DE_CONTROL_STATUS 31:31