[PATCH 00/20] Introduce DRM_FB_HELPER_DEFAULT_OPS for struct fb_ops

[PATCH 00/20] Introduce DRM_FB_HELPER_DEFAULT_OPS for struct fb_ops

[Stefan Christ]

Hi,

this series is refactoring work suggested by Daniel Vetter in the email:

   https://lists.freedesktop.org/archives/dri-devel/2016-July/113237.html

The define DRM_FB_HELPER_DEFAULT_OPS provides the drm_fb_helper default
implementations for functions in struct fb_ops. A drm driver can use it like:

    static struct fb_ops drm_fbdev_cma_ops = {
        .owner          = THIS_MODULE,
        DRM_FB_HELPER_DEFAULT_OPS,
        /* driver specific implementations */
    };

The patches do not make any functional change to the kernel binary except
driver 'drm/gma500'. The patch for gma500 enables two new functions (fb_setcmap
and fb_pan_display) in fb_ops.  If this is not appropriate, the driver may
reassign the struct members to null.

There is no refactoring patch for driver 'vmwgfx'. It reimplements nearly all
fb_ops with driver specific functions anyways. 

This series is based on tag v4.8-rc8. If rebased onto 'drm-next' there are two
small conflicts.

Kind regards,
	Stefan Christ

Stefan Christ (20):
  drm/fb-helper: add DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/amdgpu: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/armada: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/bochs: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/cirrus: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/fb_cma_helper: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/exynos: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/mgag200: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/nouveau: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/qxl: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/rockchip: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/radeon: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/tegra: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/udl: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/msm: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/virtio: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/omapdrm: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/i915: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
  drm/gma500: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c        |  6 +-----
 drivers/gpu/drm/armada/armada_fbdev.c         |  6 +-----
 drivers/gpu/drm/ast/ast_fb.c                  |  6 +-----
 drivers/gpu/drm/bochs/bochs_fbdev.c           |  6 +-----
 drivers/gpu/drm/cirrus/cirrus_fbdev.c         |  6 +-----
 drivers/gpu/drm/drm_fb_cma_helper.c           |  6 +-----
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c     |  6 +-----
 drivers/gpu/drm/gma500/framebuffer.c          | 12 +++---------
 drivers/gpu/drm/i915/intel_fbdev.c            |  3 +--
 drivers/gpu/drm/mgag200/mgag200_fb.c          |  6 +-----
 drivers/gpu/drm/msm/msm_fbdev.c               |  7 +------
 drivers/gpu/drm/nouveau/nouveau_fbcon.c       | 12 ++----------
 drivers/gpu/drm/omapdrm/omap_fbdev.c          |  5 +----
 drivers/gpu/drm/qxl/qxl_fb.c                  |  6 +-----
 drivers/gpu/drm/radeon/radeon_fb.c            |  6 +-----
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c |  6 +-----
 drivers/gpu/drm/tegra/fb.c                    |  6 +-----
 drivers/gpu/drm/udl/udl_fb.c                  |  6 +-----
 drivers/gpu/drm/virtio/virtgpu_fb.c           |  6 +-----
 include/drm/drm_fb_helper.h                   | 13 +++++++++++++
 20 files changed, 35 insertions(+), 101 deletions(-)

-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 01/20] drm/fb-helper: add DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

The define DRM_FB_HELPER_DEFAULT_OPS provides the drm_fb_helper default
implementations for functions in struct fb_ops. A drm driver can use it
like:

    static struct fb_ops drm_fbdev_cma_ops = {
        .owner          = THIS_MODULE,
        DRM_FB_HELPER_DEFAULT_OPS,
        /* driver specific implementations */
    };

Suggested-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 include/drm/drm_fb_helper.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index db8d478..b76f5c7 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -214,6 +214,19 @@ struct drm_fb_helper {
 	bool delayed_hotplug;
 };
 
+/**
+ * @DRM_FB_HELPER_DEFAULT_OPS:
+ *
+ * Helper define to register default implementations of drm_fb_helper
+ * functions. To be used in struct fb_ops of drm drivers.
+ */
+#define DRM_FB_HELPER_DEFAULT_OPS \
+	.fb_check_var	= drm_fb_helper_check_var, \
+	.fb_set_par	= drm_fb_helper_set_par, \
+	.fb_setcmap	= drm_fb_helper_setcmap, \
+	.fb_blank	= drm_fb_helper_blank, \
+	.fb_pan_display	= drm_fb_helper_pan_display
+
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 int drm_fb_helper_modinit(void);
 void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 02/20] drm/amdgpu: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index 9191467..6b80982 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@ -50,14 +50,10 @@ struct amdgpu_fbdev {
 
 static struct fb_ops amdgpufb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = drm_fb_helper_cfb_copyarea,
 	.fb_imageblit = drm_fb_helper_cfb_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 03/20] drm/armada: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/armada/armada_fbdev.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c
