Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f91969f7 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: change definition of PANEL_WINDOW_HEIGHT fields 



Use stratight-forward defintion of PANEL_WINDOW_HEIGHT register fields and
use open-coded implementation for register manipulations

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4c221d82

drivers/staging/sm750fb/ddk750_reg.h

+3 −2
Original line number Diff line number Diff line
@@ -843,8 +843,9 @@ 
#define PANEL_WINDOW_WIDTH_X_MASK                     0xfff



#define PANEL_WINDOW_HEIGHT                           0x080018

#define PANEL_WINDOW_HEIGHT_HEIGHT                    27:16

#define PANEL_WINDOW_HEIGHT_Y                         11:0

#define PANEL_WINDOW_HEIGHT_HEIGHT_SHIFT              16

#define PANEL_WINDOW_HEIGHT_HEIGHT_MASK               (0xfff << 16)

#define PANEL_WINDOW_HEIGHT_Y_MASK                    0xfff



#define PANEL_PLANE_TL                                0x08001C

#define PANEL_PLANE_TL_TOP                            26:16

drivers/staging/sm750fb/sm750_hw.c

+5 −3
Original line number Diff line number Diff line
@@ -323,9 +323,11 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, 
		reg |= (var->xoffset & PANEL_WINDOW_WIDTH_X_MASK);

		POKE32(PANEL_WINDOW_WIDTH, reg);



		POKE32(PANEL_WINDOW_HEIGHT,

			FIELD_VALUE(0, PANEL_WINDOW_HEIGHT, HEIGHT, var->yres_virtual - 1)|

			FIELD_VALUE(0, PANEL_WINDOW_HEIGHT, Y, var->yoffset));

		reg = ((var->yres_virtual - 1) <<

		       PANEL_WINDOW_HEIGHT_HEIGHT_SHIFT);

		reg &= PANEL_WINDOW_HEIGHT_HEIGHT_MASK;

		reg |= (var->yoffset & PANEL_WINDOW_HEIGHT_Y_MASK);

		POKE32(PANEL_WINDOW_HEIGHT, reg);



		POKE32(PANEL_PLANE_TL, 0);