lxfb: clean up register definitions
- Rename various bitfield defines to match the data sheet names. - Rename DF_ register definitions to VP_ to match the data sheet; ie, DF_PAR -> VP_PAR. - for GP/DC registers, rather than defining to specific addresses, use an enum to number them sequentially and just multiply by 4 (bytes) to access them (in read_*/write_* functions). - for VP/FP registers, use an enum and multiple by 8 (bytes). They're 64bit registers. Signed-off-by: Andres Salomon <dilinger@debian.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Jordan Crouse <jordan.crouse@amd.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andres Salomon
کامیت شده توسط
Linus Torvalds
Linus Torvalds
والد
9286361bea
کامیت
f5c90e85dc
@@ -54,181 +54,342 @@ void lx_set_palette_reg(struct fb_info *, unsigned int, unsigned int,
|
||||
#define DC_SPARE_PIX8_PAN_FIX 0x00000010
|
||||
#define DC_SPARE_FIRST_REQ_MASK 0x00000002
|
||||
|
||||
/* Registers */
|
||||
|
||||
#define DC_UNLOCK 0x00
|
||||
#define DC_UNLOCK_CODE 0x4758
|
||||
/* Graphics Processor registers (table 6-29 from the data book) */
|
||||
enum gp_registers {
|
||||
GP_DST_OFFSET = 0,
|
||||
GP_SRC_OFFSET,
|
||||
GP_STRIDE,
|
||||
GP_WID_HEIGHT,
|
||||
|
||||
#define DC_GENERAL_CFG 0x04
|
||||
#define DC_GCFG_DFLE (1 << 0)
|
||||
#define DC_GCFG_VIDE (1 << 3)
|
||||
#define DC_GCFG_VGAE (1 << 7)
|
||||
#define DC_GCFG_CMPE (1 << 5)
|
||||
#define DC_GCFG_DECE (1 << 6)
|
||||
#define DC_GCFG_FDTY (1 << 17)
|
||||
GP_SRC_COLOR_FG,
|
||||
GP_SRC_COLOR_BG,
|
||||
GP_PAT_COLOR_0,
|
||||
GP_PAT_COLOR_1,
|
||||
|
||||
#define DC_DISPLAY_CFG 0x08
|
||||
#define DC_DCFG_TGEN (1 << 0)
|
||||
#define DC_DCFG_GDEN (1 << 3)
|
||||
#define DC_DCFG_VDEN (1 << 4)
|
||||
#define DC_DCFG_TRUP (1 << 6)
|
||||
#define DC_DCFG_DCEN (1 << 24)
|
||||
#define DC_DCFG_PALB (1 << 25)
|
||||
#define DC_DCFG_VISL (1 << 27)
|
||||
GP_PAT_COLOR_2,
|
||||
GP_PAT_COLOR_3,
|
||||
GP_PAT_COLOR_4,
|
||||
GP_PAT_COLOR_5,
|
||||
|
||||
#define DC_DCFG_16BPP 0x0
|
||||
GP_PAT_DATA_0,
|
||||
GP_PAT_DATA_1,
|
||||
GP_RASTER_MODE,
|
||||
GP_VECTOR_MODE,
|
||||
|
||||
#define DC_DCFG_DISP_MODE_MASK 0x00000300
|
||||
#define DC_DCFG_DISP_MODE_8BPP 0x00000000
|
||||
#define DC_DCFG_DISP_MODE_16BPP 0x00000100
|
||||
#define DC_DCFG_DISP_MODE_24BPP 0x00000200
|
||||
#define DC_DCFG_DISP_MODE_32BPP 0x00000300
|
||||
GP_BLT_MODE,
|
||||
GP_BLT_STATUS,
|
||||
GP_HST_SRC,
|
||||
GP_BASE_OFFSET,
|
||||
|
||||
GP_CMD_TOP,
|
||||
GP_CMD_BOT,
|
||||
GP_CMD_READ,
|
||||
GP_CMD_WRITE,
|
||||
|
||||
GP_CH3_OFFSET,
|
||||
GP_CH3_MODE_STR,
|
||||
GP_CH3_WIDHI,
|
||||
GP_CH3_HSRC,
|
||||
|
||||
GP_LUT_INDEX,
|
||||
GP_LUT_DATA,
|
||||
GP_INT_CNTRL, /* 0x78 */
|
||||
};
|
||||
|
||||
#define GP_BLT_STATUS_CE (1 << 4) /* cmd buf empty */
|
||||
#define GP_BLT_STATUS_PB (1 << 0) /* primative busy */
|
||||
|
||||
|
||||
#define DC_ARB_CFG 0x0C
|
||||
/* Display Controller registers (table 6-47 from the data book) */
|
||||
enum dc_registers {
|
||||
DC_UNLOCK = 0,
|
||||
DC_GENERAL_CFG,
|
||||
DC_DISPLAY_CFG,
|
||||
DC_ARB_CFG,
|
||||
|
||||
#define DC_FB_START 0x10
|
||||
#define DC_CB_START 0x14
|
||||
#define DC_CURSOR_START 0x18
|
||||
DC_FB_ST_OFFSET,
|
||||
DC_CB_ST_OFFSET,
|
||||
DC_CURS_ST_OFFSET,
|
||||
DC_RSVD_0,
|
||||
|
||||
#define DC_DV_TOP 0x2C
|
||||
#define DC_DV_TOP_ENABLE (1 << 0)
|
||||
DC_VID_Y_ST_OFFSET,
|
||||
DC_VID_U_ST_OFFSET,
|
||||
DC_VID_V_ST_OFFSET,
|
||||
DC_DV_TOP,
|
||||
|
||||
#define DC_LINE_SIZE 0x30
|
||||
#define DC_GRAPHICS_PITCH 0x34
|
||||
#define DC_H_ACTIVE_TIMING 0x40
|
||||
#define DC_H_BLANK_TIMING 0x44
|
||||
#define DC_H_SYNC_TIMING 0x48
|
||||
#define DC_V_ACTIVE_TIMING 0x50
|
||||
#define DC_V_BLANK_TIMING 0x54
|
||||
#define DC_V_SYNC_TIMING 0x58
|
||||
#define DC_FB_ACTIVE 0x5C
|
||||
DC_LINE_SIZE,
|
||||
DC_GFX_PITCH,
|
||||
DC_VID_YUV_PITCH,
|
||||
DC_RSVD_1,
|
||||
|
||||
#define DC_PAL_ADDRESS 0x70
|
||||
#define DC_PAL_DATA 0x74
|
||||
DC_H_ACTIVE_TIMING,
|
||||
DC_H_BLANK_TIMING,
|
||||
DC_H_SYNC_TIMING,
|
||||
DC_RSVD_2,
|
||||
|
||||
#define DC_PHY_MEM_OFFSET 0x84
|
||||
DC_V_ACTIVE_TIMING,
|
||||
DC_V_BLANK_TIMING,
|
||||
DC_V_SYNC_TIMING,
|
||||
DC_FB_ACTIVE,
|
||||
|
||||
#define DC_DV_CTL 0x88
|
||||
#define DC_DV_LINE_SIZE_MASK 0x00000C00
|
||||
#define DC_DV_LINE_SIZE_1024 0x00000000
|
||||
#define DC_DV_LINE_SIZE_2048 0x00000400
|
||||
#define DC_DV_LINE_SIZE_4096 0x00000800
|
||||
#define DC_DV_LINE_SIZE_8192 0x00000C00
|
||||
DC_CURSOR_X,
|
||||
DC_CURSOR_Y,
|
||||
DC_RSVD_3,
|
||||
DC_LINE_CNT,
|
||||
|
||||
DC_PAL_ADDRESS,
|
||||
DC_PAL_DATA,
|
||||
DC_DFIFO_DIAG,
|
||||
DC_CFIFO_DIAG,
|
||||
|
||||
DC_VID_DS_DELTA,
|
||||
DC_GLIU0_MEM_OFFSET,
|
||||
DC_DV_CTL,
|
||||
DC_DV_ACCESS,
|
||||
|
||||
DC_GFX_SCALE,
|
||||
DC_IRQ_FILT_CTL,
|
||||
DC_FILT_COEFF1,
|
||||
DC_FILT_COEFF2,
|
||||
|
||||
DC_VBI_EVEN_CTL,
|
||||
DC_VBI_ODD_CTL,
|
||||
DC_VBI_HOR,
|
||||
DC_VBI_LN_ODD,
|
||||
|
||||
DC_VBI_LN_EVEN,
|
||||
DC_VBI_PITCH,
|
||||
DC_CLR_KEY,
|
||||
DC_CLR_KEY_MASK,
|
||||
|
||||
DC_CLR_KEY_X,
|
||||
DC_CLR_KEY_Y,
|
||||
DC_IRQ,
|
||||
DC_RSVD_4,
|
||||
|
||||
DC_RSVD_5,
|
||||
DC_GENLK_CTL,
|
||||
DC_VID_EVEN_Y_ST_OFFSET,
|
||||
DC_VID_EVEN_U_ST_OFFSET,
|
||||
|
||||
DC_VID_EVEN_V_ST_OFFSET,
|
||||
DC_V_ACTIVE_EVEN_TIMING,
|
||||
DC_V_BLANK_EVEN_TIMING,
|
||||
DC_V_SYNC_EVEN_TIMING, /* 0xec */
|
||||
};
|
||||
|
||||
#define DC_UNLOCK_LOCK 0x00000000
|
||||
#define DC_UNLOCK_UNLOCK 0x00004758 /* magic value */
|
||||
|
||||
#define DC_GENERAL_CFG_FDTY (1 << 17)
|
||||
#define DC_GENERAL_CFG_DFHPEL_SHIFT (12)
|
||||
#define DC_GENERAL_CFG_DFHPSL_SHIFT (8)
|
||||
#define DC_GENERAL_CFG_VGAE (1 << 7)
|
||||
#define DC_GENERAL_CFG_DECE (1 << 6)
|
||||
#define DC_GENERAL_CFG_CMPE (1 << 5)
|
||||
#define DC_GENERAL_CFG_VIDE (1 << 3)
|
||||
#define DC_GENERAL_CFG_DFLE (1 << 0)
|
||||
|
||||
#define DC_DISPLAY_CFG_VISL (1 << 27)
|
||||
#define DC_DISPLAY_CFG_PALB (1 << 25)
|
||||
#define DC_DISPLAY_CFG_DCEN (1 << 24)
|
||||
#define DC_DISPLAY_CFG_DISP_MODE_24BPP (1 << 9)
|
||||
#define DC_DISPLAY_CFG_DISP_MODE_16BPP (1 << 8)
|
||||
#define DC_DISPLAY_CFG_DISP_MODE_8BPP (0)
|
||||
#define DC_DISPLAY_CFG_TRUP (1 << 6)
|
||||
#define DC_DISPLAY_CFG_VDEN (1 << 4)
|
||||
#define DC_DISPLAY_CFG_GDEN (1 << 3)
|
||||
#define DC_DISPLAY_CFG_TGEN (1 << 0)
|
||||
|
||||
#define DC_DV_TOP_DV_TOP_EN (1 << 0)
|
||||
|
||||
#define DC_DV_CTL_DV_LINE_SIZE ((1 << 10) | (1 << 11))
|
||||
#define DC_DV_CTL_DV_LINE_SIZE_1K (0)
|
||||
#define DC_DV_CTL_DV_LINE_SIZE_2K (1 << 10)
|
||||
#define DC_DV_CTL_DV_LINE_SIZE_4K (1 << 11)
|
||||
#define DC_DV_CTL_DV_LINE_SIZE_8K ((1 << 10) | (1 << 11))
|
||||
|
||||
#define DC_CLR_KEY_CLR_KEY_EN (1 << 24)
|
||||
|
||||
#define DC_IRQ_VIP_VSYNC_IRQ_STATUS (1 << 21) /* undocumented? */
|
||||
#define DC_IRQ_STATUS (1 << 20) /* undocumented? */
|
||||
#define DC_IRQ_VIP_VSYNC_LOSS_IRQ_MASK (1 << 1)
|
||||
#define DC_IRQ_MASK (1 << 0)
|
||||
|
||||
#define DC_GENLK_CTL_FLICK_SEL_MASK (0x0F << 28)
|
||||
#define DC_GENLK_CTL_ALPHA_FLICK_EN (1 << 25)
|
||||
#define DC_GENLK_CTL_FLICK_EN (1 << 24)
|
||||
#define DC_GENLK_CTL_GENLK_EN (1 << 18)
|
||||
|
||||
|
||||
#define DC_GFX_SCALE 0x90
|
||||
#define DC_IRQ_FILT_CTL 0x94
|
||||
/*
|
||||
* Video Processor registers (table 6-71).
|
||||
* There is space for 64 bit values, but we never use more than the
|
||||
* lower 32 bits. The actual register save/restore code only bothers
|
||||
* to restore those 32 bits.
|
||||
*/
|
||||
enum vp_registers {
|
||||
VP_VCFG = 0,
|
||||
VP_DCFG,
|
||||
|
||||
VP_VX,
|
||||
VP_VY,
|
||||
|
||||
VP_SCL,
|
||||
VP_VCK,
|
||||
|
||||
VP_VCM,
|
||||
VP_PAR,
|
||||
|
||||
VP_PDR,
|
||||
VP_SLR,
|
||||
|
||||
VP_MISC,
|
||||
VP_CCS,
|
||||
|
||||
VP_VYS,
|
||||
VP_VXS,
|
||||
|
||||
VP_RSVD_0,
|
||||
VP_VDC,
|
||||
|
||||
VP_RSVD_1,
|
||||
VP_CRC,
|
||||
|
||||
VP_CRC32,
|
||||
VP_VDE,
|
||||
|
||||
VP_CCK,
|
||||
VP_CCM,
|
||||
|
||||
VP_CC1,
|
||||
VP_CC2,
|
||||
|
||||
VP_A1X,
|
||||
VP_A1Y,
|
||||
|
||||
VP_A1C,
|
||||
VP_A1T,
|
||||
|
||||
VP_A2X,
|
||||
VP_A2Y,
|
||||
|
||||
VP_A2C,
|
||||
VP_A2T,
|
||||
|
||||
VP_A3X,
|
||||
VP_A3Y,
|
||||
|
||||
VP_A3C,
|
||||
VP_A3T,
|
||||
|
||||
VP_VRR,
|
||||
VP_AWT,
|
||||
|
||||
VP_VTM,
|
||||
VP_VYE,
|
||||
|
||||
VP_A1YE,
|
||||
VP_A2YE,
|
||||
|
||||
VP_A3YE, /* 0x150 */
|
||||
};
|
||||
|
||||
#define VP_VCFG_VID_EN (1 << 0)
|
||||
|
||||
#define VP_DCFG_GV_GAM (1 << 21)
|
||||
#define VP_DCFG_PWR_SEQ_DELAY ((1 << 17) | (1 << 18) | (1 << 19))
|
||||
#define VP_DCFG_PWR_SEQ_DELAY_DEFAULT (1 << 19) /* undocumented */
|
||||
#define VP_DCFG_CRT_SYNC_SKW ((1 << 14) | (1 << 15) | (1 << 16))
|
||||
#define VP_DCFG_CRT_SYNC_SKW_DEFAULT (1 << 16)
|
||||
#define VP_DCFG_CRT_VSYNC_POL (1 << 9)
|
||||
#define VP_DCFG_CRT_HSYNC_POL (1 << 8)
|
||||
#define VP_DCFG_DAC_BL_EN (1 << 3)
|
||||
#define VP_DCFG_VSYNC_EN (1 << 2)
|
||||
#define VP_DCFG_HSYNC_EN (1 << 1)
|
||||
#define VP_DCFG_CRT_EN (1 << 0)
|
||||
|
||||
#define VP_MISC_APWRDN (1 << 11)
|
||||
#define VP_MISC_DACPWRDN (1 << 10)
|
||||
#define VP_MISC_BYP_BOTH (1 << 0)
|
||||
|
||||
|
||||
#define DC_IRQ 0xC8
|
||||
#define DC_IRQ_MASK (1 << 0)
|
||||
#define DC_VSYNC_IRQ_MASK (1 << 1)
|
||||
#define DC_IRQ_STATUS (1 << 20)
|
||||
#define DC_VSYNC_IRQ_STATUS (1 << 21)
|
||||
/*
|
||||
* Flat Panel registers (table 6-71).
|
||||
* Also 64 bit registers; see above note about 32-bit handling.
|
||||
*/
|
||||
|
||||
#define DC_GENLCK_CTRL 0xD4
|
||||
#define DC_GENLCK_ENABLE (1 << 18)
|
||||
#define DC_GC_ALPHA_FLICK_ENABLE (1 << 25)
|
||||
#define DC_GC_FLICKER_FILTER_ENABLE (1 << 24)
|
||||
#define DC_GC_FLICKER_FILTER_MASK (0x0F << 28)
|
||||
/* we're actually in the VP register space, starting at address 0x400 */
|
||||
#define VP_FP_START 0x400
|
||||
|
||||
#define DC_COLOR_KEY 0xB8
|
||||
#define DC_CLR_KEY_ENABLE (1 << 24)
|
||||
enum fp_registers {
|
||||
FP_PT1 = 0,
|
||||
FP_PT2,
|
||||
|
||||
FP_PM,
|
||||
FP_DFC,
|
||||
|
||||
#define DC3_DV_LINE_SIZE_MASK 0x00000C00
|
||||
#define DC3_DV_LINE_SIZE_1024 0x00000000
|
||||
#define DC3_DV_LINE_SIZE_2048 0x00000400
|
||||
#define DC3_DV_LINE_SIZE_4096 0x00000800
|
||||
#define DC3_DV_LINE_SIZE_8192 0x00000C00
|
||||
FP_RSVD_0,
|
||||
FP_RSVD_1,
|
||||
|
||||
#define DF_VIDEO_CFG 0x0
|
||||
#define DF_VCFG_VID_EN (1 << 0)
|
||||
FP_RSVD_2,
|
||||
FP_RSVD_3,
|
||||
|
||||
#define DF_DISPLAY_CFG 0x08
|
||||
FP_RSVD_4,
|
||||
FP_DCA,
|
||||
|
||||
#define DF_DCFG_CRT_EN (1 << 0)
|
||||
#define DF_DCFG_HSYNC_EN (1 << 1)
|
||||
#define DF_DCFG_VSYNC_EN (1 << 2)
|
||||
#define DF_DCFG_DAC_BL_EN (1 << 3)
|
||||
#define DF_DCFG_CRT_HSYNC_POL (1 << 8)
|
||||
#define DF_DCFG_CRT_VSYNC_POL (1 << 9)
|
||||
#define DF_DCFG_GV_PAL_BYP (1 << 21)
|
||||
FP_DMD,
|
||||
FP_CRC, /* 0x458 */
|
||||
};
|
||||
|
||||
#define DF_DCFG_CRT_SYNC_SKW_INIT 0x10000
|
||||
#define DF_DCFG_CRT_SYNC_SKW_MASK 0x1c000
|
||||
#define FP_PT2_SCRC (1 << 27) /* shfclk free */
|
||||
|
||||
#define DF_DCFG_PWR_SEQ_DLY_INIT 0x80000
|
||||
#define DF_DCFG_PWR_SEQ_DLY_MASK 0xe0000
|
||||
#define FP_PM_P (1 << 24) /* panel power ctl */
|
||||
|
||||
#define DF_MISC 0x50
|
||||
|
||||
#define DF_MISC_GAM_BYPASS (1 << 0)
|
||||
#define DF_MISC_DAC_PWRDN (1 << 10)
|
||||
#define DF_MISC_A_PWRDN (1 << 11)
|
||||
|
||||
#define DF_PAR 0x38
|
||||
#define DF_PDR 0x40
|
||||
#define DF_ALPHA_CONTROL_1 0xD8
|
||||
#define DF_VIDEO_REQUEST 0x120
|
||||
|
||||
#define DF_PANEL_TIM1 0x400
|
||||
#define DF_DEFAULT_TFT_PMTIM1 0x0
|
||||
|
||||
#define DF_PANEL_TIM2 0x408
|
||||
#define DF_DEFAULT_TFT_PMTIM2 0x08000000
|
||||
|
||||
#define DF_FP_PM 0x410
|
||||
#define DF_FP_PM_P (1 << 24)
|
||||
|
||||
#define DF_DITHER_CONTROL 0x418
|
||||
#define DF_DEFAULT_TFT_DITHCTL 0x00000070
|
||||
#define GP_BLT_STATUS 0x44
|
||||
#define GP_BS_BLT_BUSY (1 << 0)
|
||||
#define GP_BS_CB_EMPTY (1 << 4)
|
||||
#define FP_DFC_BC ((1 << 4) | (1 << 5) | (1 << 6))
|
||||
|
||||
|
||||
/* register access functions */
|
||||
|
||||
static inline uint32_t read_gp(struct lxfb_par *par, int reg)
|
||||
{
|
||||
return readl(par->gp_regs + reg);
|
||||
return readl(par->gp_regs + 4*reg);
|
||||
}
|
||||
|
||||
static inline void write_gp(struct lxfb_par *par, int reg, uint32_t val)
|
||||
{
|
||||
writel(val, par->gp_regs + reg);
|
||||
writel(val, par->gp_regs + 4*reg);
|
||||
}
|
||||
|
||||
static inline uint32_t read_dc(struct lxfb_par *par, int reg)
|
||||
{
|
||||
return readl(par->dc_regs + reg);
|
||||
return readl(par->dc_regs + 4*reg);
|
||||
}
|
||||
|
||||
static inline void write_dc(struct lxfb_par *par, int reg, uint32_t val)
|
||||
{
|
||||
writel(val, par->dc_regs + reg);
|
||||
writel(val, par->dc_regs + 4*reg);
|
||||
}
|
||||
|
||||
static inline uint32_t read_vp(struct lxfb_par *par, int reg)
|
||||
{
|
||||
return readl(par->df_regs + reg);
|
||||
return readl(par->df_regs + 8*reg);
|
||||
}
|
||||
|
||||
static inline void write_vp(struct lxfb_par *par, int reg, uint32_t val)
|
||||
{
|
||||
writel(val, par->df_regs + reg);
|
||||
writel(val, par->df_regs + 8*reg);
|
||||
}
|
||||
|
||||
static inline uint32_t read_fp(struct lxfb_par *par, int reg)
|
||||
{
|
||||
return readl(par->df_regs + reg);
|
||||
return readl(par->df_regs + 8*reg + VP_FP_START);
|
||||
}
|
||||
|
||||
static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val)
|
||||
{
|
||||
writel(val, par->df_regs + reg);
|
||||
writel(val, par->df_regs + 8*reg + VP_FP_START);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
مرجع در شماره جدید
Block a user