drm: kirin: Revert change to add register connect helper functions
Subsystems (3)
PATCH 1/1 drm: kirin: Revert change to add register connect helper functions
Daniel noted[1] that commit d606dc9a6323 ("drm: kirin: Add register connect helper functions in drm init") was unnecessary and incorrect, as drm_dev_register does register connectors for us.
Thus, this patch reverts the change as suggested by Daniel.
[1]: https://lore.kernel.org/lkml/CAKMK7uHr5U-pPsxdQ4MpfK5v8iLjphDFug_3VTiUAf06nhS=yQ@mail.gmail.com/
--- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 ------------------- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 - 3 files changed, 45 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +0 -1
@@ -940,7 +940,6 @@ static struct drm_driver ade_driver = { };struct kirin_drm_data ade_driver_data = { - .register_connects = false, .num_planes =ADE_CH_NUM , .prim_plane =ADE_CH1 , .channel_formats = channel_formats,
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +0 -43
57 lines not on this page · raw message
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +0 -1
@@ -37,7 +37,6 @@ struct kirin_drm_data {u32 channel_formats_cnt;int config_max_width;int config_max_height; -bool register_connects;u32 num_planes;u32 prim_plane;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · John Stultz
Daniel noted[1] that commit
d606dc9a6323("drm: kirin: Add register connect helper functions in drm init") was unnecessary and incorrect, asdrm_dev_registerdoes register connectors for us.Thus, this patch reverts the change as suggested by Daniel.
[1]: https://lore.kernel.org/lkml/CAKMK7uHr5U-pPsxdQ4MpfK5v8iLjphDFug_3VTiUAf06nhS=yQ@mail.gmail.com/
Quoted 10 lines
Cc Xu YiPing <[email protected]>Cc Rongrong Zou <[email protected]>Cc Xinliang Liu <[email protected]>Cc Xinwei Kong <[email protected]>Cc Chen Feng <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Sam Ravnborg <[email protected]>Cc dri-devel <[email protected]>Signed-off-by John Stultz <[email protected]>
Thanks for the quick fix!
Cheers, Daniel
Quoted 96 lines
--- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 ------------------- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 - 3 files changed, 45 deletions(-)drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +0
-1@@ -940,7 +940,6 @@ static struct drm_driver ade_driver = { };struct kirin_drm_data ade_driver_data = { - .register_connects = false, .num_planes =ADE_CH_NUM , .prim_plane =ADE_CH1 , .channel_formats = channel_formats,drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +0
-43@@ -219,40 +219,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev)return 0 ; } -static int kirin_drm_connectors_register (struct drm_device *dev) -{ -struct drm_connector *connector; -struct drm_connector *failed_connector; -struct drm_connector_list_iter conn_iter; -int ret; - -mutex_lock (&dev->mode_config.mutex); -drm_connector_list_iter_begin (dev, &conn_iter); -drm_for_each_connector_iter (connector, &conn_iter) { - ret =drm_connector_register (connector); -if (ret) { - failed_connector = connector; - goto err; - } - } -drm_connector_list_iter_end (&conn_iter); -mutex_unlock (&dev->mode_config.mutex); - -return 0 ; - -err: -drm_connector_list_iter_begin (dev, &conn_iter); -drm_for_each_connector_iter (connector, &conn_iter) { -if (failed_connector == connector) -break ; -drm_connector_unregister (connector); - } -drm_connector_list_iter_end (&conn_iter); -mutex_unlock (&dev->mode_config.mutex); - -return ret; -} -static int kirin_drm_bind (struct device *dev) {struct kirin_drm_data *driver_data;@@ -279,17 +245,8 @@ static int kirin_drm_bind(struct device *dev)drm_fbdev_generic_setup (drm_dev,32 ); -/* connectors should be registered after drm device register */ -if (driver_data->register_connects) { - ret =kirin_drm_connectors_register (drm_dev); -if (ret) - goto err_drm_dev_unregister; - } -return 0 ; -err_drm_dev_unregister: -drm_dev_unregister (drm_dev); err_kms_cleanup:kirin_drm_kms_cleanup (drm_dev); err_drm_dev_put:drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +0
-1@@ -37,7 +37,6 @@ struct kirin_drm_data {u32 channel_formats_cnt;int config_max_width;int config_max_height; -bool register_connects;u32 num_planes;u32 prim_plane;Signature · 1 line
2.17.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 10 lines · John Stultz
Daniel noted[1] that commit
d606dc9a6323("drm: kirin: Add register connect helper functions in drm init") was unnecessary and incorrect, asdrm_dev_registerdoes register connectors for us.Thus, this patch reverts the change as suggested by Daniel.
[1]: https://lore.kernel.org/lkml/CAKMK7uHr5U-pPsxdQ4MpfK5v8iLjphDFug_3VTiUAf06nhS=yQ@mail.gmail.com/
Quoted 10 lines
Cc Xu YiPing <[email protected]>Cc Rongrong Zou <[email protected]>Cc Xinliang Liu <[email protected]>Cc Xinwei Kong <[email protected]>Cc Chen Feng <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Sam Ravnborg <[email protected]>Cc dri-devel <[email protected]>Signed-off-by John Stultz <[email protected]>
Thanks John for the fix.
Applied to drm-misc.
-Xinliang
Quoted 96 lines
--- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 43 ------------------- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 1 - 3 files changed, 45 deletions(-)drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +0
-1@@ -940,7 +940,6 @@ static struct drm_driver ade_driver = { };struct kirin_drm_data ade_driver_data = { - .register_connects = false, .num_planes =ADE_CH_NUM , .prim_plane =ADE_CH1 , .channel_formats = channel_formats,drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +0
-43@@ -219,40 +219,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev)return 0 ; } -static int kirin_drm_connectors_register (struct drm_device *dev) -{ -struct drm_connector *connector; -struct drm_connector *failed_connector; -struct drm_connector_list_iter conn_iter; -int ret; - -mutex_lock (&dev->mode_config.mutex); -drm_connector_list_iter_begin (dev, &conn_iter); -drm_for_each_connector_iter (connector, &conn_iter) { - ret =drm_connector_register (connector); -if (ret) { - failed_connector = connector; - goto err; - } - } -drm_connector_list_iter_end (&conn_iter); -mutex_unlock (&dev->mode_config.mutex); - -return 0 ; - -err: -drm_connector_list_iter_begin (dev, &conn_iter); -drm_for_each_connector_iter (connector, &conn_iter) { -if (failed_connector == connector) -break ; -drm_connector_unregister (connector); - } -drm_connector_list_iter_end (&conn_iter); -mutex_unlock (&dev->mode_config.mutex); - -return ret; -} -static int kirin_drm_bind (struct device *dev) {struct kirin_drm_data *driver_data;@@ -279,17 +245,8 @@ static int kirin_drm_bind(struct device *dev)drm_fbdev_generic_setup (drm_dev,32 ); -/* connectors should be registered after drm device register */ -if (driver_data->register_connects) { - ret =kirin_drm_connectors_register (drm_dev); -if (ret) - goto err_drm_dev_unregister; - } -return 0 ; -err_drm_dev_unregister: -drm_dev_unregister (drm_dev); err_kms_cleanup:kirin_drm_kms_cleanup (drm_dev); err_drm_dev_put:drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +0
-2@@ -37,7 +37,6 @@ struct kirin_drm_data {u32 channel_formats_cnt;int config_max_width;int config_max_height; -bool register_connects;u32 num_planes;u32 prim_plane; --2.17.1