Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/mgag200: Rename BMC vidrst names
The BMC's scanout synchronization is only indirectly related to the
VIDRST functionality. Do some renaming.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711072415.11831-4-tzimmermann@suse.de
+20
-20
+2
-2
drivers/gpu/drm/mgag200/mgag200_bmc.c
+2
-2
drivers/gpu/drm/mgag200/mgag200_bmc.c
···
14
14
return container_of(connector, struct mgag200_bmc_connector, base);
15
15
}
16
16
17
-
void mgag200_bmc_disable_vidrst(struct mga_device *mdev)
17
+
void mgag200_bmc_stop_scanout(struct mga_device *mdev)
18
18
{
19
19
u8 tmp;
20
20
int iter_max;
···
73
73
}
74
74
}
75
75
76
-
void mgag200_bmc_enable_vidrst(struct mga_device *mdev)
76
+
void mgag200_bmc_start_scanout(struct mga_device *mdev)
77
77
{
78
78
u8 tmp;
79
79
+7
-7
drivers/gpu/drm/mgag200/mgag200_drv.h
+7
-7
drivers/gpu/drm/mgag200/mgag200_drv.h
···
216
216
*/
217
217
unsigned long max_mem_bandwidth;
218
218
219
-
/* HW has external source (e.g., BMC) to synchronize with */
220
-
bool has_vidrst:1;
219
+
/* Synchronize scanout with BMC */
220
+
bool sync_bmc:1;
221
221
222
222
struct {
223
223
unsigned data_bit:3;
···
232
232
};
233
233
234
234
#define MGAG200_DEVICE_INFO_INIT(_max_hdisplay, _max_vdisplay, _max_mem_bandwidth, \
235
-
_has_vidrst, _i2c_data_bit, _i2c_clock_bit, \
235
+
_sync_bmc, _i2c_data_bit, _i2c_clock_bit, \
236
236
_bug_no_startadd) \
237
237
{ \
238
238
.max_hdisplay = (_max_hdisplay), \
239
239
.max_vdisplay = (_max_vdisplay), \
240
240
.max_mem_bandwidth = (_max_mem_bandwidth), \
241
-
.has_vidrst = (_has_vidrst), \
241
+
.sync_bmc = (_sync_bmc), \
242
242
.i2c = { \
243
243
.data_bit = (_i2c_data_bit), \
244
244
.clock_bit = (_i2c_clock_bit), \
···
430
430
/* mgag200_vga.c */
431
431
int mgag200_vga_output_init(struct mga_device *mdev);
432
432
433
-
/* mgag200_bmc.c */
434
-
void mgag200_bmc_disable_vidrst(struct mga_device *mdev);
435
-
void mgag200_bmc_enable_vidrst(struct mga_device *mdev);
433
+
/* mgag200_bmc.c */
434
+
void mgag200_bmc_stop_scanout(struct mga_device *mdev);
435
+
void mgag200_bmc_start_scanout(struct mga_device *mdev);
436
436
int mgag200_bmc_output_init(struct mga_device *mdev, struct drm_connector *physical_connector);
437
437
438
438
#endif /* __MGAG200_DRV_H__ */
+2
-2
drivers/gpu/drm/mgag200/mgag200_g200er.c
+2
-2
drivers/gpu/drm/mgag200/mgag200_g200er.c
···
206
206
207
207
mgag200_enable_display(mdev);
208
208
209
-
if (mdev->info->has_vidrst)
210
-
mgag200_bmc_enable_vidrst(mdev);
209
+
if (mdev->info->sync_bmc)
210
+
mgag200_bmc_start_scanout(mdev);
211
211
}
212
212
213
213
static const struct drm_crtc_helper_funcs mgag200_g200er_crtc_helper_funcs = {
+2
-2
drivers/gpu/drm/mgag200/mgag200_g200ev.c
+2
-2
drivers/gpu/drm/mgag200/mgag200_g200ev.c
···
207
207
208
208
mgag200_enable_display(mdev);
209
209
210
-
if (mdev->info->has_vidrst)
211
-
mgag200_bmc_enable_vidrst(mdev);
210
+
if (mdev->info->sync_bmc)
211
+
mgag200_bmc_start_scanout(mdev);
212
212
}
213
213
214
214
static const struct drm_crtc_helper_funcs mgag200_g200ev_crtc_helper_funcs = {
+2
-2
drivers/gpu/drm/mgag200/mgag200_g200se.c
+2
-2
drivers/gpu/drm/mgag200/mgag200_g200se.c
···
338
338
339
339
mgag200_enable_display(mdev);
340
340
341
-
if (mdev->info->has_vidrst)
342
-
mgag200_bmc_enable_vidrst(mdev);
341
+
if (mdev->info->sync_bmc)
342
+
mgag200_bmc_start_scanout(mdev);
343
343
}
344
344
345
345
static const struct drm_crtc_helper_funcs mgag200_g200se_crtc_helper_funcs = {
+5
-5
drivers/gpu/drm/mgag200/mgag200_mode.c
+5
-5
drivers/gpu/drm/mgag200/mgag200_mode.c
···
608
608
if (ret)
609
609
return ret;
610
610
611
-
new_mgag200_crtc_state->set_vidrst = mdev->info->has_vidrst;
611
+
new_mgag200_crtc_state->set_vidrst = mdev->info->sync_bmc;
612
612
613
613
if (new_crtc_state->mode_changed) {
614
614
if (funcs->pixpllc_atomic_check) {
···
668
668
669
669
mgag200_enable_display(mdev);
670
670
671
-
if (mdev->info->has_vidrst)
672
-
mgag200_bmc_enable_vidrst(mdev);
671
+
if (mdev->info->sync_bmc)
672
+
mgag200_bmc_start_scanout(mdev);
673
673
}
674
674
675
675
void mgag200_crtc_helper_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *old_state)
676
676
{
677
677
struct mga_device *mdev = to_mga_device(crtc->dev);
678
678
679
-
if (mdev->info->has_vidrst)
680
-
mgag200_bmc_disable_vidrst(mdev);
679
+
if (mdev->info->sync_bmc)
680
+
mgag200_bmc_stop_scanout(mdev);
681
681
682
682
mgag200_disable_display(mdev);
683
683
}