index 7d03c51..0322bb0 100644
--- a/drivers/gpu/drm/armada/armada_fbdev.c
+++ b/drivers/gpu/drm/armada/armada_fbdev.c
@@ -20,14 +20,10 @@
 
 static /*const*/ struct fb_ops armada_fb_ops = {
 	.owner		= THIS_MODULE,
-	.fb_check_var	= drm_fb_helper_check_var,
-	.fb_set_par	= drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect	= drm_fb_helper_cfb_fillrect,
 	.fb_copyarea	= drm_fb_helper_cfb_copyarea,
 	.fb_imageblit	= drm_fb_helper_cfb_imageblit,
-	.fb_pan_display	= drm_fb_helper_pan_display,
-	.fb_blank	= drm_fb_helper_blank,
-	.fb_setcmap	= drm_fb_helper_setcmap,
 	.fb_debug_enter	= drm_fb_helper_debug_enter,
 	.fb_debug_leave	= drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 04/20] drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/ast/ast_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index c017a93..b604fdd 100644
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -150,14 +150,10 @@ static void ast_imageblit(struct fb_info *info,
 
 static struct fb_ops astfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = ast_fillrect,
 	.fb_copyarea = ast_copyarea,
 	.fb_imageblit = ast_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 05/20] drm/bochs: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/bochs/bochs_fbdev.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c
index e1ec498..da790a1 100644
--- a/drivers/gpu/drm/bochs/bochs_fbdev.c
+++ b/drivers/gpu/drm/bochs/bochs_fbdev.c
@@ -22,14 +22,10 @@ static int bochsfb_mmap(struct fb_info *info,
 
 static struct fb_ops bochsfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = drm_fb_helper_sys_fillrect,
 	.fb_copyarea = drm_fb_helper_sys_copyarea,
 	.fb_imageblit = drm_fb_helper_sys_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_mmap = bochsfb_mmap,
 };
 
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 06/20] drm/cirrus: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/cirrus/cirrus_fbdev.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
index 3b5be72..4f8d42b 100644
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
@@ -124,14 +124,10 @@ static void cirrus_imageblit(struct fb_info *info,
 
 static struct fb_ops cirrusfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = cirrus_fillrect,
 	.fb_copyarea = cirrus_copyarea,
 	.fb_imageblit = cirrus_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 };
 
 static int cirrusfb_create_object(struct cirrus_fbdev *afbdev,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 07/20] drm/fb_cma_helper: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: David Airlie <airlied@linux.ie>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/drm_fb_cma_helper.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 1fd6eac..71551fd 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -311,14 +311,10 @@ static int drm_fb_cma_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
 static struct fb_ops drm_fbdev_cma_ops = {
 	.owner		= THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect	= drm_fb_helper_sys_fillrect,
 	.fb_copyarea	= drm_fb_helper_sys_copyarea,
 	.fb_imageblit	= drm_fb_helper_sys_imageblit,
-	.fb_check_var	= drm_fb_helper_check_var,
-	.fb_set_par	= drm_fb_helper_set_par,
-	.fb_blank	= drm_fb_helper_blank,
-	.fb_pan_display	= drm_fb_helper_pan_display,
-	.fb_setcmap	= drm_fb_helper_setcmap,
 	.fb_mmap	= drm_fb_cma_mmap,
 };
 
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 08/20] drm/exynos: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
index 4cfb39d..9f35deb 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
@@ -63,15 +63,11 @@ static int exynos_drm_fb_mmap(struct fb_info *info,
 
 static struct fb_ops exynos_drm_fb_ops = {
 	.owner		= THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_mmap        = exynos_drm_fb_mmap,
 	.fb_fillrect	= drm_fb_helper_cfb_fillrect,
 	.fb_copyarea	= drm_fb_helper_cfb_copyarea,
 	.fb_imageblit	= drm_fb_helper_cfb_imageblit,
-	.fb_check_var	= drm_fb_helper_check_var,
-	.fb_set_par	= drm_fb_helper_set_par,
-	.fb_blank	= drm_fb_helper_blank,
-	.fb_pan_display	= drm_fb_helper_pan_display,
-	.fb_setcmap	= drm_fb_helper_setcmap,
 };
 
 static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 09/20] drm/mgag200: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/mgag200/mgag200_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
index d9b04b0..a41aa19 100644
--- a/drivers/gpu/drm/mgag200/mgag200_fb.c
+++ b/drivers/gpu/drm/mgag200/mgag200_fb.c
@@ -127,14 +127,10 @@ static void mga_imageblit(struct fb_info *info,
 
 static struct fb_ops mgag200fb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = mga_fillrect,
 	.fb_copyarea = mga_copyarea,
 	.fb_imageblit = mga_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 };
 
 static int mgag200fb_create_object(struct mga_fbdev *afbdev,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 10/20] drm/nouveau: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/nouveau/nouveau_fbcon.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
index d1f248f..2373796 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -200,33 +200,25 @@ nouveau_fbcon_release(struct fb_info *info, int user)
 
 static struct fb_ops nouveau_fbcon_ops = {
 	.owner = THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_open = nouveau_fbcon_open,
 	.fb_release = nouveau_fbcon_release,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
 	.fb_fillrect = nouveau_fbcon_fillrect,
 	.fb_copyarea = nouveau_fbcon_copyarea,
 	.fb_imageblit = nouveau_fbcon_imageblit,
 	.fb_sync = nouveau_fbcon_sync,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
 
 static struct fb_ops nouveau_fbcon_sw_ops = {
 	.owner = THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_open = nouveau_fbcon_open,
 	.fb_release = nouveau_fbcon_release,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = drm_fb_helper_cfb_copyarea,
 	.fb_imageblit = drm_fb_helper_cfb_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 11/20] drm/qxl: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/qxl/qxl_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 28c1423..114f4cb 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -82,14 +82,10 @@ static struct fb_deferred_io qxl_defio = {
 
 static struct fb_ops qxlfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par, /* TODO: copy vmwgfx */
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = drm_fb_helper_sys_fillrect,
 	.fb_copyarea = drm_fb_helper_sys_copyarea,
 	.fb_imageblit = drm_fb_helper_sys_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 12/20] drm/rockchip: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
index 207e01d..46eaa3e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
@@ -36,15 +36,11 @@ static int rockchip_fbdev_mmap(struct fb_info *info,
 
 static struct fb_ops rockchip_drm_fbdev_ops = {
 	.owner		= THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_mmap	= rockchip_fbdev_mmap,
 	.fb_fillrect	= drm_fb_helper_cfb_fillrect,
 	.fb_copyarea	= drm_fb_helper_cfb_copyarea,
 	.fb_imageblit	= drm_fb_helper_cfb_imageblit,
-	.fb_check_var	= drm_fb_helper_check_var,
-	.fb_set_par	= drm_fb_helper_set_par,
-	.fb_blank	= drm_fb_helper_blank,
-	.fb_pan_display	= drm_fb_helper_pan_display,
-	.fb_setcmap	= drm_fb_helper_setcmap,
 };
 
 static int rockchip_drm_fbdev_create(struct drm_fb_helper *helper,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 13/20] drm/radeon: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/radeon/radeon_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index 0e3143a..12c6fe1 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -49,14 +49,10 @@ struct radeon_fbdev {
 
 static struct fb_ops radeonfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = drm_fb_helper_cfb_copyarea,
 	.fb_imageblit = drm_fb_helper_cfb_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 14/20] drm/tegra: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/tegra/fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
index e6d71fa..e4a5ab0 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@ -186,14 +186,10 @@ unreference:
 #ifdef CONFIG_DRM_FBDEV_EMULATION
 static struct fb_ops tegra_fb_ops = {
 	.owner = THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = drm_fb_helper_sys_fillrect,
 	.fb_copyarea = drm_fb_helper_sys_copyarea,
 	.fb_imageblit = drm_fb_helper_sys_imageblit,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_setcmap = drm_fb_helper_setcmap,
 };
 
 static int tegra_fbdev_probe(struct drm_fb_helper *helper,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 15/20] drm/udl: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/udl/udl_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
index 9688bfa..2137a4f 100644
--- a/drivers/gpu/drm/udl/udl_fb.c
+++ b/drivers/gpu/drm/udl/udl_fb.c
@@ -254,14 +254,10 @@ static int udl_fb_release(struct fb_info *info, int user)
 
 static struct fb_ops udlfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = drm_fb_helper_sys_fillrect,
 	.fb_copyarea = drm_fb_helper_sys_copyarea,
 	.fb_imageblit = drm_fb_helper_sys_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 	.fb_mmap = udl_fb_mmap,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 16/20] drm/msm: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Rob Clark <robdclark@gmail.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/msm/msm_fbdev.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c
index ffd4a33..d29f5e8 100644
--- a/drivers/gpu/drm/msm/msm_fbdev.c
+++ b/drivers/gpu/drm/msm/msm_fbdev.c
@@ -39,6 +39,7 @@ struct msm_fbdev {
 
 static struct fb_ops msm_fb_ops = {
 	.owner = THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 
 	/* Note: to properly handle manual update displays, we wrap the
 	 * basic fbdev ops which write to the framebuffer
@@ -49,12 +50,6 @@ static struct fb_ops msm_fb_ops = {
 	.fb_copyarea = drm_fb_helper_sys_copyarea,
 	.fb_imageblit = drm_fb_helper_sys_imageblit,
 	.fb_mmap = msm_fbdev_mmap,
-
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 };
 
 static int msm_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 17/20] drm/virtio: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

This patch removes a TODO comment in the code. I do not know whether it
is still relevant.

Cc: David Airlie <airlied@linux.ie>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/virtio/virtgpu_fb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
index 2242a80..138dbcf 100644
--- a/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@ -200,14 +200,10 @@ static void virtio_gpu_3d_imageblit(struct fb_info *info,
 
 static struct fb_ops virtio_gpufb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par, /* TODO: copy vmwgfx */
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_fillrect = virtio_gpu_3d_fillrect,
 	.fb_copyarea = virtio_gpu_3d_copyarea,
 	.fb_imageblit = virtio_gpu_3d_imageblit,
-	.fb_pan_display = drm_fb_helper_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 18/20] drm/omapdrm: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/omapdrm/omap_fbdev.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
index adb10fb..8d8ac17 100644
--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
+++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
@@ -82,6 +82,7 @@ fallback:
 
 static struct fb_ops omap_fb_ops = {
 	.owner = THIS_MODULE,
+	DRM_FB_HELPER_DEFAULT_OPS,
 
 	/* Note: to properly handle manual update displays, we wrap the
 	 * basic fbdev ops which write to the framebuffer
@@ -92,11 +93,7 @@ static struct fb_ops omap_fb_ops = {
 	.fb_copyarea = drm_fb_helper_sys_copyarea,
 	.fb_imageblit = drm_fb_helper_sys_imageblit,
 
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
 	.fb_pan_display = omap_fbdev_pan_display,
-	.fb_blank = drm_fb_helper_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 };
 
 static int omap_fbdev_create(struct drm_fb_helper *helper,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 19/20] drm/i915: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/i915/intel_fbdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 3e3632c..cf589ab 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -102,14 +102,13 @@ static int intel_fbdev_pan_display(struct fb_var_screeninfo *var,
 
 static struct fb_ops intelfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_set_par = intel_fbdev_set_par,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = drm_fb_helper_cfb_copyarea,
 	.fb_imageblit = drm_fb_helper_cfb_imageblit,
 	.fb_pan_display = intel_fbdev_pan_display,
 	.fb_blank = intel_fbdev_blank,
-	.fb_setcmap = drm_fb_helper_setcmap,
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 20/20] drm/gma500: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Christ]

This refactoring leads to real functional changes in the driver.

Now the struct psbfb_ops implements two additional members:

       .fb_setcmap     = drm_fb_helper_setcmap,
       .fb_pan_display = drm_fb_helper_pan_display,

and the struct psbfb_roll_ops implements one additional member:

       .fb_setcmap     = drm_fb_helper_setcmap,

and the struct psbfb_unaccel_ops implements two additional members:

       .fb_setcmap     = drm_fb_helper_setcmap,
       .fb_pan_display = drm_fb_helper_pan_display,

These changes are not tested.

Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
---
 drivers/gpu/drm/gma500/framebuffer.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 0fcdce0..24aa16b 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -186,9 +186,7 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 
 static struct fb_ops psbfb_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
-	.fb_blank = drm_fb_helper_blank,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_setcolreg = psbfb_setcolreg,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = psbfb_copyarea,
@@ -199,9 +197,7 @@ static struct fb_ops psbfb_ops = {
 
 static struct fb_ops psbfb_roll_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
-	.fb_blank = drm_fb_helper_blank,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_setcolreg = psbfb_setcolreg,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = drm_fb_helper_cfb_copyarea,
@@ -212,9 +208,7 @@ static struct fb_ops psbfb_roll_ops = {
 
 static struct fb_ops psbfb_unaccel_ops = {
 	.owner = THIS_MODULE,
-	.fb_check_var = drm_fb_helper_check_var,
-	.fb_set_par = drm_fb_helper_set_par,
-	.fb_blank = drm_fb_helper_blank,
+	DRM_FB_HELPER_DEFAULT_OPS,
 	.fb_setcolreg = psbfb_setcolreg,
 	.fb_fillrect = drm_fb_helper_cfb_fillrect,
 	.fb_copyarea = drm_fb_helper_cfb_copyarea,
-- 
2.7.3

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 00/20] Introduce DRM_FB_HELPER_DEFAULT_OPS for struct fb_ops

[Gustavo Padovan]

Hi Stefan,

2016-09-29 Stefan Christ <contact@stefanchrist.eu>:

> Hi,
> 
> this series is refactoring work suggested by Daniel Vetter in the email:
> 
>    https://lists.freedesktop.org/archives/dri-devel/2016-July/113237.html
> 
> The define DRM_FB_HELPER_DEFAULT_OPS provides the drm_fb_helper default
> implementations for functions in struct fb_ops. A drm driver can use it like:
> 
>     static struct fb_ops drm_fbdev_cma_ops = {
>         .owner          = THIS_MODULE,
>         DRM_FB_HELPER_DEFAULT_OPS,
>         /* driver specific implementations */
>     };
> 
> The patches do not make any functional change to the kernel binary except
> driver 'drm/gma500'. The patch for gma500 enables two new functions (fb_setcmap
> and fb_pan_display) in fb_ops.  If this is not appropriate, the driver may
> reassign the struct members to null.
> 
> There is no refactoring patch for driver 'vmwgfx'. It reimplements nearly all
> fb_ops with driver specific functions anyways. 
> 
> This series is based on tag v4.8-rc8. If rebased onto 'drm-next' there are two
> small conflicts.
> 
> Kind regards,
> 	Stefan Christ
> 
> Stefan Christ (20):
>   drm/fb-helper: add DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/amdgpu: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/armada: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/bochs: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/cirrus: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/fb_cma_helper: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/exynos: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/mgag200: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/nouveau: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/qxl: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/rockchip: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/radeon: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/tegra: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/udl: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/msm: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/virtio: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/omapdrm: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/i915: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
>   drm/gma500: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops
> 
>  drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c        |  6 +-----
>  drivers/gpu/drm/armada/armada_fbdev.c         |  6 +-----
>  drivers/gpu/drm/ast/ast_fb.c                  |  6 +-----
>  drivers/gpu/drm/bochs/bochs_fbdev.c           |  6 +-----
>  drivers/gpu/drm/cirrus/cirrus_fbdev.c         |  6 +-----
>  drivers/gpu/drm/drm_fb_cma_helper.c           |  6 +-----
>  drivers/gpu/drm/exynos/exynos_drm_fbdev.c     |  6 +-----
>  drivers/gpu/drm/gma500/framebuffer.c          | 12 +++---------
>  drivers/gpu/drm/i915/intel_fbdev.c            |  3 +--
>  drivers/gpu/drm/mgag200/mgag200_fb.c          |  6 +-----
>  drivers/gpu/drm/msm/msm_fbdev.c               |  7 +------
>  drivers/gpu/drm/nouveau/nouveau_fbcon.c       | 12 ++----------
>  drivers/gpu/drm/omapdrm/omap_fbdev.c          |  5 +----
>  drivers/gpu/drm/qxl/qxl_fb.c                  |  6 +-----
>  drivers/gpu/drm/radeon/radeon_fb.c            |  6 +-----
>  drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c |  6 +-----
>  drivers/gpu/drm/tegra/fb.c                    |  6 +-----
>  drivers/gpu/drm/udl/udl_fb.c                  |  6 +-----
>  drivers/gpu/drm/virtio/virtgpu_fb.c           |  6 +-----
>  include/drm/drm_fb_helper.h                   | 13 +++++++++++++
>  20 files changed, 35 insertions(+), 101 deletions(-)

This looks good to me.

Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

I wonder if we shouldn't start doing the same to drm_crtc_funcs and
drm_plane_funcs after we added the atomic helpers.

Gustavo
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 01/20] drm/fb-helper: add DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Daniel Vetter]

