drm/ast: Convert to managed initialization
Subsystems (3)
Thomas Zimmermann
maintainerv2 cover drm/ast: Convert to managed initialization
This is the next patchset for converting ast to managed initialization. For v2 of the series, I moved the I2C patches into a separate patchset. This resolves a mid-series problem wrt to releasing I2C. The rest of the patches are unchanged (except for a rebase).
Patches #1 to #6 address modesetting and device structures. All are being embedded into struct ast_private. With struct ast_private being a subclass of struct drm_device, patch #6 switches ast to DRM's managed- allocation helpers.
Patches #7 and #8 address firmware memory that ast allocates internally.
Finally, patch #9 removes ast's destroy function in favor of managed release helpers.
Tested on AST 2100 HW.
v2:
* removed I2C patches from series
Thomas Zimmermann (9):
drm/ast: Embed CRTC and connector in struct ast_private drm/ast: Separate DRM driver from PCI code
drm/ast: Replace driver load/unload functions with device
create/destroy
drm/ast: Replace struct_drm_device.dev_private with to_ast_private() drm/ast: Don't use ast->dev if dev is available
drm/ast: Embed struct drm_device in struct ast_private drm/ast: Managed release of ast firmware
drm/ast: Manage release of firmware backup memory drm/ast: Managed device release
drivers/gpu/drm/ast/ast_cursor.c | 8 ++-- drivers/gpu/drm/ast/ast_dp501.c | 23 +++++---- drivers/gpu/drm/ast/ast_drv.c | 82 ++++++++++++++------------------ drivers/gpu/drm/ast/ast_drv.h | 43 +++++++++-------- drivers/gpu/drm/ast/ast_main.c | 74 ++++++++++++++-------------- drivers/gpu/drm/ast/ast_mm.c | 2 +- drivers/gpu/drm/ast/ast_mode.c | 40 ++++------------ drivers/gpu/drm/ast/ast_post.c | 6 +-- 8 files changed, 130 insertions(+), 148 deletions(-)
--
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 1/9 drm/ast: Embed CRTC and connector in struct ast_private
Only single instances of CRTC and connector are supported per device. Embed both in ast's structure and remove the individual memory allocations. DRM's CRTC cleanup helpers replace the rsp. destroy function in ast.
While at it, also convert to_ast_connector() to a function.
--- drivers/gpu/drm/ast/ast_drv.h | 33 +++++++++++++++++++-------------- drivers/gpu/drm/ast/ast_mode.c | 34 +++++++--------------------------- 2 files changed, 26 insertions(+), 41 deletions(-)
drivers/gpu/drm/ast/ast_drv.h +19 -14
@@ -98,6 +98,22 @@ enum ast_tx_chip {#define AST_HWC_SIGNATURE_HOTSPOTX 0x14#define AST_HWC_SIGNATURE_HOTSPOTY 0x18 +struct ast_i2c_chan { +struct i2c_adapter adapter; +struct drm_device *dev; +struct i2c_algo_bit_data bit; +}; + +struct ast_connector { +struct drm_connector base; +struct ast_i2c_chan *i2c; +}; + +static inline struct ast_connector * +to_ast_connector (struct drm_connector *connector) +{ + return container_of(connector, struct ast_connector, base); +}struct ast_private {struct drm_device *dev;
@@ -119,9 +135,11 @@ struct ast_private {unsigned int next_index; } cursor; -struct drm_encoder encoder;struct drm_plane primary_plane;struct drm_plane cursor_plane; +struct drm_crtc crtc; +struct drm_encoder encoder; +struct ast_connector connector;bool support_wide_screen;enum {
@@ -226,19 +244,6 @@ static inline void ast_open_key(struct ast_private *ast)#define AST_VIDMEM_DEFAULT_SIZE AST_VIDMEM_SIZE_8M -struct ast_i2c_chan { -struct i2c_adapter adapter; -struct drm_device *dev; -struct i2c_algo_bit_data bit; -}; - -struct ast_connector { -struct drm_connector base; -struct ast_i2c_chan *i2c; -}; - -#define to_ast_connector (x) container_of(x, struct ast_connector, base) -struct ast_vbios_stdtable {u8 misc;u8 seq[4 ];
drivers/gpu/drm/ast/ast_mode.c +7 -27
@@ -831,12 +831,6 @@ static void ast_crtc_reset(struct drm_crtc *crtc)__drm_atomic_helper_crtc_reset (crtc, &ast_state->base); } -static void ast_crtc_destroy (struct drm_crtc *crtc) -{ -drm_crtc_cleanup (crtc); -kfree (crtc); -} -static struct drm_crtc_state *ast_crtc_atomic_duplicate_state (struct drm_crtc *crtc) {
@@ -872,7 +866,7 @@ static void ast_crtc_atomic_destroy_state(struct drm_crtc *crtc,static const struct drm_crtc_funcs ast_crtc_funcs = { .reset = ast_crtc_reset, .gamma_set = drm_atomic_helper_legacy_gamma_set, - .destroy = ast_crtc_destroy, + .destroy = drm_crtc_cleanup, .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = ast_crtc_atomic_duplicate_state,
@@ -882,27 +876,19 @@ static const struct drm_crtc_funcs ast_crtc_funcs = {static int ast_crtc_init (struct drm_device *dev) {struct ast_private *ast =to_ast_private (dev); -struct drm_crtc *crtc; +struct drm_crtc *crtc = &ast->crtc;int ret; - crtc =kzalloc (sizeof (*crtc),GFP_KERNEL ); -if (!crtc) -return -ENOMEM ; - ret =drm_crtc_init_with_planes (dev, crtc, &ast->primary_plane, &ast->cursor_plane, &ast_crtc_funcs,NULL );if (ret) - goto err_kfree; +return ret;drm_mode_crtc_set_gamma_size (crtc,256 );drm_crtc_helper_add (crtc, &ast_crtc_helper_funcs);return 0 ; - -err_kfree: -kfree (crtc); -return ret; }/*
@@ -1021,7 +1007,6 @@ static void ast_connector_destroy(struct drm_connector *connector)struct ast_connector *ast_connector =to_ast_connector (connector);ast_i2c_destroy (ast_connector->i2c);drm_connector_cleanup (connector); -kfree (connector); }static const struct drm_connector_helper_funcs ast_connector_helper_funcs = {
@@ -1039,15 +1024,11 @@ static const struct drm_connector_funcs ast_connector_funcs = {static int ast_connector_init (struct drm_device *dev) { -struct ast_connector *ast_connector; -struct drm_connector *connector; -struct drm_encoder *encoder; - - ast_connector =kzalloc (sizeof (struct ast_connector ),GFP_KERNEL ); -if (!ast_connector) -return -ENOMEM ; +struct ast_private *ast =to_ast_private (dev); +struct ast_connector *ast_connector = &ast->connector; +struct drm_connector *connector = &ast_connector->base; +struct drm_encoder *encoder = &ast->encoder; - connector = &ast_connector->base; ast_connector->i2c =ast_i2c_create (dev);if (!ast_connector->i2c)drm_err (dev,"failed to add ddc bus for connector\n" );
@@ -1064,7 +1045,6 @@ static int ast_connector_init(struct drm_device *dev) connector->polled =DRM_CONNECTOR_POLL_CONNECT ; - encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);drm_connector_attach_encoder (connector, encoder);return 0 ;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 2/9 drm/ast: Separate DRM driver from PCI code
In reply to Thomas ZimmermannPutting the DRM driver to the top of the file and the PCI code to the bottom makes ast_drv.c more readable. While at it, the patch prefixes file-scope variables with ast_.
--- drivers/gpu/drm/ast/ast_drv.c | 59 ++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 28 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +31 -28
@@ -43,9 +43,33 @@ int ast_modeset = -1;MODULE_PARM_DESC (modeset,"Disable/Enable modesetting" );module_param_named (modeset, ast_modeset, int,0400 ); -#define PCI_VENDOR_ASPEED 0x1a03 +/* +* DRM driver +*/ + +DEFINE_DRM_GEM_FOPS (ast_fops); + +static struct drm_driver ast_driver = { + .driver_features =DRIVER_ATOMIC | +DRIVER_GEM | +DRIVER_MODESET , + + .fops = &ast_fops, + .name =DRIVER_NAME , + .desc =DRIVER_DESC , + .date =DRIVER_DATE , + .major =DRIVER_MAJOR , + .minor =DRIVER_MINOR , + .patchlevel =DRIVER_PATCHLEVEL , -static struct drm_driver driver; +DRM_GEM_VRAM_DRIVER +}; + +/* +* PCI driver +*/ + +#define PCI_VENDOR_ASPEED 0x1a03#define AST_VGA_DEVICE (id, info) { \ .class = PCI_BASE_CLASS_DISPLAY << 16, \
@@ -56,13 +80,13 @@ static struct drm_driver driver; .subdevice = PCI_ANY_ID, \ .driver_data = (unsigned long) info } -static const struct pci_device_id pciidlist[] = { +static const struct pci_device_id ast_pciidlist[] = {AST_VGA_DEVICE (PCI_CHIP_AST2000 ,NULL ),AST_VGA_DEVICE (PCI_CHIP_AST2100 ,NULL ), {0 ,0 ,0 }, }; -MODULE_DEVICE_TABLE (pci, pciidlist); +MODULE_DEVICE_TABLE (pci, ast_pciidlist);static void ast_kick_out_firmware_fb (struct pci_dev *pdev) {
@@ -94,7 +118,7 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret)return ret; - dev =drm_dev_alloc (&driver, &pdev->dev); + dev =drm_dev_alloc (&ast_driver, &pdev->dev);if (IS_ERR (dev))return PTR_ERR (dev);
@@ -118,11 +142,9 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_drm_dev_put:drm_dev_put (dev);return ret; - } -static void -ast_pci_remove (struct pci_dev *pdev) +static void ast_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev);
@@ -217,30 +239,12 @@ static const struct dev_pm_ops ast_pm_ops = {static struct pci_driver ast_pci_driver = { .name =DRIVER_NAME , - .id_table = pciidlist, + .id_table = ast_pciidlist, .probe = ast_pci_probe, .remove = ast_pci_remove, .driver.pm = &ast_pm_ops, }; -DEFINE_DRM_GEM_FOPS (ast_fops); - -static struct drm_driver driver = { - .driver_features =DRIVER_ATOMIC | -DRIVER_GEM | -DRIVER_MODESET , - - .fops = &ast_fops, - .name =DRIVER_NAME , - .desc =DRIVER_DESC , - .date =DRIVER_DATE , - .major =DRIVER_MAJOR , - .minor =DRIVER_MINOR , - .patchlevel =DRIVER_PATCHLEVEL , - -DRM_GEM_VRAM_DRIVER -}; -static int __init ast_init (void ) {if (vgacon_text_force () && ast_modeset ==-1 )
@@ -261,4 +265,3 @@ module_exit(ast_exit);MODULE_AUTHOR (DRIVER_AUTHOR );MODULE_DESCRIPTION (DRIVER_DESC );MODULE_LICENSE ("GPL and additional rights" ); -
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 3/9 drm/ast: Replace driver load/unload functions with device create/destroy
In reply to Thomas ZimmermannThe ast driver's load and unload functions are left-overs from when struct drm_driver.load/unload was still in use. The PCI probe helper allocated the DRM device and ran load to initialize it.
This patch replaces this code with device create and destroy. The main difference is that the device's create function allocates the DRM device and ast structures in the same place. This will be required for switching ast to managed allocations.
--- drivers/gpu/drm/ast/ast_drv.c | 24 +++++++++++------------- drivers/gpu/drm/ast/ast_drv.h | 6 ++++-- drivers/gpu/drm/ast/ast_main.c | 24 ++++++++++++++++++------ 3 files changed, 33 insertions(+), 21 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +11 -13
@@ -109,6 +109,7 @@ static void ast_kick_out_firmware_fb(struct pci_dev *pdev)static int ast_pci_probe (struct pci_dev *pdev,const struct pci_device_id *ent) { +struct ast_private *ast;struct drm_device *dev;int ret;
@@ -118,27 +119,23 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret)return ret; - dev =drm_dev_alloc (&ast_driver, &pdev->dev); -if (IS_ERR (dev)) -return PTR_ERR (dev); - - dev->pdev = pdev; -pci_set_drvdata (pdev, dev); - - ret =ast_driver_load (dev, ent->driver_data); -if (ret) + ast =ast_device_create (&ast_driver, pdev, ent->driver_data); +if (IS_ERR (ast)) { + ret =PTR_ERR (ast); goto err_drm_dev_put; + } + dev = ast->dev; ret =drm_dev_register (dev, ent->driver_data);if (ret) - goto err_ast_driver_unload; + goto err_ast_device_destroy;drm_fbdev_generic_setup (dev,32 );return 0 ; -err_ast_driver_unload: -ast_driver_unload (dev); +err_ast_device_destroy: +ast_device_destroy (ast); err_drm_dev_put:drm_dev_put (dev);return ret;
@@ -147,9 +144,10 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)static void ast_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); +struct ast_private *ast =to_ast_private (dev);drm_dev_unregister (dev); -ast_driver_unload (dev); +ast_device_destroy (ast);drm_dev_put (dev); }
drivers/gpu/drm/ast/ast_drv.h +4 -2
@@ -159,8 +159,10 @@ static inline struct ast_private *to_ast_private(struct drm_device *dev)return dev->dev_private; } -int ast_driver_load (struct drm_device *dev,unsigned long flags); -void ast_driver_unload (struct drm_device *dev); +struct ast_private *ast_device_create (struct drm_driver *drv, +struct pci_dev *pdev, +unsigned long flags); +void ast_device_destroy (struct ast_private *ast);#define AST_IO_AR_PORT_WRITE (0x40)#define AST_IO_MISC_PORT_WRITE (0x42)
drivers/gpu/drm/ast/ast_main.c +18 -6
@@ -30,6 +30,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h>
@@ -378,15 +379,25 @@ static int ast_get_dram_info(struct drm_device *dev)return 0 ; } -int ast_driver_load (struct drm_device *dev,unsigned long flags) +struct ast_private *ast_device_create (struct drm_driver *drv, +struct pci_dev *pdev, +unsigned long flags) { +struct drm_device *dev;struct ast_private *ast;bool need_post;int ret =0 ; + dev =drm_dev_alloc (drv, &pdev->dev); +if (IS_ERR (dev)) +return ERR_CAST (dev); + + dev->pdev = pdev; +pci_set_drvdata (pdev, dev); + ast =kzalloc (sizeof (struct ast_private ),GFP_KERNEL );if (!ast) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); dev->dev_private = ast; ast->dev = dev;
@@ -435,16 +446,17 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)if (ret) goto out_free; -return 0 ; +return ast; + out_free:kfree (ast); dev->dev_private =NULL ; -return ret; +return ERR_PTR (ret); } -void ast_driver_unload (struct drm_device *dev) +void ast_device_destroy (struct ast_private *ast) { -struct ast_private *ast =to_ast_private (dev); +struct drm_device *dev = ast->dev;/* enable standard VGA decode */ ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 );
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 4/9 drm/ast: Replace struct_drm_device.dev_private with to_ast_private()
In reply to Thomas ZimmermannThe ast code still references dev_private in several place when looking up the ast device structure. Convert the remaining locations to use to_ast_private().
--- drivers/gpu/drm/ast/ast_cursor.c | 2 +- drivers/gpu/drm/ast/ast_mode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/ast/ast_cursor.c +1 -1
@@ -47,7 +47,7 @@ static void ast_cursor_fini(struct ast_private *ast)static void ast_cursor_release (struct drm_device *dev,void *ptr) { -struct ast_private *ast = dev->dev_private; +struct ast_private *ast =to_ast_private (dev);ast_cursor_fini (ast); }
drivers/gpu/drm/ast/ast_mode.c +1 -1
@@ -663,7 +663,7 @@ ast_cursor_plane_helper_atomic_update(struct drm_plane *plane, {struct drm_plane_state *state = plane->state;struct drm_framebuffer *fb = state->fb; -struct ast_private *ast = plane->dev->dev_private; +struct ast_private *ast =to_ast_private (plane->dev);unsigned int offset_x, offset_y; offset_x =AST_MAX_HWC_WIDTH - fb->width;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 5/9 drm/ast: Don't use ast->dev if dev is available
In reply to Thomas ZimmermannSeveral places in ast use ast->dev, when a dev pointer is already available within the function. Remove the extra indirection. No functional changes made.
This is just a small cleanup before embedding the DRM device instance in struct ast_private.
--- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/ast/ast_post.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +1 -1
@@ -1079,7 +1079,7 @@ int ast_mode_config_init(struct ast_private *ast) dev->mode_config.min_height =0 ; dev->mode_config.preferred_depth =24 ; dev->mode_config.prefer_shadow =1 ; - dev->mode_config.fb_base =pci_resource_start (ast->dev->pdev,0 ); + dev->mode_config.fb_base =pci_resource_start (dev->pdev,0 ); if (ast->chip == AST2100 || ast->chip == AST2200 ||
drivers/gpu/drm/ast/ast_post.c +2 -2
@@ -368,9 +368,9 @@ void ast_post_gpu(struct drm_device *dev)u32 reg;struct ast_private *ast =to_ast_private (dev); -pci_read_config_dword (ast->dev->pdev,0x04 , ®); +pci_read_config_dword (dev->pdev,0x04 , ®); reg |=0x3 ; -pci_write_config_dword (ast->dev->pdev,0x04 , reg); +pci_write_config_dword (dev->pdev,0x04 , reg);ast_enable_vga (dev);ast_open_key (ast);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 6/9 drm/ast: Embed struct drm_device in struct ast_private
In reply to Thomas ZimmermannTurns struct ast_private into a subclass of struct drm_device by embedding the latter. This allows for using DRM's managed device allocation.
The use of struct drm_device.dev_private is deprecated. The patch converts the last remaining users to to_ast_private().
--- drivers/gpu/drm/ast/ast_cursor.c | 6 ++--- drivers/gpu/drm/ast/ast_drv.c | 2 +- drivers/gpu/drm/ast/ast_drv.h | 4 +-- drivers/gpu/drm/ast/ast_main.c | 42 ++++++++++---------------------- drivers/gpu/drm/ast/ast_mm.c | 2 +- drivers/gpu/drm/ast/ast_mode.c | 2 +- drivers/gpu/drm/ast/ast_post.c | 2 +- 7 files changed, 22 insertions(+), 38 deletions(-)
drivers/gpu/drm/ast/ast_cursor.c +3 -3
@@ -57,7 +57,7 @@ static void ast_cursor_release(struct drm_device *dev, void *ptr)*/ int ast_cursor_init (struct ast_private *ast) { -struct drm_device *dev = ast->dev; +struct drm_device *dev = &ast->base;size_t size, i;struct drm_gem_vram_object *gbo;void __iomem *vaddr;
@@ -168,7 +168,7 @@ static void update_cursor_image(u8 __iomem *dst, const u8 *src, int width, int hint ast_cursor_blit (struct ast_private *ast,struct drm_framebuffer *fb) { -struct drm_device *dev = ast->dev; +struct drm_device *dev = &ast->base;struct drm_gem_vram_object *gbo;int ret;void *src;
@@ -217,7 +217,7 @@ static void ast_cursor_set_base(struct ast_private *ast, u64 address)void ast_cursor_page_flip (struct ast_private *ast) { -struct drm_device *dev = ast->dev; +struct drm_device *dev = &ast->base;struct drm_gem_vram_object *gbo;s64 off;
drivers/gpu/drm/ast/ast_drv.c +1 -1
@@ -124,7 +124,7 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ret =PTR_ERR (ast); goto err_drm_dev_put; } - dev = ast->dev; + dev = &ast->base; ret =drm_dev_register (dev, ent->driver_data);if (ret)
drivers/gpu/drm/ast/ast_drv.h +2 -2
@@ -116,7 +116,7 @@ to_ast_connector(struct drm_connector *connector) }struct ast_private { -struct drm_device *dev; +struct drm_device base;void __iomem *regs;void __iomem *ioregs;
@@ -156,7 +156,7 @@ struct ast_private {static inline struct ast_private *to_ast_private (struct drm_device *dev) { -return dev->dev_private; + return container_of(dev, struct ast_private, base); } struct ast_private *ast_device_create(struct drm_driver *drv,
drivers/gpu/drm/ast/ast_main.c +13 -29
84 lines not on this page · raw message
drivers/gpu/drm/ast/ast_mm.c +1 -1
@@ -85,9 +85,9 @@ static void ast_mm_release(struct drm_device *dev, void *ptr)int ast_mm_init (struct ast_private *ast) { +struct drm_device *dev = &ast->base;u32 vram_size;int ret; -struct drm_device *dev = ast->dev; vram_size =ast_get_vram_size (ast);
drivers/gpu/drm/ast/ast_mode.c +1 -1
@@ -1063,7 +1063,7 @@ static const struct drm_mode_config_funcs ast_mode_config_funcs = {int ast_mode_config_init (struct ast_private *ast) { -struct drm_device *dev = ast->dev; +struct drm_device *dev = &ast->base;int ret; ret =ast_cursor_init (ast);
drivers/gpu/drm/ast/ast_post.c +1 -1
@@ -365,8 +365,8 @@ static void ast_init_dram_reg(struct drm_device *dev)void ast_post_gpu (struct drm_device *dev) { -u32 reg;struct ast_private *ast =to_ast_private (dev); +u32 reg;pci_read_config_dword (dev->pdev,0x04 , ®); reg |=0x3 ;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 7/9 drm/ast: Managed release of ast firmware
In reply to Thomas ZimmermannThe ast driver loads firmware for the DP501 display encoder. The patch replaces the removal code with a managed release function.
--- drivers/gpu/drm/ast/ast_dp501.c | 23 ++++++++++++++--------- drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_main.c | 3 --- 3 files changed, 14 insertions(+), 13 deletions(-)
drivers/gpu/drm/ast/ast_dp501.c +14 -9
@@ -8,11 +8,24 @@MODULE_FIRMWARE ("ast_dp501_fw.bin" ); +static void ast_release_firmware (void *data) +{ +struct ast_private *ast = data; + +release_firmware (ast->dp501_fw); + ast->dp501_fw =NULL ; +} +static int ast_load_dp501_microcode (struct drm_device *dev) {struct ast_private *ast =to_ast_private (dev); +int ret; + + ret =request_firmware (&ast->dp501_fw,"ast_dp501_fw.bin" , dev->dev); +if (ret) +return ret; -return request_firmware (&ast->dp501_fw,"ast_dp501_fw.bin" , dev->dev); +return devm_add_action_or_reset (dev->dev, ast_release_firmware, ast); }static void send_ack (struct ast_private *ast)
@@ -435,11 +448,3 @@ void ast_init_3rdtx(struct drm_device *dev) } } } - -void ast_release_firmware (struct drm_device *dev) -{ -struct ast_private *ast =to_ast_private (dev); - -release_firmware (ast->dp501_fw); - ast->dp501_fw =NULL ; -}
drivers/gpu/drm/ast/ast_drv.h +0 -1
@@ -312,7 +312,6 @@ bool ast_backup_fw(struct drm_device *dev, u8 *addr, u32 size);bool ast_dp501_read_edid (struct drm_device *dev,u8 *ediddata);u8 ast_get_dp501_max_clk (struct drm_device *dev);void ast_init_3rdtx (struct drm_device *dev); -void ast_release_firmware (struct drm_device *dev);/* ast_cursor.c */ int ast_cursor_init (struct ast_private *ast);
drivers/gpu/drm/ast/ast_main.c +0 -3
@@ -442,11 +442,8 @@ struct ast_private *ast_device_create(struct drm_driver *drv,void ast_device_destroy (struct ast_private *ast) { -struct drm_device *dev = &ast->base; -/* enable standard VGA decode */ ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); -ast_release_firmware (dev);kfree (ast->dp501_fw_addr); }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 8/9 drm/ast: Manage release of firmware backup memory
In reply to Thomas ZimmermannThe ast driver keeps a backup copy of the DP501 encoder's firmware. This patch adds managed release of the allocated memory.
--- drivers/gpu/drm/ast/ast_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/ast/ast_main.c +3 -4
@@ -33,6 +33,7 @@#include <drm/drm_drv.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_managed.h> #include "ast_drv.h"
@@ -231,11 +232,11 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post) ast->tx_chip_type =AST_TX_SIL164 ;break ;case 0x08 : - ast->dp501_fw_addr =kzalloc (32 *1024 ,GFP_KERNEL ); + ast->dp501_fw_addr =drmm_kzalloc (dev,32 *1024 ,GFP_KERNEL );if (ast->dp501_fw_addr) {/* backup firmware */ if (ast_backup_fw (dev, ast->dp501_fw_addr,32 *1024 )) { -kfree (ast->dp501_fw_addr); +drmm_kfree (dev, ast->dp501_fw_addr); ast->dp501_fw_addr =NULL ; } }
@@ -444,6 +445,4 @@ void ast_device_destroy(struct ast_private *ast) {/* enable standard VGA decode */ ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); - -kfree (ast->dp501_fw_addr); }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 9/9 drm/ast: Managed device release
In reply to Thomas ZimmermannThis turns the ast's device cleanup code into a managed release helper function. Note that the code uses devres helpers. The release function switches the device back to VGA mode and therefore runs during HW device cleanup; not at DRM device cleanup.
--- drivers/gpu/drm/ast/ast_drv.c | 17 +++-------------- drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_main.c | 22 ++++++++++++++++------ 3 files changed, 19 insertions(+), 21 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +3 -14
@@ -120,35 +120,24 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)return ret; ast =ast_device_create (&ast_driver, pdev, ent->driver_data); -if (IS_ERR (ast)) { - ret =PTR_ERR (ast); - goto err_drm_dev_put; - } +if (IS_ERR (ast)) +return PTR_ERR (ast); dev = &ast->base; ret =drm_dev_register (dev, ent->driver_data);if (ret) - goto err_ast_device_destroy; +return ret;drm_fbdev_generic_setup (dev,32 );return 0 ; - -err_ast_device_destroy: -ast_device_destroy (ast); -err_drm_dev_put: -drm_dev_put (dev); -return ret; }static void ast_pci_remove (struct pci_dev *pdev) {struct drm_device *dev =pci_get_drvdata (pdev); -struct ast_private *ast =to_ast_private (dev);drm_dev_unregister (dev); -ast_device_destroy (ast); -drm_dev_put (dev); }static int ast_drm_freeze (struct drm_device *dev)
drivers/gpu/drm/ast/ast_drv.h +0 -1
@@ -162,7 +162,6 @@ static inline struct ast_private *to_ast_private(struct drm_device *dev)struct ast_private *ast_device_create (struct drm_driver *drv,struct pci_dev *pdev,unsigned long flags); -void ast_device_destroy (struct ast_private *ast);#define AST_IO_AR_PORT_WRITE (0x40)#define AST_IO_MISC_PORT_WRITE (0x42)
drivers/gpu/drm/ast/ast_main.c +16 -6
@@ -380,6 +380,18 @@ static int ast_get_dram_info(struct drm_device *dev)return 0 ; } +/* +* Run this function as part of the HW device cleanup; not +* when the DRM device gets released. +*/ +static void ast_device_release (void *data) +{ +struct ast_private *ast = data; + +/* enable standard VGA decode */ +ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); +} +struct ast_private *ast_device_create (struct drm_driver *drv,struct pci_dev *pdev,unsigned long flags)
@@ -438,11 +450,9 @@ struct ast_private *ast_device_create(struct drm_driver *drv,if (ret)return ERR_PTR (ret); -return ast; -} + ret =devm_add_action_or_reset (dev->dev, ast_device_release, ast); +if (ret) +return ERR_PTR (ret); -void ast_device_destroy (struct ast_private *ast) -{ -/* enable standard VGA decode */ -ast_set_index_reg (ast,AST_IO_CRTC_PORT ,0xa1 ,0x04 ); +return ast; }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel