fbdev: c2p - Rename c2p to c2p_planar (2eab7ff8) · Commits · 戴 / test

drivers/video/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ obj-$(CONFIG_FB_DDC) += fb_ddc.o
		obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o

		# Hardware specific drivers go first
		obj-$(CONFIG_FB_AMIGA) += amifb.o c2p.o
		obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o
		obj-$(CONFIG_FB_ARC) += arcfb.o
		obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o
		obj-$(CONFIG_FB_CYBER2000) += cyber2000fb.o

+3 −3

Original line number	Diff line number	Diff line
		@@ -2159,9 +2159,9 @@ static void amifb_imageblit(struct fb_info info, const struct fb_image image)
		src += pitch;
		}
		} else {
		c2p(info->screen_base, image->data, dx, dy, width, height,
		par->next_line, par->next_plane, image->width,
		info->var.bits_per_pixel);
		c2p_planar(info->screen_base, image->data, dx, dy, width,
		height, par->next_line, par->next_plane,
		image->width, info->var.bits_per_pixel);
		}
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@

		#include <linux/types.h>

		extern void c2p(void dst, const void src, u32 dx, u32 dy, u32 width,
		extern void c2p_planar(void dst, const void src, u32 dx, u32 dy, u32 width,
		u32 height, u32 dst_nextline, u32 dst_nextplane,
		u32 src_nextline, u32 bpp);

+5 −4

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ static inline void store_planar_masked(void *dst, u32 dst_inc, u32 bpp,


		/*
		* c2p - Copy 8-bit chunky image data to a planar frame buffer
		* c2p_planar - Copy 8-bit chunky image data to a planar frame buffer
		* @dst: Starting address of the planar frame buffer
		* @dx: Horizontal destination offset (in pixels)
		* @dy: Vertical destination offset (in pixels)
		@@ -83,8 +83,9 @@ static inline void store_planar_masked(void *dst, u32 dst_inc, u32 bpp,
		* @bpp: Bits per pixel of the planar frame buffer (1-8)
		*/

		void c2p(void dst, const void src, u32 dx, u32 dy, u32 width, u32 height,
		u32 dst_nextline, u32 dst_nextplane, u32 src_nextline, u32 bpp)
		void c2p_planar(void dst, const void src, u32 dx, u32 dy, u32 width,
		u32 height, u32 dst_nextline, u32 dst_nextplane,
		u32 src_nextline, u32 bpp)
		{
		union {
		u8 pixels[32];
		@@ -150,6 +151,6 @@ void c2p(void dst, const void src, u32 dx, u32 dy, u32 width, u32 height,
		dst += dst_nextline;
		}
		}
		EXPORT_SYMBOL_GPL(c2p);
		EXPORT_SYMBOL_GPL(c2p_planar);

		MODULE_LICENSE("GPL");