On Thu, Sep 29, 2016 at 10:48:37PM +0200, Stefan Christ wrote:
> The define DRM_FB_HELPER_DEFAULT_OPS provides the drm_fb_helper default
> implementations for functions in struct fb_ops. A drm driver can use it
> like:
> 
>     static struct fb_ops drm_fbdev_cma_ops = {
>         .owner          = THIS_MODULE,
>         DRM_FB_HELPER_DEFAULT_OPS,
>         /* driver specific implementations */
>     };
> 
> Suggested-by: Daniel Vetter <daniel@ffwll.ch>
> Signed-off-by: Stefan Christ <contact@stefanchrist.eu>

Applied just this one for 4.9. I think I'll postpone the others to 4.10.
-Daniel

> ---
>  include/drm/drm_fb_helper.h | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
> index db8d478..b76f5c7 100644
> --- a/include/drm/drm_fb_helper.h
> +++ b/include/drm/drm_fb_helper.h
> @@ -214,6 +214,19 @@ struct drm_fb_helper {
>  	bool delayed_hotplug;
>  };
>  
> +/**
> + * @DRM_FB_HELPER_DEFAULT_OPS:
> + *
> + * Helper define to register default implementations of drm_fb_helper
> + * functions. To be used in struct fb_ops of drm drivers.
> + */
> +#define DRM_FB_HELPER_DEFAULT_OPS \
> +	.fb_check_var	= drm_fb_helper_check_var, \
> +	.fb_set_par	= drm_fb_helper_set_par, \
> +	.fb_setcmap	= drm_fb_helper_setcmap, \
> +	.fb_blank	= drm_fb_helper_blank, \
> +	.fb_pan_display	= drm_fb_helper_pan_display
> +
>  #ifdef CONFIG_DRM_FBDEV_EMULATION
>  int drm_fb_helper_modinit(void);
>  void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,
> -- 
> 2.7.3
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 08/20] drm/exynos: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Inki Dae]

 Acked-by: Inki Dae <inki.dae@samsung.com>

