Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f20198 authored by James Simmons's avatar James Simmons Committed by Dave Airlie
Browse files

drm/fb: remove drm_fb_helper_setcolreg 



This patch is against the drm-fbdevfix1 branch. It removes the
drm_fb_helper_setcolreg function. The reason is that fb_setcolreg is only
used in the case where fb_setcmap is called and no fb_ops->fb_setcmap is
used. In the drm case we always need a fb_setcmap hook to handle multiple
crtcs so we don't need a fb_setcolreg hook. Please apply.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 4abe3520

drivers/gpu/drm/drm_fb_helper.c

+0 −30
Original line number Diff line number Diff line
@@ -596,36 +596,6 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info) 
}

EXPORT_SYMBOL(drm_fb_helper_setcmap);



int drm_fb_helper_setcolreg(unsigned regno,

			    unsigned red,

			    unsigned green,

			    unsigned blue,

			    unsigned transp,

			    struct fb_info *info)

{

	struct drm_fb_helper *fb_helper = info->par;

	struct drm_crtc *crtc;

	struct drm_crtc_helper_funcs *crtc_funcs;

	int i;

	int ret;



	if (regno > 255)

		return 1;



	for (i = 0; i < fb_helper->crtc_count; i++) {

		crtc = fb_helper->crtc_info[i].mode_set.crtc;

		crtc_funcs = crtc->helper_private;



		ret = setcolreg(crtc, red, green, blue, regno, info);

		if (ret)

			return ret;



		crtc_funcs->load_lut(crtc);

	}

	return 0;

}

EXPORT_SYMBOL(drm_fb_helper_setcolreg);



int drm_fb_helper_check_var(struct fb_var_screeninfo *var,

			    struct fb_info *info)

{

drivers/gpu/drm/i915/intel_fb.c

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ static struct fb_ops intelfb_ops = { 
	.owner = THIS_MODULE,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_setcolreg = drm_fb_helper_setcolreg,

	.fb_fillrect = cfb_fillrect,

	.fb_copyarea = cfb_copyarea,

	.fb_imageblit = cfb_imageblit,

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+0 −3
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static struct fb_ops nouveau_fbcon_ops = { 
	.owner = THIS_MODULE,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_setcolreg = drm_fb_helper_setcolreg,

	.fb_fillrect = cfb_fillrect,

	.fb_copyarea = cfb_copyarea,

	.fb_imageblit = cfb_imageblit,
@@ -112,7 +111,6 @@ static struct fb_ops nv04_fbcon_ops = { 
	.owner = THIS_MODULE,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_setcolreg = drm_fb_helper_setcolreg,

	.fb_fillrect = nv04_fbcon_fillrect,

	.fb_copyarea = nv04_fbcon_copyarea,

	.fb_imageblit = nv04_fbcon_imageblit,
@@ -126,7 +124,6 @@ static struct fb_ops nv50_fbcon_ops = { 
	.owner = THIS_MODULE,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_setcolreg = drm_fb_helper_setcolreg,

	.fb_fillrect = nv50_fbcon_fillrect,

	.fb_copyarea = nv50_fbcon_copyarea,

	.fb_imageblit = nv50_fbcon_imageblit,

drivers/gpu/drm/radeon/radeon_fb.c

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 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,

	.fb_setcolreg = drm_fb_helper_setcolreg,

	.fb_fillrect = cfb_fillrect,

	.fb_copyarea = cfb_copyarea,

	.fb_imageblit = cfb_imageblit,