diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-06 08:57:35 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-07-26 07:22:40 -0400 |
commit | e1923ab3d01ef600dbde84ee29822980e816ee79 (patch) | |
tree | 761db1c50294beb5dfb84e109d748621aadfff6f /drivers/gpu/drm | |
parent | 060f33b7170c0438ec2f57847418b50ddfc100be (diff) |
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: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170706125735.28299-5-daniel.vetter@ffwll.ch
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/armada/armada_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/ast/ast_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/bochs/bochs_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/udl/udl_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 |
15 files changed, 0 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index c0d8c6ff6380..1c57fefc364c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | |||
@@ -245,7 +245,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, | |||
245 | 245 | ||
246 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 246 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
247 | 247 | ||
248 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
249 | info->fbops = &amdgpufb_ops; | 248 | info->fbops = &amdgpufb_ops; |
250 | 249 | ||
251 | tmp = amdgpu_bo_gpu_offset(abo) - adev->mc.vram_start; | 250 | tmp = amdgpu_bo_gpu_offset(abo) - adev->mc.vram_start; |
diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index 602dfead8eef..5b479b0ed06c 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c | |||
@@ -81,7 +81,6 @@ static int armada_fb_create(struct drm_fb_helper *fbh, | |||
81 | 81 | ||
82 | strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id)); | 82 | strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id)); |
83 | info->par = fbh; | 83 | info->par = fbh; |
84 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
85 | info->fbops = &armada_fb_ops; | 84 | info->fbops = &armada_fb_ops; |
86 | info->fix.smem_start = obj->phys_addr; | 85 | info->fix.smem_start = obj->phys_addr; |
87 | info->fix.smem_len = obj->obj.size; | 86 | info->fix.smem_len = obj->obj.size; |
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c index 4ad4acd0ccab..53ca6d099234 100644 --- a/drivers/gpu/drm/ast/ast_fb.c +++ b/drivers/gpu/drm/ast/ast_fb.c | |||
@@ -231,7 +231,6 @@ static int astfb_create(struct drm_fb_helper *helper, | |||
231 | 231 | ||
232 | strcpy(info->fix.id, "astdrmfb"); | 232 | strcpy(info->fix.id, "astdrmfb"); |
233 | 233 | ||
234 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
235 | info->fbops = &astfb_ops; | 234 | info->fbops = &astfb_ops; |
236 | 235 | ||
237 | info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); | 236 | info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0); |
diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c index 49d5a2b7d630..14eb8d0d5a00 100644 --- a/drivers/gpu/drm/bochs/bochs_fbdev.c +++ b/drivers/gpu/drm/bochs/bochs_fbdev.c | |||
@@ -118,7 +118,6 @@ static int bochsfb_create(struct drm_fb_helper *helper, | |||
118 | 118 | ||
119 | strcpy(info->fix.id, "bochsdrmfb"); | 119 | strcpy(info->fix.id, "bochsdrmfb"); |
120 | 120 | ||
121 | info->flags = FBINFO_DEFAULT; | ||
122 | info->fbops = &bochsfb_ops; | 121 | info->fbops = &bochsfb_ops; |
123 | 122 | ||
124 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 123 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c index 7fa58eeadc9d..c69586163d92 100644 --- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c | |||
@@ -215,7 +215,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper, | |||
215 | 215 | ||
216 | strcpy(info->fix.id, "cirrusdrmfb"); | 216 | strcpy(info->fix.id, "cirrusdrmfb"); |
217 | 217 | ||
218 | info->flags = FBINFO_DEFAULT; | ||
219 | info->fbops = &cirrusfb_ops; | 218 | info->fbops = &cirrusfb_ops; |
220 | 219 | ||
221 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 220 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c index f5ac80daeef2..9740eed9231a 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | |||
@@ -131,7 +131,6 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, | |||
131 | 131 | ||
132 | strcpy(info->fix.id, "hibmcdrmfb"); | 132 | strcpy(info->fix.id, "hibmcdrmfb"); |
133 | 133 | ||
134 | info->flags = FBINFO_DEFAULT; | ||
135 | info->fbops = &hibmc_drm_fb_ops; | 134 | info->fbops = &hibmc_drm_fb_ops; |
136 | 135 | ||
137 | drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0], | 136 | drm_fb_helper_fill_fix(info, hi_fbdev->fb->fb.pitches[0], |
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index 460ca0b3fb88..ec6198040381 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c | |||
@@ -232,7 +232,6 @@ static int intelfb_create(struct drm_fb_helper *helper, | |||
232 | 232 | ||
233 | strcpy(info->fix.id, "inteldrmfb"); | 233 | strcpy(info->fix.id, "inteldrmfb"); |
234 | 234 | ||
235 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
236 | info->fbops = &intelfb_ops; | 235 | info->fbops = &intelfb_ops; |
237 | 236 | ||
238 | /* setup aperture base/size for vesafb takeover */ | 237 | /* setup aperture base/size for vesafb takeover */ |
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 5d3b1fac906f..e94d78a32fe0 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c | |||
@@ -210,7 +210,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, | |||
210 | 210 | ||
211 | strcpy(info->fix.id, "mgadrmfb"); | 211 | strcpy(info->fix.id, "mgadrmfb"); |
212 | 212 | ||
213 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
214 | info->fbops = &mgag200fb_ops; | 213 | info->fbops = &mgag200fb_ops; |
215 | 214 | ||
216 | /* setup aperture base/size for vesafb takeover */ | 215 | /* setup aperture base/size for vesafb takeover */ |
diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c index 5ecf4ff9a059..9c00fedfc741 100644 --- a/drivers/gpu/drm/msm/msm_fbdev.c +++ b/drivers/gpu/drm/msm/msm_fbdev.c | |||
@@ -143,7 +143,6 @@ static int msm_fbdev_create(struct drm_fb_helper *helper, | |||
143 | helper->fb = fb; | 143 | helper->fb = fb; |
144 | 144 | ||
145 | fbi->par = helper; | 145 | fbi->par = helper; |
146 | fbi->flags = FBINFO_DEFAULT; | ||
147 | fbi->fbops = &msm_fb_ops; | 146 | fbi->fbops = &msm_fb_ops; |
148 | 147 | ||
149 | strcpy(fbi->fix.id, "msm"); | 148 | strcpy(fbi->fix.id, "msm"); |
diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c index daf81a0a2899..9273118040b7 100644 --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c | |||
@@ -184,7 +184,6 @@ static int omap_fbdev_create(struct drm_fb_helper *helper, | |||
184 | helper->fb = fb; | 184 | helper->fb = fb; |
185 | 185 | ||
186 | fbi->par = helper; | 186 | fbi->par = helper; |
187 | fbi->flags = FBINFO_DEFAULT; | ||
188 | fbi->fbops = &omap_fb_ops; | 187 | fbi->fbops = &omap_fb_ops; |
189 | 188 | ||
190 | strcpy(fbi->fix.id, MODULE_NAME); | 189 | strcpy(fbi->fix.id, MODULE_NAME); |
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 69e7359b562a..844c4a31ca13 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c | |||
@@ -275,7 +275,6 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev, | |||
275 | 275 | ||
276 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 276 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
277 | 277 | ||
278 | info->flags = FBINFO_DEFAULT; | ||
279 | info->fbops = &qxlfb_ops; | 278 | info->fbops = &qxlfb_ops; |
280 | 279 | ||
281 | /* | 280 | /* |
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 356ad90a5238..e141fcd5e8e1 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -264,7 +264,6 @@ static int radeonfb_create(struct drm_fb_helper *helper, | |||
264 | 264 | ||
265 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 265 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
266 | 266 | ||
267 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
268 | info->fbops = &radeonfb_ops; | 267 | info->fbops = &radeonfb_ops; |
269 | 268 | ||
270 | tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start; | 269 | tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start; |
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index 4a6500362564..a5c54dc60def 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c | |||
@@ -393,7 +393,6 @@ static int udlfb_create(struct drm_fb_helper *helper, | |||
393 | info->fix.smem_len = size; | 393 | info->fix.smem_len = size; |
394 | info->fix.smem_start = (unsigned long)ufbdev->ufb.obj->vmapping; | 394 | info->fix.smem_start = (unsigned long)ufbdev->ufb.obj->vmapping; |
395 | 395 | ||
396 | info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT; | ||
397 | info->fbops = &udlfb_ops; | 396 | info->fbops = &udlfb_ops; |
398 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); | 397 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); |
399 | drm_fb_helper_fill_var(info, &ufbdev->helper, sizes->fb_width, sizes->fb_height); | 398 | drm_fb_helper_fill_var(info, &ufbdev->helper, sizes->fb_width, sizes->fb_height); |
diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c index 33df067b11c1..046e28b69d99 100644 --- a/drivers/gpu/drm/virtio/virtgpu_fb.c +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c | |||
@@ -273,7 +273,6 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, | |||
273 | vfbdev->helper.fb = fb; | 273 | vfbdev->helper.fb = fb; |
274 | 274 | ||
275 | strcpy(info->fix.id, "virtiodrmfb"); | 275 | strcpy(info->fix.id, "virtiodrmfb"); |
276 | info->flags = FBINFO_DEFAULT; | ||
277 | info->fbops = &virtio_gpufb_ops; | 276 | info->fbops = &virtio_gpufb_ops; |
278 | info->pixmap.flags = FB_PIXMAP_SYSTEM; | 277 | info->pixmap.flags = FB_PIXMAP_SYSTEM; |
279 | 278 | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 6f4cb4678cbc..d23a18aae476 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
@@ -779,7 +779,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv) | |||
779 | info->screen_base = (char __iomem *)par->vmalloc; | 779 | info->screen_base = (char __iomem *)par->vmalloc; |
780 | info->screen_size = fb_size; | 780 | info->screen_size = fb_size; |
781 | 781 | ||
782 | info->flags = FBINFO_DEFAULT; | ||
783 | info->fbops = &vmw_fb_ops; | 782 | info->fbops = &vmw_fb_ops; |
784 | 783 | ||
785 | /* 24 depth per default */ | 784 | /* 24 depth per default */ |