Thanks,
Inki Dae

2016-09-30 5:48 GMT+09:00 Stefan Christ <contact@stefanchrist.eu>:
> Cc: Inki Dae <inki.dae@samsung.com>
> Cc: Joonyoung Shim <jy0922.shim@samsung.com>
> Cc: Seung-Woo Kim <sw0312.kim@samsung.com>
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
> ---
>  drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> index 4cfb39d..9f35deb 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c
> @@ -63,15 +63,11 @@ static int exynos_drm_fb_mmap(struct fb_info *info,
>
>  static struct fb_ops exynos_drm_fb_ops = {
>         .owner          = THIS_MODULE,
> +       DRM_FB_HELPER_DEFAULT_OPS,
>         .fb_mmap        = exynos_drm_fb_mmap,
>         .fb_fillrect    = drm_fb_helper_cfb_fillrect,
>         .fb_copyarea    = drm_fb_helper_cfb_copyarea,
>         .fb_imageblit   = drm_fb_helper_cfb_imageblit,
> -       .fb_check_var   = drm_fb_helper_check_var,
> -       .fb_set_par     = drm_fb_helper_set_par,
> -       .fb_blank       = drm_fb_helper_blank,
> -       .fb_pan_display = drm_fb_helper_pan_display,
> -       .fb_setcmap     = drm_fb_helper_setcmap,
>  };
>
>  static int exynos_drm_fbdev_update(struct drm_fb_helper *helper,
> --
> 2.7.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 02/20] drm/amdgpu: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Daniel Vetter]

On Thu, Sep 29, 2016 at 10:48:38PM +0200, Stefan Christ wrote:
> Cc: Alex Deucher <alexander.deucher@amd.com>
> Cc: Christian König <christian.koenig@amd.com>
> Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> index 9191467..6b80982 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
> @@ -50,14 +50,10 @@ struct amdgpu_fbdev {
>  
>  static struct fb_ops amdgpufb_ops = {
>  	.owner = THIS_MODULE,
> -	.fb_check_var = drm_fb_helper_check_var,
> -	.fb_set_par = drm_fb_helper_set_par,
> +	DRM_FB_HELPER_DEFAULT_OPS,
>  	.fb_fillrect = drm_fb_helper_cfb_fillrect,
>  	.fb_copyarea = drm_fb_helper_cfb_copyarea,
>  	.fb_imageblit = drm_fb_helper_cfb_imageblit,
> -	.fb_pan_display = drm_fb_helper_pan_display,
> -	.fb_blank = drm_fb_helper_blank,
> -	.fb_setcmap = drm_fb_helper_setcmap,
>  	.fb_debug_enter = drm_fb_helper_debug_enter,
>  	.fb_debug_leave = drm_fb_helper_debug_leave,

Ok, wanted to start vacuuming stuff up, but then realized that this
doesn't share the fb_fillrect, fb_copyarea, fb_imageblit and
fb_debug_enter/leave funcs. Not sharing fb_mmap makes sense, because that
must be special. But all the others can be shared. Any reasons for not
doing so?
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 04/20] drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Daniel Vetter]

