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

Commit 376b3ff5 authored by Daniel Vetter's avatar Daniel Vetter Committed by Bartlomiej Zolnierkiewicz
Browse files

fbdev: Nuke FBINFO_MODULE 



Instead check info->ops->owner, which amounts to the same.

Spotted because I want to remove the pile of broken and cargo-culted
fb_info->flags assignments in drm drivers.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 6104c370

drivers/video/fbdev/core/fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, 
	unsigned short *save = NULL, *r, *q;

	int logo_height;



	if (info->flags & FBINFO_MODULE) {

	if (info->fbops->owner) {

		logo_shown = FBCON_LOGO_DONTSHOW;

		return;

	}

drivers/video/fbdev/core/fbmem.c

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int fb_show_logo_line(struct fb_info *info, int rotate, 


	/* Return if the frame buffer is not mapped or suspended */

	if (logo == NULL || info->state != FBINFO_STATE_RUNNING ||

	    info->flags & FBINFO_MODULE)

	    info->fbops->owner)

		return 0;



	image.depth = 8;
@@ -601,7 +601,7 @@ int fb_prepare_logo(struct fb_info *info, int rotate) 
	memset(&fb_logo, 0, sizeof(struct logo_data));



	if (info->flags & FBINFO_MISC_TILEBLITTING ||

	    info->flags & FBINFO_MODULE)

	    info->fbops->owner)

		return 0;



	if (info->fix.visual == FB_VISUAL_DIRECTCOLOR) {

drivers/video/fbdev/matrox/matroxfb_base.c

+1 −3
Original line number Diff line number Diff line
@@ -1794,9 +1794,7 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b) 
	minfo->fbops = matroxfb_ops;

	minfo->fbcon.fbops = &minfo->fbops;

	minfo->fbcon.pseudo_palette = minfo->cmap;

	/* after __init time we are like module... no logo */

	minfo->fbcon.flags = hotplug ? FBINFO_FLAG_MODULE : FBINFO_FLAG_DEFAULT;

	minfo->fbcon.flags |= FBINFO_PARTIAL_PAN_OK | 	 /* Prefer panning for scroll under MC viewer/edit */

	minfo->fbcon.flags = FBINFO_PARTIAL_PAN_OK | 	 /* Prefer panning for scroll under MC viewer/edit */

				      FBINFO_HWACCEL_COPYAREA |  /* We have hw-assisted bmove */

				      FBINFO_HWACCEL_FILLRECT |  /* And fillrect */

				      FBINFO_HWACCEL_IMAGEBLIT | /* And imageblit */

include/linux/fb.h

+1 −9
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ struct fb_tile_ops { 
#endif /* CONFIG_FB_TILEBLITTING */



/* FBINFO_* = fb_info.flags bit flags */

#define FBINFO_MODULE		0x0001	/* Low-level driver is a module */

#define FBINFO_DEFAULT		0

#define FBINFO_HWACCEL_DISABLED	0x0002

	/* When FBINFO_HWACCEL_DISABLED is set:

	 *  Hardware acceleration is turned off.  Software implementations
@@ -533,14 +533,6 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) { 
	return a;

}



#ifdef MODULE

#define FBINFO_DEFAULT	FBINFO_MODULE

#else

#define FBINFO_DEFAULT	0

#endif



// This will go away

#define FBINFO_FLAG_MODULE	FBINFO_MODULE

#define FBINFO_FLAG_DEFAULT	FBINFO_DEFAULT



/* This will go away