Replace hibmc code with generic implmentation
Subsystems (3)
Thomas Zimmermann
maintainerv2 cover Replace hibmc code with generic implmentation
The patch set replaces code in hibmc with generic implementation.
Patches 1 to 4 replace fbdev emuation, framebuffer and creation of dumb buffers with respective code from DRM helpers. Patch 5 adds an additional interface to debugfs that displays the allocated and free areas in video memory.
The patches have only been compile-tested. Further testing is appreciated.
v2:
* split [3/4] into vram and hibmc changes
* verify that pitch_align is power of two
Thomas Zimmermann (5):
drm/hisilicon/hibmc: Switch to generic fbdev emulation drm/hisilicon/hibmc: Replace struct hibmc_framebuffer with generic
code
drm/vram: Support scanline alignment for dumb buffers drm/hisilicon/hibmc: Implement hibmc_dumb_create() with generic
helpers
drm/hisilicon/hibmc: Export VRAM MM information to debugfs
drivers/gpu/drm/drm_gem_vram_helper.c | 13 +- drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 26 -- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 240 ------------------ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 117 +-------- include/drm/drm_gem_vram_helper.h | 1 + 8 files changed, 20 insertions(+), 389 deletions(-) delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
--
2.23.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 1/5 drm/hisilicon/hibmc: Switch to generic fbdev emulation
There's nothing special about hibmc's fbdev emulation that is not provided by the generic implementation. Switch over and remove the driver's code.
--- drivers/gpu/drm/hisilicon/hibmc/Makefile | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 - .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 240 ------------------ 4 files changed, 3 insertions(+), 255 deletions(-) delete mode 100644 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c
drivers/gpu/drm/hisilicon/hibmc/Makefile +1 -1
@@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_drm_fbdev.o hibmc_ttm.o +hibmc-drm-y := hibmc_drm_drv.o hibmc_drm_de.o hibmc_drm_vdac.o hibmc_ttm.o obj-$(CONFIG_DRM_HISI_HIBMC) += hibmc-drm.o
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +2 -3
@@ -17,6 +17,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_gem_vram_helper.h> #include <drm/drm_irq.h> #include <drm/drm_print.h>
@@ -247,8 +248,6 @@ static int hibmc_unload(struct drm_device *dev) {struct hibmc_drm_private *priv = dev->dev_private; -hibmc_fbdev_fini (priv); -drm_atomic_helper_shutdown (dev);if (dev->irq_enabled)
@@ -307,7 +306,7 @@ static int hibmc_load(struct drm_device *dev)/* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset (dev); - ret =hibmc_fbdev_init (priv); + ret =drm_fbdev_generic_setup (dev,16 );if (ret) {DRM_ERROR ("failed to initialize fbdev: %d\n" , ret); goto err;
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -11
@@ -25,12 +25,6 @@ struct hibmc_framebuffer {struct drm_gem_object *obj; }; -struct hibmc_fbdev { -struct drm_fb_helper helper;/* must be first */ -struct hibmc_framebuffer *fb; -int size; -}; -struct hibmc_drm_private {/* hw */ void __iomem *mmio;
@@ -42,9 +36,6 @@ struct hibmc_drm_private {/* drm */ struct drm_device *dev;bool mode_config_initialized; - -/* fbdev */ -struct hibmc_fbdev *fbdev; };#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb)
@@ -56,8 +47,6 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv,int hibmc_de_init (struct hibmc_drm_private *priv);int hibmc_vdac_init (struct hibmc_drm_private *priv); -int hibmc_fbdev_init (struct hibmc_drm_private *priv); -void hibmc_fbdev_fini (struct hibmc_drm_private *priv);int hibmc_gem_create (struct drm_device *dev,u32 size,bool iskernel,struct drm_gem_object **obj);
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c deleted +0 -240
240 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 2/5 drm/hisilicon/hibmc: Replace struct hibmc_framebuffer with generic code
In reply to Thomas ZimmermannThe hibmc driver's struct hibmc_framebuffer stores a DRM framebuffer with an associated GEM object. This functionality is also provided by generic code. Switch hibmc over.
--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 --- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 69 +------------------ 3 files changed, 3 insertions(+), 81 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +1 -3
@@ -99,14 +99,12 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,s64 gpu_addr =0 ;unsigned int line_l;struct hibmc_drm_private *priv = plane->dev->dev_private; -struct hibmc_framebuffer *hibmc_fb;struct drm_gem_vram_object *gbo;if (!state->fb)return ; - hibmc_fb =to_hibmc_framebuffer (state->fb); - gbo =drm_gem_vram_of_gem (hibmc_fb->obj); + gbo =drm_gem_vram_of_gem (state->fb->obj[0 ]); gpu_addr =drm_gem_vram_offset (gbo);if (WARN_ON_ONCE (gpu_addr <0 ))
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -11
@@ -20,11 +20,6 @@struct drm_device ;struct drm_gem_object ; -struct hibmc_framebuffer { -struct drm_framebuffer fb; -struct drm_gem_object *obj; -}; -struct hibmc_drm_private {/* hw */ void __iomem *mmio;
@@ -38,8 +33,6 @@ struct hibmc_drm_private {bool mode_config_initialized; }; -#define to_hibmc_framebuffer (x) container_of(x, struct hibmc_framebuffer, fb) -void hibmc_set_power_mode (struct hibmc_drm_private *priv,unsigned int power_mode); void hibmc_set_current_gate(struct hibmc_drm_private *priv,
@@ -50,10 +43,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv);int hibmc_gem_create (struct drm_device *dev,u32 size,bool iskernel,struct drm_gem_object **obj); -struct hibmc_framebuffer * -hibmc_framebuffer_init (struct drm_device *dev, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object *obj);int hibmc_mm_init (struct hibmc_drm_private *hibmc);void hibmc_mm_fini (struct hibmc_drm_private *hibmc);
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +2 -67
82 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 3/5 drm/vram: Support scanline alignment for dumb buffers
In reply to Thomas ZimmermannAdding the pitch alignment as an argument to drm_gem_vram_fill_create_dumb() allows to align scanlines to certain offsets. A value of 0 disables scanline pitches.
v2:
* split of patch from related hibmc changes
* test if scanline pitch is power of 2
--- drivers/gpu/drm/drm_gem_vram_helper.c | 13 ++++++++++--- include/drm/drm_gem_vram_helper.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +10 -3
@@ -485,6 +485,7 @@ EXPORT_SYMBOL(drm_gem_vram_vunmap);* @dev: the DRM device * @bdev: the TTM BO device managing the buffer object * @pg_align: the buffer's alignment in multiples of the page size +* @pitch_align: the scanline's alignment in powers of 2 * @interruptible: sleep interruptible if waiting for memory * @args: the arguments as provided to \ &struct drm_driver.dumb_create
@@ -502,6 +503,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct drm_device *dev, struct ttm_bo_device *bdev, unsigned long pg_align, + unsigned long pitch_align, bool interruptible, struct drm_mode_create_dumb *args) {
@@ -510,7 +512,12 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,int ret;u32 handle; - pitch = args->width * ((args->bpp +7 ) /8 ); +if (WARN_ON_ONCE (!is_power_of_2 (pitch_align))) +return -EINVAL ; + + pitch = args->width *DIV_ROUND_UP (args->bpp,8 ); +if (pitch_align) + pitch =ALIGN (pitch, pitch_align); size = pitch * args->height; size =roundup (size,PAGE_SIZE );
@@ -612,8 +619,8 @@ int drm_gem_vram_driver_dumb_create(struct drm_file *file,if (WARN_ONCE (!dev->vram_mm,"VRAM MM not initialized" ))return -EINVAL ; -return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev,0 , - false, args); +return drm_gem_vram_fill_create_dumb (file, dev, &dev->vram_mm->bdev, +0 ,0 , false, args); }EXPORT_SYMBOL (drm_gem_vram_driver_dumb_create);
include/drm/drm_gem_vram_helper.h +1 -0
@@ -113,6 +113,7 @@ int drm_gem_vram_fill_create_dumb(struct drm_file *file,struct drm_device *dev, struct ttm_bo_device *bdev, unsigned long pg_align, + unsigned long pitch_align, bool interruptible, struct drm_mode_create_dumb *args);
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 4/5 drm/hisilicon/hibmc: Implement hibmc_dumb_create() with generic helpers
In reply to Thomas ZimmermannThe hibmc driver aligns scanlines to 16 bytes. By using the new pitch_align argument of drm_gem_vram_fill_create_dumb(), convert hibmc over.
v2:
* move changes to VRAM helpers into separate patch
--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 4 -- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 48 +------------------ 2 files changed, 2 insertions(+), 50 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +0 -4
@@ -18,7 +18,6 @@#include <drm/drm_framebuffer.h> struct drm_device ; -struct drm_gem_object ;struct hibmc_drm_private {/* hw */
@@ -41,9 +40,6 @@ void hibmc_set_current_gate(struct hibmc_drm_private *priv,int hibmc_de_init (struct hibmc_drm_private *priv);int hibmc_vdac_init (struct hibmc_drm_private *priv); -int hibmc_gem_create (struct drm_device *dev,u32 size,bool iskernel, -struct drm_gem_object **obj); -int hibmc_mm_init (struct hibmc_drm_private *hibmc);void hibmc_mm_fini (struct hibmc_drm_private *hibmc); int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,
drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +2 -46
57 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 5/5 drm/hisilicon/hibmc: Export VRAM MM information to debugfs
In reply to Thomas ZimmermannThis change makes information about VRAM consumption available on debugfs. See
/sys/kernel/debug/dri/0/vram-mm
for an overview of how VRAM is being used.
--- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -0
@@ -55,6 +55,7 @@ static struct drm_driver hibmc_driver = { .desc = "hibmc drm driver", .major = 1, .minor = 0, + .debugfs_init = drm_vram_mm_debugfs_init, .dumb_create = hibmc_dumb_create, .dumb_map_offset = drm_gem_vram_driver_dumb_mmap_offset, .gem_prime_mmap = drm_gem_prime_mmap,
Signature · 6 lines
2.23.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel