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

Commit 9e754c88 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "fbdev: msm: enable compilation of fb driver"

parents 392eeb8f 3d3767e5

drivers/video/fbdev/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,20 @@ config FB_PRE_INIT_FB 
	  Select this option if display contents should be inherited as set by

	  the bootloader.



config FB_MSM

	tristate "MSM Framebuffer support"

	depends on FB && ARCH_QCOM

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select SYNC

	select SW_SYNC

	---help---

	  The MSM driver implements a frame buffer interface to

	  provide access to the display hardware and provide

	  a way for users to display graphics

	  on connected display panels.



config FB_MX3

	tristate "MX3 Framebuffer support"

	depends on FB && MX3_IPU
@@ -2448,6 +2462,7 @@ config FB_SIMPLE 
source "drivers/video/fbdev/omap/Kconfig"

source "drivers/video/fbdev/omap2/Kconfig"

source "drivers/video/fbdev/mmp/Kconfig"

source "drivers/video/fbdev/msm/Kconfig"



config FB_SH_MOBILE_MERAM

	tristate "SuperH Mobile MERAM read ahead support"

drivers/video/fbdev/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -130,6 +130,11 @@ obj-$(CONFIG_FB_HYPERV) += hyperv_fb.o 
obj-$(CONFIG_FB_OPENCORES)	  += ocfb.o

obj-$(CONFIG_FB_SM712)		  += sm712fb.o



ifeq ($(CONFIG_FB_MSM),y)

obj-y                             += msm/

else

obj-$(CONFIG_MSM_DBA)             += msm/msm_dba/

endif

# Platform or fallback drivers go here

obj-$(CONFIG_FB_UVESA)            += uvesafb.o

obj-$(CONFIG_FB_VESA)             += vesafb.o

drivers/video/fbdev/core/fbmem.c

+15 −11
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ fb_blank(struct fb_info *info, int blank) 
EXPORT_SYMBOL(fb_blank);



static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,

			unsigned long arg)

			unsigned long arg, struct file *file)

{

	struct fb_ops *fb;

	struct fb_var_screeninfo var;
@@ -1222,7 +1222,9 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd, 
		if (!lock_fb_info(info))

			return -ENODEV;

		fb = info->fbops;

		if (fb->fb_ioctl)

		if (fb->fb_ioctl_v2)

			ret = fb->fb_ioctl_v2(info, cmd, arg, file);

		else if (fb->fb_ioctl)

			ret = fb->fb_ioctl(info, cmd, arg);

		else

			ret = -ENOTTY;
@@ -1237,7 +1239,7 @@ static long fb_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	if (!info)

		return -ENODEV;

	return do_fb_ioctl(info, cmd, arg);

	return do_fb_ioctl(info, cmd, arg, file);

}



#ifdef CONFIG_COMPAT
@@ -1268,7 +1270,7 @@ struct fb_cmap32 { 
};



static int fb_getput_cmap(struct fb_info *info, unsigned int cmd,

			  unsigned long arg)

			  unsigned long arg, struct file *file)

{

	struct fb_cmap_user __user *cmap;

	struct fb_cmap32 __user *cmap32;
@@ -1291,7 +1293,7 @@ static int fb_getput_cmap(struct fb_info *info, unsigned int cmd, 
	    put_user(compat_ptr(data), &cmap->transp))

		return -EFAULT;



	err = do_fb_ioctl(info, cmd, (unsigned long) cmap);

	err = do_fb_ioctl(info, cmd, (unsigned long) cmap, file);



	if (!err) {

		if (copy_in_user(&cmap32->start,
@@ -1336,7 +1338,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix, 
}



static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,

			      unsigned long arg)

			      unsigned long arg, struct file *file)

{

	mm_segment_t old_fs;

	struct fb_fix_screeninfo fix;
@@ -1347,7 +1349,7 @@ static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd, 


	old_fs = get_fs();

	set_fs(KERNEL_DS);

	err = do_fb_ioctl(info, cmd, (unsigned long) &fix);

	err = do_fb_ioctl(info, cmd, (unsigned long) &fix, file);

	set_fs(old_fs);



	if (!err)
@@ -1374,20 +1376,22 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd, 
	case FBIOPUT_CON2FBMAP:

		arg = (unsigned long) compat_ptr(arg);

	case FBIOBLANK:

		ret = do_fb_ioctl(info, cmd, arg);

		ret = do_fb_ioctl(info, cmd, arg, file);

		break;



	case FBIOGET_FSCREENINFO:

		ret = fb_get_fscreeninfo(info, cmd, arg);

		ret = fb_get_fscreeninfo(info, cmd, arg, file);

		break;



	case FBIOGETCMAP:

	case FBIOPUTCMAP:

		ret = fb_getput_cmap(info, cmd, arg);

		ret = fb_getput_cmap(info, cmd, arg, file);

		break;



	default:

		if (fb->fb_compat_ioctl)

		if (fb->fb_compat_ioctl_v2)

			ret = fb->fb_compat_ioctl_v2(info, cmd, arg, file);

		else if (fb->fb_compat_ioctl)

			ret = fb->fb_compat_ioctl(info, cmd, arg);

		break;

	}

drivers/video/fbdev/msm/Makefile

+1 −0
Original line number Diff line number Diff line 
ccflags-y += -I$(src)



obj-$(CONFIG_FB_MSM_MDSS_MHL3) += mhl3/

obj-$(CONFIG_MSM_DBA) += msm_dba/



mdss-mdp3-objs = mdp3.o mdp3_layer.o mdp3_dma.o mdp3_ctrl.o dsi_status_v2.o

mdss-mdp3-objs += mdp3_ppp.o mdp3_ppp_hwio.o mdp3_ppp_data.o

drivers/video/fbdev/msm/mdp3.c

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <linux/msm-bus.h>

#include <linux/msm-bus-board.h>

#include <linux/qcom_iommu.h>

#include <linux/msm_iommu_domains.h>



#include <linux/msm_dma_iommu_mapping.h>