From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Daniel Vetter <daniel.vetter@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Subject: [PATCH] fbdev: Nuke FBINFO_MODULE Date: Tue, 11 Jul 2017 09:26:53 +0000 [thread overview] Message-ID: <20170711092653.28065-1-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20170706125735.28299-3-daniel.vetter@ffwll.ch> 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. v2: Fixup matrox (reported by kbuild). Also nuke FBINFO_FLAG_* defines that I've failed to spot. Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: linux-fbdev@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/core/fbmem.c | 4 ++-- drivers/video/fbdev/matrox/matroxfb_base.c | 4 +--- include/linux/fb.h | 11 +---------- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 86b3bcbd01a8..431a1533a2fe 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -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; } diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 283d57cf8526..2636f192e8c9 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -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) { diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c index 11eb094396ae..15b412b4b783 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.c +++ b/drivers/video/fbdev/matrox/matroxfb_base.c @@ -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 */ diff --git a/include/linux/fb.h b/include/linux/fb.h index a964d076b4dc..4c021b6dc384 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -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,15 +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 * fbset currently hacks in FB_ACCELF_TEXT into var.accel_flags -- 2.13.2
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: Daniel Vetter <daniel.vetter@intel.com>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Subject: [PATCH] fbdev: Nuke FBINFO_MODULE Date: Tue, 11 Jul 2017 11:26:53 +0200 [thread overview] Message-ID: <20170711092653.28065-1-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20170706125735.28299-3-daniel.vetter@ffwll.ch> 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. v2: Fixup matrox (reported by kbuild). Also nuke FBINFO_FLAG_* defines that I've failed to spot. Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Cc: linux-fbdev@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/video/fbdev/core/fbcon.c | 2 +- drivers/video/fbdev/core/fbmem.c | 4 ++-- drivers/video/fbdev/matrox/matroxfb_base.c | 4 +--- include/linux/fb.h | 11 +---------- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 86b3bcbd01a8..431a1533a2fe 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -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; } diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 283d57cf8526..2636f192e8c9 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -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) { diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c index 11eb094396ae..15b412b4b783 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.c +++ b/drivers/video/fbdev/matrox/matroxfb_base.c @@ -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 */ diff --git a/include/linux/fb.h b/include/linux/fb.h index a964d076b4dc..4c021b6dc384 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -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,15 +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 * fbset currently hacks in FB_ACCELF_TEXT into var.accel_flags -- 2.13.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-07-11 9:26 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-06 12:57 [PATCH 0/4] Make fbcon a built-time depency for fbdev, take 2 Daniel Vetter 2017-07-06 12:57 ` Daniel Vetter 2017-07-06 12:57 ` [PATCH 1/4] fbcon: Make fbcon a built-time depency for fbdev Daniel Vetter 2017-07-06 12:57 ` Daniel Vetter 2017-07-12 10:40 ` Bartlomiej Zolnierkiewicz 2017-07-12 10:40 ` Bartlomiej Zolnierkiewicz [not found] ` <CGME20170801154317epcas2p1e0f43ea1e060a6b4c7ab0e77ae1f3bda@epcas2p1.samsung.com> 2017-08-01 15:43 ` Bartlomiej Zolnierkiewicz 2017-08-01 15:43 ` Bartlomiej Zolnierkiewicz 2017-07-13 14:47 ` Sean Paul 2017-07-13 14:47 ` Sean Paul 2017-07-13 18:49 ` Daniel Vetter 2017-07-13 18:49 ` Daniel Vetter 2017-07-06 12:57 ` [PATCH 2/4] fbdev: Nuke FBINFO_MODULE Daniel Vetter 2017-07-06 12:57 ` Daniel Vetter 2017-07-11 9:26 ` Daniel Vetter [this message] 2017-07-11 9:26 ` [PATCH] " Daniel Vetter 2017-07-11 14:52 ` Daniel Vetter 2017-07-11 14:52 ` Daniel Vetter 2017-07-12 10:41 ` Bartlomiej Zolnierkiewicz 2017-07-12 10:41 ` Bartlomiej Zolnierkiewicz 2017-07-12 12:42 ` Daniel Vetter 2017-07-12 12:42 ` Daniel Vetter [not found] ` <CGME20170712125413epcas5p31b162be09cc3f0a27f84ad14b2938921@epcas5p3.samsung.com> 2017-07-12 12:54 ` Bartlomiej Zolnierkiewicz 2017-07-12 12:54 ` Bartlomiej Zolnierkiewicz 2017-07-12 15:07 ` Daniel Vetter 2017-07-12 15:07 ` Daniel Vetter [not found] ` <CGME20170713140159epcas1p4e02936e9873df84d3b56498a09692886@epcas1p4.samsung.com> 2017-07-13 14:01 ` Bartlomiej Zolnierkiewicz 2017-07-13 14:01 ` Bartlomiej Zolnierkiewicz [not found] ` <CGME20170801154325epcas1p2af41ab0f0c9040074622b0627a679ba5@epcas1p2.samsung.com> 2017-08-01 15:43 ` Bartlomiej Zolnierkiewicz 2017-08-01 15:43 ` Bartlomiej Zolnierkiewicz 2017-07-13 14:50 ` Sean Paul 2017-07-13 14:50 ` Sean Paul 2017-07-06 12:57 ` [PATCH 3/4] drm/qxl: Drop fbdev hwaccel flags Daniel Vetter 2017-07-06 12:57 ` Daniel Vetter 2017-07-19 7:39 ` Daniel Vetter 2017-07-19 7:39 ` Daniel Vetter 2017-07-19 7:39 ` Daniel Vetter 2017-07-06 12:57 ` [PATCH 4/4] drm/<drivers>: Drop fbdev info flags Daniel Vetter 2017-07-06 12:57 ` Daniel Vetter 2017-07-13 14:52 ` Sean Paul 2017-07-13 14:52 ` Sean Paul 2017-07-06 15:20 ` ✓ Fi.CI.BAT: success for Make fbcon a built-time depency for fbdev, take 2 Patchwork 2017-07-11 9:31 ` ✗ Fi.CI.BAT: failure for Make fbcon a built-time depency for fbdev, take 2 (rev2) Patchwork 2017-07-11 15:26 ` ✗ Fi.CI.BAT: failure for Make fbcon a built-time depency for fbdev, take 2 (rev3) Patchwork 2017-07-07 23:21 [Intel-gfx] [PATCH 2/4] fbdev: Nuke FBINFO_MODULE kbuild test robot 2017-07-07 23:21 ` kbuild test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170711092653.28065-1-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=b.zolnierkie@samsung.com \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=linux-fbdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.