Den 04.11.2017 14.03, skrev Noralf Trønnes:
This patchset adds drm_fb_cma_fbdev_init/fini() functions that replaces
drm_fbdev_cma_init/fini(). The reason for doing so is to get rid of
struct drm_fbdev_cma and it's wrapper functions. The final piece will
happen when tinydrm moves away from the cma helper and we can remove the
struct.
This patchset is broken on anything but tinydrm, will resend a new version.
This is the fix:
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c
b/drivers/gpu/drm/drm_fb_cma_helper.c
index 0c73957d7aad..6abb0ab4e7ca 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -294,7 +294,7 @@ drm_fbdev_cma_create(struct drm_fb_helper *helper,
fbi->screen_size = size;
fbi->fix.smem_len = size;
- if (fbdev_cma->fb_funcs->dirty) {
+ if (fb->funcs->dirty) {
ret = drm_fbdev_cma_defio_init(fbi, obj);
if (ret)
goto err_cma_destroy;
Sorry about this. I was certain I had tested it on vc4, but clearly I
hadn't :/
Noralf.
Note:
Patches 19-22 depends on patchset:
drm/: Add simple modeset suspend/resume helpers
Noralf.
Noralf Trønnes (22):
drm/gem-fb-helper: drm_gem_fbdev_fb_create() make funcs optional
drm/cma-helper: Add drm_fb_cma_fbdev_init/fini()
drm/arc: Use drm_fb_cma_fbdev_init/fini()
drm/arm/hdlcd: Use drm_fb_cma_fbdev_init/fini()
drm/atmel-hlcdc: Use drm_fb_cma_fbdev_init/fini()
drm/hisilicon/kirin: Use drm_fb_cma_fbdev_init/fini()
drm/imx: Use drm_fb_cma_fbdev_init/fini()
drm/meson: Use drm_fb_cma_fbdev_init/fini()
drm/mxsfb: Use drm_fb_cma_fbdev_init/fini()
drm/pl111: Use drm_fb_cma_fbdev_init/fini()
drm/rcar-du: Use drm_fb_cma_fbdev_init/fini()
drm/sti: Use drm_fb_cma_fbdev_init/fini()
drm/stm: Use drm_fb_cma_fbdev_init/fini()
drm/sun4i: Use drm_fb_cma_fbdev_init/fini()
drm/tilcdc: Use drm_fb_cma_fbdev_init/fini()
drm/tve200: Use drm_fb_cma_fbdev_init/fini()
drm/vc4: Use drm_fb_cma_fbdev_init/fini()
drm/zte: Use drm_fb_cma_fbdev_init/fini()
drm/arm/mali: Use drm_fb_cma_fbdev_init/fini()
drm/fsl-dcu: Use drm_fb_cma_fbdev_init/fini()
drm/tinydrm: Use drm_fb_cma_fbdev_init_with_funcs/fini()
drm/cma-helper: Remove drm_fbdev_cma* functions
Documentation/gpu/todo.rst | 5 -
drivers/gpu/drm/arc/arcpgu.h | 4 -
drivers/gpu/drm/arc/arcpgu_drv.c | 36 +----
drivers/gpu/drm/arm/hdlcd_drv.c | 37 +----
drivers/gpu/drm/arm/hdlcd_drv.h | 1 -
drivers/gpu/drm/arm/malidp_drv.c | 39 +----
drivers/gpu/drm/arm/malidp_drv.h | 1 -
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 26 +---
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 +-
drivers/gpu/drm/drm_fb_cma_helper.c | 188 +++++++++---------------
drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 26 +---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 -
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 35 +----
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 4 -
drivers/gpu/drm/imx/imx-drm-core.c | 33 +----
drivers/gpu/drm/imx/imx-drm.h | 1 -
drivers/gpu/drm/meson/meson_drv.c | 20 +--
drivers/gpu/drm/meson/meson_drv.h | 1 -
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 21 +--
drivers/gpu/drm/mxsfb/mxsfb_drv.h | 1 -
drivers/gpu/drm/pl111/pl111_drm.h | 1 -
drivers/gpu/drm/pl111/pl111_drv.c | 16 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 13 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 -
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 20 +--
drivers/gpu/drm/sti/sti_drv.c | 25 +---
drivers/gpu/drm/sti/sti_drv.h | 1 -
drivers/gpu/drm/stm/drv.c | 37 +----
drivers/gpu/drm/stm/ltdc.h | 1 -
drivers/gpu/drm/sun4i/sun4i_drv.c | 14 +-
drivers/gpu/drm/sun4i/sun4i_drv.h | 2 -
drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 18 +--
drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_drv.c | 26 +---
drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 -
drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 37 +----
drivers/gpu/drm/tinydrm/mi0283qt.c | 3 +-
drivers/gpu/drm/tinydrm/st7586.c | 3 +-
drivers/gpu/drm/tve200/tve200_drm.h | 1 -
drivers/gpu/drm/tve200/tve200_drv.c | 16 +-
drivers/gpu/drm/vc4/vc4_drv.c | 13 +-
drivers/gpu/drm/vc4/vc4_drv.h | 2 -
drivers/gpu/drm/vc4/vc4_kms.c | 18 +--
drivers/gpu/drm/zte/zx_drm_drv.c | 48 +-----
include/drm/drm_fb_cma_helper.h | 29 +---
include/drm/tinydrm/tinydrm.h | 3 -
47 files changed, 196 insertions(+), 645 deletions(-)
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
