Skip to content

Commit aae4682

Browse files
author
Thomas Zimmermann
committed
drm/fbdev-generic: Convert to fbdev-ttm
Only TTM-based drivers use fbdev-generic. Rename it to fbdev-ttm and change the symbol infix from _generic_ to _ttm_. Link the source file into TTM helpers, so that it is only build if TTM-based drivers have been selected. Select DRM_TTM_HELPER for loongson. Signed-off-by: Thomas Zimmermann <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent c32705b commit aae4682

File tree

14 files changed

+77
-77
lines changed

14 files changed

+77
-77
lines changed

‎Documentation/gpu/drm-kms-helpers.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ fbdev Helper Functions Reference
116116
.. kernel-doc:: drivers/gpu/drm/drm_fb_helper.c
117117
:export:
118118

119-
.. kernel-doc:: drivers/gpu/drm/drm_fbdev_generic.c
119+
.. kernel-doc:: drivers/gpu/drm/drm_fbdev_ttm.c
120120
:export:
121121

122122
format Helper Functions Reference

‎drivers/gpu/drm/Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ drm_vram_helper-y := drm_gem_vram_helper.o
118118
obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o
119119

120120
drm_ttm_helper-y := drm_gem_ttm_helper.o
121+
drm_ttm_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_ttm.o
121122
obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o
122123

123124
#
@@ -143,9 +144,7 @@ drm_kms_helper-y := \
143144
drm_self_refresh_helper.o \
144145
drm_simple_kms_helper.o
145146
drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
146-
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += \
147-
drm_fbdev_generic.o \
148-
drm_fb_helper.o
147+
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
149148
obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
150149

151150
#

‎drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <drm/amdgpu_drm.h>
2626
#include <drm/drm_drv.h>
27-
#include <drm/drm_fbdev_generic.h>
27+
#include <drm/drm_fbdev_ttm.h>
2828
#include <drm/drm_gem.h>
2929
#include <drm/drm_managed.h>
3030
#include <drm/drm_pciids.h>
@@ -2318,9 +2318,9 @@ static int amdgpu_pci_probe(struct pci_dev *pdev,
23182318
!list_empty(&adev_to_drm(adev)->mode_config.connector_list)) {
23192319
/* select 8 bpp console on low vram cards */
23202320
if (adev->gmc.real_vram_size <= (32*1024*1024))
2321-
drm_fbdev_generic_setup(adev_to_drm(adev), 8);
2321+
drm_fbdev_ttm_setup(adev_to_drm(adev), 8);
23222322
else
2323-
drm_fbdev_generic_setup(adev_to_drm(adev), 32);
2323+
drm_fbdev_ttm_setup(adev_to_drm(adev), 32);
23242324
}
23252325

23262326
ret = amdgpu_debugfs_init(adev);

‎drivers/gpu/drm/drm_fbdev_generic.c‎ renamed to ‎drivers/gpu/drm/drm_fbdev_ttm.c‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#include <drm/drm_gem.h>
1111
#include <drm/drm_print.h>
1212

13-
#include <drm/drm_fbdev_generic.h>
13+
#include <drm/drm_fbdev_ttm.h>
1414

1515
/* @user: 1=userspace, 0=fbcon */
16-
static int drm_fbdev_generic_fb_open(struct fb_info *info, int user)
16+
static int drm_fbdev_ttm_fb_open(struct fb_info *info, int user)
1717
{
1818
struct drm_fb_helper *fb_helper = info->par;
1919

@@ -24,7 +24,7 @@ static int drm_fbdev_generic_fb_open(struct fb_info *info, int user)
2424
return 0;
2525
}
2626

27-
static int drm_fbdev_generic_fb_release(struct fb_info *info, int user)
27+
static int drm_fbdev_ttm_fb_release(struct fb_info *info, int user)
2828
{
2929
struct drm_fb_helper *fb_helper = info->par;
3030

@@ -34,11 +34,11 @@ static int drm_fbdev_generic_fb_release(struct fb_info *info, int user)
3434
return 0;
3535
}
3636

37-
FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(drm_fbdev_generic,
37+
FB_GEN_DEFAULT_DEFERRED_SYSMEM_OPS(drm_fbdev_ttm,
3838
drm_fb_helper_damage_range,
3939
drm_fb_helper_damage_area);
4040

41-
static void drm_fbdev_generic_fb_destroy(struct fb_info *info)
41+
static void drm_fbdev_ttm_fb_destroy(struct fb_info *info)
4242
{
4343
struct drm_fb_helper *fb_helper = info->par;
4444
void *shadow = info->screen_buffer;
@@ -56,19 +56,19 @@ static void drm_fbdev_generic_fb_destroy(struct fb_info *info)
5656
kfree(fb_helper);
5757
}
5858

59-
static const struct fb_ops drm_fbdev_generic_fb_ops = {
59+
static const struct fb_ops drm_fbdev_ttm_fb_ops = {
6060
.owner = THIS_MODULE,
61-
.fb_open = drm_fbdev_generic_fb_open,
62-
.fb_release = drm_fbdev_generic_fb_release,
63-
FB_DEFAULT_DEFERRED_OPS(drm_fbdev_generic),
61+
.fb_open = drm_fbdev_ttm_fb_open,
62+
.fb_release = drm_fbdev_ttm_fb_release,
63+
FB_DEFAULT_DEFERRED_OPS(drm_fbdev_ttm),
6464
DRM_FB_HELPER_DEFAULT_OPS,
65-
.fb_destroy = drm_fbdev_generic_fb_destroy,
65+
.fb_destroy = drm_fbdev_ttm_fb_destroy,
6666
};
6767

6868
/*
6969
* This function uses the client API to create a framebuffer backed by a dumb buffer.
7070
*/
71-
static int drm_fbdev_generic_helper_fb_probe(struct drm_fb_helper *fb_helper,
71+
static int drm_fbdev_ttm_helper_fb_probe(struct drm_fb_helper *fb_helper,
7272
struct drm_fb_helper_surface_size *sizes)
7373
{
7474
struct drm_client_dev *client = &fb_helper->client;
@@ -108,7 +108,7 @@ static int drm_fbdev_generic_helper_fb_probe(struct drm_fb_helper *fb_helper,
108108

109109
drm_fb_helper_fill_info(info, fb_helper, sizes);
110110

111-
info->fbops = &drm_fbdev_generic_fb_ops;
111+
info->fbops = &drm_fbdev_ttm_fb_ops;
112112

113113
/* screen */
114114
info->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST;
@@ -137,9 +137,9 @@ static int drm_fbdev_generic_helper_fb_probe(struct drm_fb_helper *fb_helper,
137137
return ret;
138138
}
139139

140-
static void drm_fbdev_generic_damage_blit_real(struct drm_fb_helper *fb_helper,
141-
struct drm_clip_rect *clip,
142-
struct iosys_map *dst)
140+
static void drm_fbdev_ttm_damage_blit_real(struct drm_fb_helper *fb_helper,
141+
struct drm_clip_rect *clip,
142+
struct iosys_map *dst)
143143
{
144144
struct drm_framebuffer *fb = fb_helper->fb;
145145
size_t offset = clip->y1 * fb->pitches[0];
@@ -176,8 +176,8 @@ static void drm_fbdev_generic_damage_blit_real(struct drm_fb_helper *fb_helper,
176176
}
177177
}
178178

179-
static int drm_fbdev_generic_damage_blit(struct drm_fb_helper *fb_helper,
180-
struct drm_clip_rect *clip)
179+
static int drm_fbdev_ttm_damage_blit(struct drm_fb_helper *fb_helper,
180+
struct drm_clip_rect *clip)
181181
{
182182
struct drm_client_buffer *buffer = fb_helper->buffer;
183183
struct iosys_map map, dst;
@@ -201,7 +201,7 @@ static int drm_fbdev_generic_damage_blit(struct drm_fb_helper *fb_helper,
201201
goto out;
202202

203203
dst = map;
204-
drm_fbdev_generic_damage_blit_real(fb_helper, clip, &dst);
204+
drm_fbdev_ttm_damage_blit_real(fb_helper, clip, &dst);
205205

206206
drm_client_buffer_vunmap_local(buffer);
207207

@@ -211,8 +211,8 @@ static int drm_fbdev_generic_damage_blit(struct drm_fb_helper *fb_helper,
211211
return ret;
212212
}
213213

214-
static int drm_fbdev_generic_helper_fb_dirty(struct drm_fb_helper *helper,
215-
struct drm_clip_rect *clip)
214+
static int drm_fbdev_ttm_helper_fb_dirty(struct drm_fb_helper *helper,
215+
struct drm_clip_rect *clip)
216216
{
217217
struct drm_device *dev = helper->dev;
218218
int ret;
@@ -221,7 +221,7 @@ static int drm_fbdev_generic_helper_fb_dirty(struct drm_fb_helper *helper,
221221
if (!(clip->x1 < clip->x2 && clip->y1 < clip->y2))
222222
return 0;
223223

224-
ret = drm_fbdev_generic_damage_blit(helper, clip);
224+
ret = drm_fbdev_ttm_damage_blit(helper, clip);
225225
if (drm_WARN_ONCE(dev, ret, "Damage blitter failed: ret=%d\n", ret))
226226
return ret;
227227

@@ -234,12 +234,12 @@ static int drm_fbdev_generic_helper_fb_dirty(struct drm_fb_helper *helper,
234234
return 0;
235235
}
236236

237-
static const struct drm_fb_helper_funcs drm_fbdev_generic_helper_funcs = {
238-
.fb_probe = drm_fbdev_generic_helper_fb_probe,
239-
.fb_dirty = drm_fbdev_generic_helper_fb_dirty,
237+
static const struct drm_fb_helper_funcs drm_fbdev_ttm_helper_funcs = {
238+
.fb_probe = drm_fbdev_ttm_helper_fb_probe,
239+
.fb_dirty = drm_fbdev_ttm_helper_fb_dirty,
240240
};
241241

242-
static void drm_fbdev_generic_client_unregister(struct drm_client_dev *client)
242+
static void drm_fbdev_ttm_client_unregister(struct drm_client_dev *client)
243243
{
244244
struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
245245

@@ -252,14 +252,14 @@ static void drm_fbdev_generic_client_unregister(struct drm_client_dev *client)
252252
}
253253
}
254254

255-
static int drm_fbdev_generic_client_restore(struct drm_client_dev *client)
255+
static int drm_fbdev_ttm_client_restore(struct drm_client_dev *client)
256256
{
257257
drm_fb_helper_lastclose(client->dev);
258258

259259
return 0;
260260
}
261261

262-
static int drm_fbdev_generic_client_hotplug(struct drm_client_dev *client)
262+
static int drm_fbdev_ttm_client_hotplug(struct drm_client_dev *client)
263263
{
264264
struct drm_fb_helper *fb_helper = drm_fb_helper_from_client(client);
265265
struct drm_device *dev = client->dev;
@@ -284,32 +284,32 @@ static int drm_fbdev_generic_client_hotplug(struct drm_client_dev *client)
284284
err_drm_fb_helper_fini:
285285
drm_fb_helper_fini(fb_helper);
286286
err_drm_err:
287-
drm_err(dev, "fbdev: Failed to setup generic emulation (ret=%d)\n", ret);
287+
drm_err(dev, "fbdev: Failed to setup emulation (ret=%d)\n", ret);
288288
return ret;
289289
}
290290

291-
static const struct drm_client_funcs drm_fbdev_generic_client_funcs = {
291+
static const struct drm_client_funcs drm_fbdev_ttm_client_funcs = {
292292
.owner = THIS_MODULE,
293-
.unregister = drm_fbdev_generic_client_unregister,
294-
.restore = drm_fbdev_generic_client_restore,
295-
.hotplug = drm_fbdev_generic_client_hotplug,
293+
.unregister = drm_fbdev_ttm_client_unregister,
294+
.restore = drm_fbdev_ttm_client_restore,
295+
.hotplug = drm_fbdev_ttm_client_hotplug,
296296
};
297297

298298
/**
299-
* drm_fbdev_generic_setup() - Setup generic fbdev emulation
299+
* drm_fbdev_ttm_setup() - Setup fbdev emulation for TTM-based drivers
300300
* @dev: DRM device
301301
* @preferred_bpp: Preferred bits per pixel for the device.
302302
*
303-
* This function sets up generic fbdev emulation for drivers that supports
303+
* This function sets up fbdev emulation for TTM-based drivers that support
304304
* dumb buffers with a virtual address and that can be mmap'ed.
305-
* drm_fbdev_generic_setup() shall be called after the DRM driver registered
305+
* drm_fbdev_ttm_setup() shall be called after the DRM driver registered
306306
* the new DRM device with drm_dev_register().
307307
*
308308
* Restore, hotplug events and teardown are all taken care of. Drivers that do
309309
* suspend/resume need to call drm_fb_helper_set_suspend_unlocked() themselves.
310310
* Simple drivers might use drm_mode_config_helper_suspend().
311311
*
312-
* In order to provide fixed mmap-able memory ranges, generic fbdev emulation
312+
* In order to provide fixed mmap-able memory ranges, fbdev emulation
313313
* uses a shadow buffer in system memory. The implementation blits the shadow
314314
* fbdev buffer onto the real buffer in regular intervals.
315315
*
@@ -318,7 +318,7 @@ static const struct drm_client_funcs drm_fbdev_generic_client_funcs = {
318318
*
319319
* The fbdev is destroyed by drm_dev_unregister().
320320
*/
321-
void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
321+
void drm_fbdev_ttm_setup(struct drm_device *dev, unsigned int preferred_bpp)
322322
{
323323
struct drm_fb_helper *fb_helper;
324324
int ret;
@@ -329,9 +329,9 @@ void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
329329
fb_helper = kzalloc(sizeof(*fb_helper), GFP_KERNEL);
330330
if (!fb_helper)
331331
return;
332-
drm_fb_helper_prepare(dev, fb_helper, preferred_bpp, &drm_fbdev_generic_helper_funcs);
332+
drm_fb_helper_prepare(dev, fb_helper, preferred_bpp, &drm_fbdev_ttm_helper_funcs);
333333

334-
ret = drm_client_init(dev, &fb_helper->client, "fbdev", &drm_fbdev_generic_client_funcs);
334+
ret = drm_client_init(dev, &fb_helper->client, "fbdev", &drm_fbdev_ttm_client_funcs);
335335
if (ret) {
336336
drm_err(dev, "Failed to register client: %d\n", ret);
337337
goto err_drm_client_init;
@@ -346,4 +346,4 @@ void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)
346346
kfree(fb_helper);
347347
return;
348348
}
349-
EXPORT_SYMBOL(drm_fbdev_generic_setup);
349+
EXPORT_SYMBOL(drm_fbdev_ttm_setup);

‎drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <drm/drm_aperture.h>
1818
#include <drm/drm_atomic_helper.h>
1919
#include <drm/drm_drv.h>
20-
#include <drm/drm_fbdev_generic.h>
20+
#include <drm/drm_fbdev_ttm.h>
2121
#include <drm/drm_gem_framebuffer_helper.h>
2222
#include <drm/drm_gem_vram_helper.h>
2323
#include <drm/drm_managed.h>
@@ -339,7 +339,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev,
339339
goto err_unload;
340340
}
341341

342-
drm_fbdev_generic_setup(dev, 32);
342+
drm_fbdev_ttm_setup(dev, 32);
343343

344344
return 0;
345345

‎drivers/gpu/drm/loongson/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ config DRM_LOONGSON
66
depends on LOONGARCH || MIPS || COMPILE_TEST
77
select DRM_KMS_HELPER
88
select DRM_TTM
9+
select DRM_TTM_HELPER
910
select I2C
1011
select I2C_ALGOBIT
1112
help

‎drivers/gpu/drm/loongson/lsdc_drv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <drm/drm_atomic.h>
1111
#include <drm/drm_atomic_helper.h>
1212
#include <drm/drm_drv.h>
13-
#include <drm/drm_fbdev_generic.h>
13+
#include <drm/drm_fbdev_ttm.h>
1414
#include <drm/drm_gem_framebuffer_helper.h>
1515
#include <drm/drm_ioctl.h>
1616
#include <drm/drm_modeset_helper.h>
@@ -314,7 +314,7 @@ static int lsdc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
314314
if (ret)
315315
return ret;
316316

317-
drm_fbdev_generic_setup(ddev, 32);
317+
drm_fbdev_ttm_setup(ddev, 32);
318318

319319
return 0;
320320
}

‎drivers/gpu/drm/nouveau/nouveau_drm.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include <drm/drm_aperture.h>
3434
#include <drm/drm_drv.h>
35-
#include <drm/drm_fbdev_generic.h>
35+
#include <drm/drm_fbdev_ttm.h>
3636
#include <drm/drm_gem_ttm_helper.h>
3737
#include <drm/drm_ioctl.h>
3838
#include <drm/drm_vblank.h>
@@ -846,9 +846,9 @@ static int nouveau_drm_probe(struct pci_dev *pdev,
846846
goto fail_drm_dev_init;
847847

848848
if (nouveau_drm(drm_dev)->client.device.info.ram_size <= 32 * 1024 * 1024)
849-
drm_fbdev_generic_setup(drm_dev, 8);
849+
drm_fbdev_ttm_setup(drm_dev, 8);
850850
else
851-
drm_fbdev_generic_setup(drm_dev, 32);
851+
drm_fbdev_ttm_setup(drm_dev, 32);
852852

853853
quirk_broken_nv_runpm(pdev);
854854
return 0;

‎drivers/gpu/drm/qxl/qxl_drv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <drm/drm_aperture.h>
3838
#include <drm/drm_atomic_helper.h>
3939
#include <drm/drm_drv.h>
40-
#include <drm/drm_fbdev_generic.h>
40+
#include <drm/drm_fbdev_ttm.h>
4141
#include <drm/drm_file.h>
4242
#include <drm/drm_gem_ttm_helper.h>
4343
#include <drm/drm_module.h>
@@ -118,7 +118,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
118118
if (ret)
119119
goto modeset_cleanup;
120120

121-
drm_fbdev_generic_setup(&qdev->ddev, 32);
121+
drm_fbdev_ttm_setup(&qdev->ddev, 32);
122122
return 0;
123123

124124
modeset_cleanup:

‎drivers/gpu/drm/tiny/bochs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <drm/drm_atomic_helper.h>
88
#include <drm/drm_drv.h>
99
#include <drm/drm_edid.h>
10-
#include <drm/drm_fbdev_generic.h>
10+
#include <drm/drm_fbdev_ttm.h>
1111
#include <drm/drm_fourcc.h>
1212
#include <drm/drm_framebuffer.h>
1313
#include <drm/drm_gem_framebuffer_helper.h>
@@ -670,7 +670,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent
670670
if (ret)
671671
goto err_hw_fini;
672672

673-
drm_fbdev_generic_setup(dev, 32);
673+
drm_fbdev_ttm_setup(dev, 32);
674674
return ret;
675675

676676
err_hw_fini:

0 commit comments

Comments
 (0)