Commit e1923ab3 authored by Daniel Vetter's avatar Daniel Vetter

drm/<drivers>: Drop fbdev info flags

- FBINFO_CAN_FORCE_OUTPUT has been a lie ever since we nerfed&removed
  the entire panic handling code in our fbdev emulation. We might
  restore kms panic output, but not through the bazillion of legacy
  code layers called fbdev/fbcon, there's just no way to make that
  work safely.

- With the module check change FBINFO_DEFAULT is always 0, so can be
  removed too.

That removes another change to cargo-cult stuff in kms drivers, yay!
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170706125735.28299-5-daniel.vetter@ffwll.chSigned-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 060f33b7
...@@ -245,7 +245,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, ...@@ -245,7 +245,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper,
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &amdgpufb_ops; info->fbops = &amdgpufb_ops;
tmp = amdgpu_bo_gpu_offset(abo) - adev->mc.vram_start; tmp = amdgpu_bo_gpu_offset(abo) - adev->mc.vram_start;
......
...@@ -81,7 +81,6 @@ static int armada_fb_create(struct drm_fb_helper *fbh, ...@@ -81,7 +81,6 @@ static int armada_fb_create(struct drm_fb_helper *fbh,
strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id)); strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id));
info->par = fbh; info->par = fbh;
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &armada_fb_ops; info->fbops = &armada_fb_ops;
info->fix.smem_start = obj->phys_addr; info->fix.smem_start = obj->phys_addr;
info->fix.smem_len = obj->obj.size; info->fix.smem_len = obj->obj.size;
......
...@@ -231,7 +231,6 @@ static int astfb_create(struct drm_fb_helper *helper, ...@@ -231,7 +231,6 @@ static int astfb_create(struct drm_fb_helper *helper,
strcpy(info->fix.id, "astdrmfb"); strcpy(info->fix.id, "astdrmfb");
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &astfb_ops; info->fbops = &astfb_ops;
info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
......
...@@ -118,7 +118,6 @@ static int bochsfb_create(struct drm_fb_helper *helper, ...@@ -118,7 +118,6 @@ static int bochsfb_create(struct drm_fb_helper *helper,
strcpy(info->fix.id, "bochsdrmfb"); strcpy(info->fix.id, "bochsdrmfb");
info->flags = FBINFO_DEFAULT;
info->fbops = &bochsfb_ops; info->fbops = &bochsfb_ops;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
......
...@@ -215,7 +215,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper, ...@@ -215,7 +215,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
strcpy(info->fix.id, "cirrusdrmfb"); strcpy(info->fix.id, "cirrusdrmfb");
info->flags = FBINFO_DEFAULT;
info->fbops = &cirrusfb_ops; info->fbops = &cirrusfb_ops;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
......
...@@ -131,7 +131,6 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, ...@@ -131,7 +131,6 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper,
strcpy(info->fix.id, "hibmcdrmfb"); strcpy(info->fix.id, "hibmcdrmfb");
info->flags = FBINFO_DEFAULT;
info->fbops = &hibmc_drm_fb_ops; info->fbops = &hibmc_drm_fb_ops;
drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0], drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0],
......
...@@ -232,7 +232,6 @@ static int intelfb_create(struct drm_fb_helper *helper, ...@@ -232,7 +232,6 @@ static int intelfb_create(struct drm_fb_helper *helper,
strcpy(info->fix.id, "inteldrmfb"); strcpy(info->fix.id, "inteldrmfb");
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &intelfb_ops; info->fbops = &intelfb_ops;
/* setup aperture base/size for vesafb takeover */ /* setup aperture base/size for vesafb takeover */
......
...@@ -210,7 +210,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, ...@@ -210,7 +210,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper,
strcpy(info->fix.id, "mgadrmfb"); strcpy(info->fix.id, "mgadrmfb");
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &mgag200fb_ops; info->fbops = &mgag200fb_ops;
/* setup aperture base/size for vesafb takeover */ /* setup aperture base/size for vesafb takeover */
......
...@@ -143,7 +143,6 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, ...@@ -143,7 +143,6 @@ static int msm_fbdev_create(struct drm_fb_helper *helper,
helper->fb = fb; helper->fb = fb;
fbi->par = helper; fbi->par = helper;
fbi->flags = FBINFO_DEFAULT;
fbi->fbops = &msm_fb_ops; fbi->fbops = &msm_fb_ops;
strcpy(fbi->fix.id, "msm"); strcpy(fbi->fix.id, "msm");
......
...@@ -184,7 +184,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, ...@@ -184,7 +184,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper,
helper->fb = fb; helper->fb = fb;
fbi->par = helper; fbi->par = helper;
fbi->flags = FBINFO_DEFAULT;
fbi->fbops = &omap_fb_ops; fbi->fbops = &omap_fb_ops;
strcpy(fbi->fix.id, MODULE_NAME); strcpy(fbi->fix.id, MODULE_NAME);
......
...@@ -275,7 +275,6 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev, ...@@ -275,7 +275,6 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev,
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
info->flags = FBINFO_DEFAULT;
info->fbops = &qxlfb_ops; info->fbops = &qxlfb_ops;
/* /*
......
...@@ -264,7 +264,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, ...@@ -264,7 +264,6 @@ static int radeonfb_create(struct drm_fb_helper *helper,
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &radeonfb_ops; info->fbops = &radeonfb_ops;
tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start; tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start;
......
...@@ -393,7 +393,6 @@ static int udlfb_create(struct drm_fb_helper *helper, ...@@ -393,7 +393,6 @@ static int udlfb_create(struct drm_fb_helper *helper,
info->fix.smem_len = size; info->fix.smem_len = size;
info->fix.smem_start = (unsigned long)ufbdev->ufb.obj->vmapping; info->fix.smem_start = (unsigned long)ufbdev->ufb.obj->vmapping;
info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
info->fbops = &udlfb_ops; info->fbops = &udlfb_ops;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
drm_fb_helper_fill_var(info, &ufbdev->helper, sizes->fb_width, sizes->fb_height); drm_fb_helper_fill_var(info, &ufbdev->helper, sizes->fb_width, sizes->fb_height);
......
...@@ -273,7 +273,6 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, ...@@ -273,7 +273,6 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
vfbdev->helper.fb = fb; vfbdev->helper.fb = fb;
strcpy(info->fix.id, "virtiodrmfb"); strcpy(info->fix.id, "virtiodrmfb");
info->flags = FBINFO_DEFAULT;
info->fbops = &virtio_gpufb_ops; info->fbops = &virtio_gpufb_ops;
info->pixmap.flags = FB_PIXMAP_SYSTEM; info->pixmap.flags = FB_PIXMAP_SYSTEM;
......
...@@ -779,7 +779,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv) ...@@ -779,7 +779,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv)
info->screen_base = (char __iomem *)par->vmalloc; info->screen_base = (char __iomem *)par->vmalloc;
info->screen_size = fb_size; info->screen_size = fb_size;
info->flags = FBINFO_DEFAULT;
info->fbops = &vmw_fb_ops; info->fbops = &vmw_fb_ops;
/* 24 depth per default */ /* 24 depth per default */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment