| Message ID | 20200623081901.10667-3-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/ast: Managed modesetting | expand |
Hi Thomas. On Tue, Jun 23, 2020 at 10:18:49AM +0200, Thomas Zimmermann wrote: > Removes some typecasting. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/ast/ast_cursor.c | 7 +++---- > drivers/gpu/drm/ast/ast_drv.h | 4 ++-- > drivers/gpu/drm/ast/ast_mode.c | 6 ++++-- > 3 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/ast/ast_cursor.c b/drivers/gpu/drm/ast/ast_cursor.c > index 53bb6eebc7cd..1d4f51a7fe22 100644 > --- a/drivers/gpu/drm/ast/ast_cursor.c > +++ b/drivers/gpu/drm/ast/ast_cursor.c > @@ -34,9 +34,9 @@ > /* > * Allocate cursor BOs and pins them at the end of VRAM. > */ > -int ast_cursor_init(struct drm_device *dev) > +int ast_cursor_init(struct ast_private *ast) > { > - struct ast_private *ast = to_ast_private(dev); > + struct drm_device *dev = ast->dev; > size_t size, i; > struct drm_gem_vram_object *gbo; > int ret; > @@ -72,9 +72,8 @@ int ast_cursor_init(struct drm_device *dev) > return ret; > } > > -void ast_cursor_fini(struct drm_device *dev) > +void ast_cursor_fini(struct ast_private *ast) > { > - struct ast_private *ast = to_ast_private(dev); > size_t i; > struct drm_gem_vram_object *gbo; > > diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h > index 245ed2e2d775..f7b120f862a8 100644 > --- a/drivers/gpu/drm/ast/ast_drv.h > +++ b/drivers/gpu/drm/ast/ast_drv.h > @@ -316,8 +316,8 @@ void ast_init_3rdtx(struct drm_device *dev); > void ast_release_firmware(struct drm_device *dev); > > /* ast_cursor.c */ > -int ast_cursor_init(struct drm_device *dev); > -void ast_cursor_fini(struct drm_device *dev); > +int ast_cursor_init(struct ast_private *ast); > +void ast_cursor_fini(struct ast_private *ast); > int ast_cursor_update(void *dst, void *src, unsigned int width, > unsigned int height); > void ast_cursor_set_base(struct ast_private *ast, u64 address); > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c > index c8399699d773..243715e9c237 100644 > --- a/drivers/gpu/drm/ast/ast_mode.c > +++ b/drivers/gpu/drm/ast/ast_mode.c > @@ -1149,7 +1149,7 @@ int ast_mode_init(struct drm_device *dev) > drm_plane_helper_add(&ast->cursor_plane, > &ast_cursor_plane_helper_funcs); > > - ast_cursor_init(dev); > + ast_cursor_init(ast); > ast_crtc_init(dev); > ast_encoder_init(dev); > ast_connector_init(dev); > @@ -1159,7 +1159,9 @@ int ast_mode_init(struct drm_device *dev) > > void ast_mode_fini(struct drm_device *dev) > { > - ast_cursor_fini(dev); > + struct ast_private *ast = dev->dev_private; Better to use to_ast_private(dev), to avoid the deprecated dev_private. With this fixed: Acked-by: Sam Ravnborg <sam@ravnborg.org> > + > + ast_cursor_fini(ast); > } > > static int get_clock(void *i2c_priv) > -- > 2.27.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/ast/ast_cursor.c b/drivers/gpu/drm/ast/ast_cursor.c index 53bb6eebc7cd..1d4f51a7fe22 100644 --- a/drivers/gpu/drm/ast/ast_cursor.c +++ b/drivers/gpu/drm/ast/ast_cursor.c @@ -34,9 +34,9 @@ /* * Allocate cursor BOs and pins them at the end of VRAM. */ -int ast_cursor_init(struct drm_device *dev) +int ast_cursor_init(struct ast_private *ast) { - struct ast_private *ast = to_ast_private(dev); + struct drm_device *dev = ast->dev; size_t size, i; struct drm_gem_vram_object *gbo; int ret; @@ -72,9 +72,8 @@ int ast_cursor_init(struct drm_device *dev) return ret; } -void ast_cursor_fini(struct drm_device *dev) +void ast_cursor_fini(struct ast_private *ast) { - struct ast_private *ast = to_ast_private(dev); size_t i; struct drm_gem_vram_object *gbo; diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 245ed2e2d775..f7b120f862a8 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h @@ -316,8 +316,8 @@ void ast_init_3rdtx(struct drm_device *dev); void ast_release_firmware(struct drm_device *dev); /* ast_cursor.c */ -int ast_cursor_init(struct drm_device *dev); -void ast_cursor_fini(struct drm_device *dev); +int ast_cursor_init(struct ast_private *ast); +void ast_cursor_fini(struct ast_private *ast); int ast_cursor_update(void *dst, void *src, unsigned int width, unsigned int height); void ast_cursor_set_base(struct ast_private *ast, u64 address); diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index c8399699d773..243715e9c237 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -1149,7 +1149,7 @@ int ast_mode_init(struct drm_device *dev) drm_plane_helper_add(&ast->cursor_plane, &ast_cursor_plane_helper_funcs); - ast_cursor_init(dev); + ast_cursor_init(ast); ast_crtc_init(dev); ast_encoder_init(dev); ast_connector_init(dev); @@ -1159,7 +1159,9 @@ int ast_mode_init(struct drm_device *dev) void ast_mode_fini(struct drm_device *dev) { - ast_cursor_fini(dev); + struct ast_private *ast = dev->dev_private; + + ast_cursor_fini(ast); } static int get_clock(void *i2c_priv)
Removes some typecasting. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/ast/ast_cursor.c | 7 +++---- drivers/gpu/drm/ast/ast_drv.h | 4 ++-- drivers/gpu/drm/ast/ast_mode.c | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-)