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

Commit 09645d25 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAPFB: remove exported udpate window 



omapfb contains an exported omapfb_update_window function, which, at
some point in history, was used by a closed source SGX driver. This was
a hack even then, and should not be needed anymore. So remove it.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent c252ea0f

drivers/video/omap2/omapfb/omapfb-ioctl.c

+3 −24
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int omapfb_query_mem(struct fb_info *fbi, struct omapfb_mem_info *mi) 
	return 0;

}



static int omapfb_update_window_nolock(struct fb_info *fbi,

static int omapfb_update_window(struct fb_info *fbi,

		u32 x, u32 y, u32 w, u32 h)

{

	struct omap_dss_device *display = fb2display(fbi);
@@ -299,27 +299,6 @@ static int omapfb_update_window_nolock(struct fb_info *fbi, 
	return display->driver->update(display, x, y, w, h);

}



/* This function is exported for SGX driver use */

int omapfb_update_window(struct fb_info *fbi,

		u32 x, u32 y, u32 w, u32 h)

{

	struct omapfb_info *ofbi = FB2OFB(fbi);

	struct omapfb2_device *fbdev = ofbi->fbdev;

	int r;



	if (!lock_fb_info(fbi))

		return -ENODEV;

	omapfb_lock(fbdev);



	r = omapfb_update_window_nolock(fbi, x, y, w, h);



	omapfb_unlock(fbdev);

	unlock_fb_info(fbi);



	return r;

}

EXPORT_SYMBOL(omapfb_update_window);



int omapfb_set_update_mode(struct fb_info *fbi,

				   enum omapfb_update_mode mode)

{
@@ -646,7 +625,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) 
			break;

		}



		r = omapfb_update_window_nolock(fbi, p.uwnd_o.x, p.uwnd_o.y,

		r = omapfb_update_window(fbi, p.uwnd_o.x, p.uwnd_o.y,

				p.uwnd_o.width, p.uwnd_o.height);

		break;
@@ -663,7 +642,7 @@ int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg) 
			break;

		}



		r = omapfb_update_window_nolock(fbi, p.uwnd.x, p.uwnd.y,

		r = omapfb_update_window(fbi, p.uwnd.x, p.uwnd.y,

				p.uwnd.width, p.uwnd.height);

		break;

drivers/video/omap2/omapfb/omapfb.h

+0 −3
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ void omapfb_remove_sysfs(struct omapfb2_device *fbdev); 


int omapfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg);



int omapfb_update_window(struct fb_info *fbi,

		u32 x, u32 y, u32 w, u32 h);



int dss_mode_to_fb_mode(enum omap_color_mode dssmode,

			struct fb_var_screeninfo *var);