| Message ID | 20190322051759.15007-3-tomli@tomli.me (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | implement 2D acceleration, minor cleanups, doc updates. | expand |
On Fri, Mar 22, 2019 at 01:17:54PM +0800, Yifeng Li wrote: > This commit adds I/O macros and functions related to 2D opeartions. > A hunk of hardware register definitions are taken verbatim from > OpenBSD. > > In addition, a utility function pad_to_dword() is added to help > padding data for the 2D engine. It accepts 3, 2, or 1 byte(s) of > data, and pads it to a 32-bit word suitable for 2D Drawing Engine. > > Yes, we can set info->pixmap.scan_align/buf_align = 4 and forget > about padding, but it's incompatible with cfb_imageblit() w/ > depth == 1. In case we need to fallback (e.g. debugging), it would > be inconvenient, so we pad it manually. > > Signed-off-by: Yifeng Li <tomli@tomli.me> > --- > drivers/video/fbdev/sm712.h | 96 +++++++++++++++++++++++++++++++++++++ > 1 file changed, 96 insertions(+) > > diff --git a/drivers/video/fbdev/sm712.h b/drivers/video/fbdev/sm712.h > index 89e446db2ac7..4892fd485f08 100644 > --- a/drivers/video/fbdev/sm712.h > +++ b/drivers/video/fbdev/sm712.h > @@ -91,6 +91,102 @@ static inline u8 smtc_seqr(u8 reg) > return smtc_mmiorb(0x3c5); > } > > +/* > + * DPR (2D drawing engine) > + */ > +#define DPR_COORDS(x, y) (((x) << 16) | (y)) > + <snip> > +#define DPR_SRC_WINDOW 0x3c > +#define DPR_SRC_BASE 0x40 > +#define DPR_DST_BASE 0x44 > + > +#define DE_CTRL_START 0x80000000 > +#define DE_CTRL_RTOL 0x08000000 > +#define DE_CTRL_COMMAND_MASK 0x001f0000 > +#define DE_CTRL_COMMAND_SHIFT 16 > +#define DE_CTRL_COMMAND_BITBLT 0x00 > +#define DE_CTRL_COMMAND_SOLIDFILL 0x01 > +#define DE_CTRL_COMMAND_HOSTWRITE 0x08 > +#define DE_CTRL_ROP2_SELECT 0x00008000 > +#define DE_CTRL_ROP2_SRC_IS_PATTERN 0x00004000 > +#define DE_CTRL_ROP2_SHIFT 0 > +#define DE_CTRL_ROP2_COPY 0x0c > +#define DE_CTRL_HOST_SHIFT 22 > +#define DE_CTRL_HOST_SRC_IS_MONO 0x01 > +#define DE_CTRL_FORMAT_XY 0x00 > +#define DE_CTRL_FORMAT_24BIT 0x30 Please fix the alignment. Some of them are right aligned and some are left. -- Regards Sudip
On Sun, Mar 31, 2019 at 06:25:58PM +0100, Sudip Mukherjee wrote: > On Fri, Mar 22, 2019 at 01:17:54PM +0800, Yifeng Li wrote: > > +#define DE_CTRL_COMMAND_SHIFT 16 > > +#define DE_CTRL_COMMAND_BITBLT 0x00 > > +#define DE_CTRL_COMMAND_SOLIDFILL 0x01 > > +#define DE_CTRL_COMMAND_HOSTWRITE 0x08 > > +#define DE_CTRL_ROP2_SELECT 0x00008000 > > +#define DE_CTRL_ROP2_SRC_IS_PATTERN 0x00004000 > > +#define DE_CTRL_ROP2_SHIFT 0 > > +#define DE_CTRL_ROP2_COPY 0x0c > > +#define DE_CTRL_HOST_SHIFT 22 > > +#define DE_CTRL_HOST_SRC_IS_MONO 0x01 > > +#define DE_CTRL_FORMAT_XY 0x00 > > +#define DE_CTRL_FORMAT_24BIT 0x30 > > Please fix the alignment. Some of them are right aligned and some are left. Noted. It will be fixed in PATCH v3. Thanks, Tom Li
diff --git a/drivers/video/fbdev/sm712.h b/drivers/video/fbdev/sm712.h index 89e446db2ac7..4892fd485f08 100644 --- a/drivers/video/fbdev/sm712.h +++ b/drivers/video/fbdev/sm712.h @@ -91,6 +91,102 @@ static inline u8 smtc_seqr(u8 reg) return smtc_mmiorb(0x3c5); } +/* + * DPR (2D drawing engine) + */ +#define DPR_COORDS(x, y) (((x) << 16) | (y)) + +#define SCR_DE_STATUS 0x16 +#define SCR_DE_STATUS_MASK 0x18 +#define SCR_DE_ENGINE_IDLE 0x10 + +#define DPR_BASE 0x00408000 +#define DPR_SRC_COORDS 0x00 +#define DPR_DST_COORDS 0x04 +#define DPR_SPAN_COORDS 0x08 +#define DPR_DE_CTRL 0x0c +#define DPR_PITCH 0x10 +#define DPR_FG_COLOR 0x14 +#define DPR_BG_COLOR 0x18 +#define DPR_STRETCH 0x1c +#define DPR_DE_FORMAT_SELECT 0x1e +#define DPR_COLOR_COMPARE 0x20 +#define DPR_COLOR_COMPARE_MASK 0x24 +#define DPR_BYTE_BIT_MASK 0x28 +#define DPR_CROP_TOPLEFT_COORDS 0x2c +#define DPR_CROP_BOTRIGHT_COORDS 0x30 +#define DPR_MONO_PATTERN_LO32 0x34 +#define DPR_MONO_PATTERN_HI32 0x38 +#define DPR_SRC_WINDOW 0x3c +#define DPR_SRC_BASE 0x40 +#define DPR_DST_BASE 0x44 + +#define DE_CTRL_START 0x80000000 +#define DE_CTRL_RTOL 0x08000000 +#define DE_CTRL_COMMAND_MASK 0x001f0000 +#define DE_CTRL_COMMAND_SHIFT 16 +#define DE_CTRL_COMMAND_BITBLT 0x00 +#define DE_CTRL_COMMAND_SOLIDFILL 0x01 +#define DE_CTRL_COMMAND_HOSTWRITE 0x08 +#define DE_CTRL_ROP2_SELECT 0x00008000 +#define DE_CTRL_ROP2_SRC_IS_PATTERN 0x00004000 +#define DE_CTRL_ROP2_SHIFT 0 +#define DE_CTRL_ROP2_COPY 0x0c +#define DE_CTRL_HOST_SHIFT 22 +#define DE_CTRL_HOST_SRC_IS_MONO 0x01 +#define DE_CTRL_FORMAT_XY 0x00 +#define DE_CTRL_FORMAT_24BIT 0x30 + +/* + * 32-bit I/O for 2D opeartions. + */ +extern void __iomem *smtc_dprbaseaddress; /* DPR, 2D control registers */ + +static inline u8 smtc_dprr(u8 reg) +{ + return readl(smtc_dprbaseaddress + reg); +} + +static inline void smtc_dprw(u8 reg, u32 val) +{ + writel(val, smtc_dprbaseaddress + reg); +} + +static inline void smtc_dprw_16(u8 reg, u16 val) +{ + writew(val, smtc_dprbaseaddress + reg); +} + +static inline u32 pad_to_dword(const u8 *bytes, int length) +{ + u32 dword = 0; + + switch (length) { +#ifdef __BIG_ENDIAN + case 3: + dword |= bytes[2] << 8; + /* fallthrough */ + case 2: + dword |= bytes[1] << 16; + /* fallthrough */ + case 1: + dword |= bytes[0] << 24; + break; +#else + case 3: + dword |= bytes[2] << 16; + /* fallthrough */ + case 2: + dword |= bytes[1] << 8; + /* fallthrough */ + case 1: + dword |= bytes[0]; + break; +#endif + } + return dword; +} + /* The next structure holds all information relevant for a specific video mode. */
This commit adds I/O macros and functions related to 2D opeartions. A hunk of hardware register definitions are taken verbatim from OpenBSD. In addition, a utility function pad_to_dword() is added to help padding data for the 2D engine. It accepts 3, 2, or 1 byte(s) of data, and pads it to a 32-bit word suitable for 2D Drawing Engine. Yes, we can set info->pixmap.scan_align/buf_align = 4 and forget about padding, but it's incompatible with cfb_imageblit() w/ depth == 1. In case we need to fallback (e.g. debugging), it would be inconvenient, so we pad it manually. Signed-off-by: Yifeng Li <tomli@tomli.me> --- drivers/video/fbdev/sm712.h | 96 +++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+)