On Thu, Sep 29, 2016 at 10:48:40PM +0200, Stefan Christ wrote:
> Cc: Dave Airlie <airlied@redhat.com>
> Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
> ---
>  drivers/gpu/drm/ast/ast_fb.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> index c017a93..b604fdd 100644
> --- a/drivers/gpu/drm/ast/ast_fb.c
> +++ b/drivers/gpu/drm/ast/ast_fb.c
> @@ -150,14 +150,10 @@ static void ast_imageblit(struct fb_info *info,
>  
>  static struct fb_ops astfb_ops = {
>  	.owner = THIS_MODULE,
> -	.fb_check_var = drm_fb_helper_check_var,
> -	.fb_set_par = drm_fb_helper_set_par,
> +	DRM_FB_HELPER_DEFAULT_OPS,
>  	.fb_fillrect = ast_fillrect,
>  	.fb_copyarea = ast_copyarea,
>  	.fb_imageblit = ast_imageblit,

Ah, here's the likely reason for not sharing these, ast/cirrus have their
special dirtying stuff for fbdev emulation. And because the fbdev mmap
must have a stable pointer it can't use the ttm bo mmap magic of
automatically picking the right place for the mmap.

I'd say just leave these 2 drivers out as special cases.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 04/20] drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Lengfeld]

Hi Daniel,

On Tue, Oct 25, 2016 at 04:57:37PM +0200, Daniel Vetter wrote:
> On Thu, Sep 29, 2016 at 10:48:40PM +0200, Stefan Christ wrote:
> > Cc: Dave Airlie <airlied@redhat.com>
> > Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
> > ---
> >  drivers/gpu/drm/ast/ast_fb.c | 6 +-----
> >  1 file changed, 1 insertion(+), 5 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> > index c017a93..b604fdd 100644
> > --- a/drivers/gpu/drm/ast/ast_fb.c
> > +++ b/drivers/gpu/drm/ast/ast_fb.c
> > @@ -150,14 +150,10 @@ static void ast_imageblit(struct fb_info *info,
> >  
> >  static struct fb_ops astfb_ops = {
> >  	.owner = THIS_MODULE,
> > -	.fb_check_var = drm_fb_helper_check_var,
> > -	.fb_set_par = drm_fb_helper_set_par,
> > +	DRM_FB_HELPER_DEFAULT_OPS,
> >  	.fb_fillrect = ast_fillrect,
> >  	.fb_copyarea = ast_copyarea,
> >  	.fb_imageblit = ast_imageblit,
> 
> Ah, here's the likely reason for not sharing these, ast/cirrus have their
> special dirtying stuff for fbdev emulation. And because the fbdev mmap
> must have a stable pointer it can't use the ttm bo mmap magic of
> automatically picking the right place for the mmap.
> 
> I'd say just leave these 2 drivers out as special cases.
> -Daniel

Hmm. There are even more drivers using special implementations like the
mgag200 using function mga_fillrect(), which is a wrapper around
drm_fb_helper_sys_fillrect().

Even if the drivers ast/cirrus/.. are left out, there are still two
different fb_fillrect, fb_copyarea and fb_imageblit implementations:
   1/  drm_fb_helper_sys_*() and 
   2/  drm_fb_helper_cfb_*()
used by different drivers. I don't know which one should be preferred.

Including fb_debug_enter and fb_debug_leave in DRM_FB_HELPER_DEFAULT_OPS
is not a problem since there is only a single implementation yet.

Should I resend this series (without the first patch), but with
additional memebers fb_debug_enter and fb_debug_leave?

Kind regards,
	Stefan Christ

> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 04/20] drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Daniel Vetter]

On Wed, Oct 26, 2016 at 8:47 PM, Stefan Lengfeld
<contact@stefanchrist.eu> wrote:
>
> On Tue, Oct 25, 2016 at 04:57:37PM +0200, Daniel Vetter wrote:
>> On Thu, Sep 29, 2016 at 10:48:40PM +0200, Stefan Christ wrote:
>> > Cc: Dave Airlie <airlied@redhat.com>
>> > Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
>> > ---
>> >  drivers/gpu/drm/ast/ast_fb.c | 6 +-----
>> >  1 file changed, 1 insertion(+), 5 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
>> > index c017a93..b604fdd 100644
>> > --- a/drivers/gpu/drm/ast/ast_fb.c
>> > +++ b/drivers/gpu/drm/ast/ast_fb.c
>> > @@ -150,14 +150,10 @@ static void ast_imageblit(struct fb_info *info,
>> >
>> >  static struct fb_ops astfb_ops = {
>> >     .owner = THIS_MODULE,
>> > -   .fb_check_var = drm_fb_helper_check_var,
>> > -   .fb_set_par = drm_fb_helper_set_par,
>> > +   DRM_FB_HELPER_DEFAULT_OPS,
>> >     .fb_fillrect = ast_fillrect,
>> >     .fb_copyarea = ast_copyarea,
>> >     .fb_imageblit = ast_imageblit,
>>
>> Ah, here's the likely reason for not sharing these, ast/cirrus have their
>> special dirtying stuff for fbdev emulation. And because the fbdev mmap
>> must have a stable pointer it can't use the ttm bo mmap magic of
>> automatically picking the right place for the mmap.
>>
>> I'd say just leave these 2 drivers out as special cases.
>> -Daniel
>
> Hmm. There are even more drivers using special implementations like the
> mgag200 using function mga_fillrect(), which is a wrapper around
> drm_fb_helper_sys_fillrect().

Hm, mga_fillrect is like ast/cirrus.

> Even if the drivers ast/cirrus/.. are left out, there are still two
> different fb_fillrect, fb_copyarea and fb_imageblit implementations:
>    1/  drm_fb_helper_sys_*() and
>    2/  drm_fb_helper_cfb_*()
> used by different drivers. I don't know which one should be preferred.

Hm, every day I learn something new about fbdev. Totally missed that
there's 2 different kinds of helpers, and I think we do indeed need
both.

> Including fb_debug_enter and fb_debug_leave in DRM_FB_HELPER_DEFAULT_OPS
> is not a problem since there is only a single implementation yet.
>
> Should I resend this series (without the first patch), but with
> additional memebers fb_debug_enter and fb_debug_leave?

Yeah I think that'd be reasonable. For the sys/cfb stuff, what about
adding new #defines for those 2, e.g. DRM_FB_HELPER_SYS_OPS and
DRM_FB_HELPER_CFB_OPS? Maybe as a follow-up series of course, if you
have time. When resending please pick up the acks/reviews from this
series (but annoted with a v1 or so.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 04/20] drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Daniel Vetter]

On Wed, Oct 26, 2016 at 09:15:15PM +0200, Daniel Vetter wrote:
> On Wed, Oct 26, 2016 at 8:47 PM, Stefan Lengfeld
> <contact@stefanchrist.eu> wrote:
> >
> > On Tue, Oct 25, 2016 at 04:57:37PM +0200, Daniel Vetter wrote:
> >> On Thu, Sep 29, 2016 at 10:48:40PM +0200, Stefan Christ wrote:
> >> > Cc: Dave Airlie <airlied@redhat.com>
> >> > Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
> >> > ---
> >> >  drivers/gpu/drm/ast/ast_fb.c | 6 +-----
> >> >  1 file changed, 1 insertion(+), 5 deletions(-)
> >> >
> >> > diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> >> > index c017a93..b604fdd 100644
> >> > --- a/drivers/gpu/drm/ast/ast_fb.c
> >> > +++ b/drivers/gpu/drm/ast/ast_fb.c
> >> > @@ -150,14 +150,10 @@ static void ast_imageblit(struct fb_info *info,
> >> >
> >> >  static struct fb_ops astfb_ops = {
> >> >     .owner = THIS_MODULE,
> >> > -   .fb_check_var = drm_fb_helper_check_var,
> >> > -   .fb_set_par = drm_fb_helper_set_par,
> >> > +   DRM_FB_HELPER_DEFAULT_OPS,
> >> >     .fb_fillrect = ast_fillrect,
> >> >     .fb_copyarea = ast_copyarea,
> >> >     .fb_imageblit = ast_imageblit,
> >>
> >> Ah, here's the likely reason for not sharing these, ast/cirrus have their
> >> special dirtying stuff for fbdev emulation. And because the fbdev mmap
> >> must have a stable pointer it can't use the ttm bo mmap magic of
> >> automatically picking the right place for the mmap.
> >>
> >> I'd say just leave these 2 drivers out as special cases.
> >> -Daniel
> >
> > Hmm. There are even more drivers using special implementations like the
> > mgag200 using function mga_fillrect(), which is a wrapper around
> > drm_fb_helper_sys_fillrect().
> 
> Hm, mga_fillrect is like ast/cirrus.
> 
> > Even if the drivers ast/cirrus/.. are left out, there are still two
> > different fb_fillrect, fb_copyarea and fb_imageblit implementations:
> >    1/  drm_fb_helper_sys_*() and
> >    2/  drm_fb_helper_cfb_*()
> > used by different drivers. I don't know which one should be preferred.
> 
> Hm, every day I learn something new about fbdev. Totally missed that
> there's 2 different kinds of helpers, and I think we do indeed need
> both.
> 
> > Including fb_debug_enter and fb_debug_leave in DRM_FB_HELPER_DEFAULT_OPS
> > is not a problem since there is only a single implementation yet.
> >
> > Should I resend this series (without the first patch), but with
> > additional memebers fb_debug_enter and fb_debug_leave?
> 
> Yeah I think that'd be reasonable. For the sys/cfb stuff, what about
> adding new #defines for those 2, e.g. DRM_FB_HELPER_SYS_OPS and
> DRM_FB_HELPER_CFB_OPS? Maybe as a follow-up series of course, if you
> have time. When resending please pick up the acks/reviews from this
> series (but annoted with a v1 or so.

Are you still working on a v2, or should I just pick up v1 for now?
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 04/20] drm/ast: use DRM_FB_HELPER_DEFAULT_OPS for fb_ops

[Stefan Lengfeld]

Hi Daniel,

On Tue, Nov 08, 2016 at 06:12:31PM +0100, Daniel Vetter wrote:
> On Wed, Oct 26, 2016 at 09:15:15PM +0200, Daniel Vetter wrote:
> > On Wed, Oct 26, 2016 at 8:47 PM, Stefan Lengfeld
> > <contact@stefanchrist.eu> wrote:
> > >
> > > On Tue, Oct 25, 2016 at 04:57:37PM +0200, Daniel Vetter wrote:
> > >> On Thu, Sep 29, 2016 at 10:48:40PM +0200, Stefan Christ wrote:
> > >> > Cc: Dave Airlie <airlied@redhat.com>
> > >> > Signed-off-by: Stefan Christ <contact@stefanchrist.eu>
> > >> > ---
> > >> >  drivers/gpu/drm/ast/ast_fb.c | 6 +-----
> > >> >  1 file changed, 1 insertion(+), 5 deletions(-)
> > >> >
> > >> > diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> > >> > index c017a93..b604fdd 100644
> > >> > --- a/drivers/gpu/drm/ast/ast_fb.c
> > >> > +++ b/drivers/gpu/drm/ast/ast_fb.c
> > >> > @@ -150,14 +150,10 @@ static void ast_imageblit(struct fb_info *info,
> > >> >
> > >> >  static struct fb_ops astfb_ops = {
> > >> >     .owner = THIS_MODULE,
> > >> > -   .fb_check_var = drm_fb_helper_check_var,
> > >> > -   .fb_set_par = drm_fb_helper_set_par,
> > >> > +   DRM_FB_HELPER_DEFAULT_OPS,
> > >> >     .fb_fillrect = ast_fillrect,
> > >> >     .fb_copyarea = ast_copyarea,
> > >> >     .fb_imageblit = ast_imageblit,
> > >>
> > >> Ah, here's the likely reason for not sharing these, ast/cirrus have their
> > >> special dirtying stuff for fbdev emulation. And because the fbdev mmap
> > >> must have a stable pointer it can't use the ttm bo mmap magic of
> > >> automatically picking the right place for the mmap.
> > >>
> > >> I'd say just leave these 2 drivers out as special cases.
> > >> -Daniel
> > >
> > > Hmm. There are even more drivers using special implementations like the
> > > mgag200 using function mga_fillrect(), which is a wrapper around
> > > drm_fb_helper_sys_fillrect().
> > 
> > Hm, mga_fillrect is like ast/cirrus.
> > 
> > > Even if the drivers ast/cirrus/.. are left out, there are still two
> > > different fb_fillrect, fb_copyarea and fb_imageblit implementations:
> > >    1/  drm_fb_helper_sys_*() and
> > >    2/  drm_fb_helper_cfb_*()
> > > used by different drivers. I don't know which one should be preferred.
> > 
> > Hm, every day I learn something new about fbdev. Totally missed that
> > there's 2 different kinds of helpers, and I think we do indeed need
> > both.
> > 
> > > Including fb_debug_enter and fb_debug_leave in DRM_FB_HELPER_DEFAULT_OPS
> > > is not a problem since there is only a single implementation yet.
> > >
> > > Should I resend this series (without the first patch), but with
> > > additional memebers fb_debug_enter and fb_debug_leave?
> > 
> > Yeah I think that'd be reasonable. For the sys/cfb stuff, what about
> > adding new #defines for those 2, e.g. DRM_FB_HELPER_SYS_OPS and
> > DRM_FB_HELPER_CFB_OPS? Maybe as a follow-up series of course, if you
> > have time. When resending please pick up the acks/reviews from this
> > series (but annoted with a v1 or so.
> 
> Are you still working on a v2, or should I just pick up v1 for now?
> -Daniel

I will send a v2 patch set in the next days.

Kind regards,
	Stefan Christ
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel