diff options
-rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 30 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fb.c | 1 |
4 files changed, 0 insertions, 35 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index b889eb0aaf5f..6929f5b21d2c 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
@@ -596,36 +596,6 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info) | |||
596 | } | 596 | } |
597 | EXPORT_SYMBOL(drm_fb_helper_setcmap); | 597 | EXPORT_SYMBOL(drm_fb_helper_setcmap); |
598 | 598 | ||
599 | int drm_fb_helper_setcolreg(unsigned regno, | ||
600 | unsigned red, | ||
601 | unsigned green, | ||
602 | unsigned blue, | ||
603 | unsigned transp, | ||
604 | struct fb_info *info) | ||
605 | { | ||
606 | struct drm_fb_helper *fb_helper = info->par; | ||
607 | struct drm_crtc *crtc; | ||
608 | struct drm_crtc_helper_funcs *crtc_funcs; | ||
609 | int i; | ||
610 | int ret; | ||
611 | |||
612 | if (regno > 255) | ||
613 | return 1; | ||
614 | |||
615 | for (i = 0; i < fb_helper->crtc_count; i++) { | ||
616 | crtc = fb_helper->crtc_info[i].mode_set.crtc; | ||
617 | crtc_funcs = crtc->helper_private; | ||
618 | |||
619 | ret = setcolreg(crtc, red, green, blue, regno, info); | ||
620 | if (ret) | ||
621 | return ret; | ||
622 | |||
623 | crtc_funcs->load_lut(crtc); | ||
624 | } | ||
625 | return 0; | ||
626 | } | ||
627 | EXPORT_SYMBOL(drm_fb_helper_setcolreg); | ||
628 | |||
629 | int drm_fb_helper_check_var(struct fb_var_screeninfo *var, | 599 | int drm_fb_helper_check_var(struct fb_var_screeninfo *var, |
630 | struct fb_info *info) | 600 | struct fb_info *info) |
631 | { | 601 | { |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index cc726ff0a02d..cbb8cb7144c6 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -56,7 +56,6 @@ static struct fb_ops intelfb_ops = { | |||
56 | .owner = THIS_MODULE, | 56 | .owner = THIS_MODULE, |
57 | .fb_check_var = drm_fb_helper_check_var, | 57 | .fb_check_var = drm_fb_helper_check_var, |
58 | .fb_set_par = drm_fb_helper_set_par, | 58 | .fb_set_par = drm_fb_helper_set_par, |
59 | .fb_setcolreg = drm_fb_helper_setcolreg, | ||
60 | .fb_fillrect = cfb_fillrect, | 59 | .fb_fillrect = cfb_fillrect, |
61 | .fb_copyarea = cfb_copyarea, | 60 | .fb_copyarea = cfb_copyarea, |
62 | .fb_imageblit = cfb_imageblit, | 61 | .fb_imageblit = cfb_imageblit, |
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index bc81ec7dc131..bea9f780d2c7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | |||
@@ -98,7 +98,6 @@ static struct fb_ops nouveau_fbcon_ops = { | |||
98 | .owner = THIS_MODULE, | 98 | .owner = THIS_MODULE, |
99 | .fb_check_var = drm_fb_helper_check_var, | 99 | .fb_check_var = drm_fb_helper_check_var, |
100 | .fb_set_par = drm_fb_helper_set_par, | 100 | .fb_set_par = drm_fb_helper_set_par, |
101 | .fb_setcolreg = drm_fb_helper_setcolreg, | ||
102 | .fb_fillrect = cfb_fillrect, | 101 | .fb_fillrect = cfb_fillrect, |
103 | .fb_copyarea = cfb_copyarea, | 102 | .fb_copyarea = cfb_copyarea, |
104 | .fb_imageblit = cfb_imageblit, | 103 | .fb_imageblit = cfb_imageblit, |
@@ -112,7 +111,6 @@ static struct fb_ops nv04_fbcon_ops = { | |||
112 | .owner = THIS_MODULE, | 111 | .owner = THIS_MODULE, |
113 | .fb_check_var = drm_fb_helper_check_var, | 112 | .fb_check_var = drm_fb_helper_check_var, |
114 | .fb_set_par = drm_fb_helper_set_par, | 113 | .fb_set_par = drm_fb_helper_set_par, |
115 | .fb_setcolreg = drm_fb_helper_setcolreg, | ||
116 | .fb_fillrect = nv04_fbcon_fillrect, | 114 | .fb_fillrect = nv04_fbcon_fillrect, |
117 | .fb_copyarea = nv04_fbcon_copyarea, | 115 | .fb_copyarea = nv04_fbcon_copyarea, |
118 | .fb_imageblit = nv04_fbcon_imageblit, | 116 | .fb_imageblit = nv04_fbcon_imageblit, |
@@ -126,7 +124,6 @@ static struct fb_ops nv50_fbcon_ops = { | |||
126 | .owner = THIS_MODULE, | 124 | .owner = THIS_MODULE, |
127 | .fb_check_var = drm_fb_helper_check_var, | 125 | .fb_check_var = drm_fb_helper_check_var, |
128 | .fb_set_par = drm_fb_helper_set_par, | 126 | .fb_set_par = drm_fb_helper_set_par, |
129 | .fb_setcolreg = drm_fb_helper_setcolreg, | ||
130 | .fb_fillrect = nv50_fbcon_fillrect, | 127 | .fb_fillrect = nv50_fbcon_fillrect, |
131 | .fb_copyarea = nv50_fbcon_copyarea, | 128 | .fb_copyarea = nv50_fbcon_copyarea, |
132 | .fb_imageblit = nv50_fbcon_imageblit, | 129 | .fb_imageblit = nv50_fbcon_imageblit, |
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 93cc54fac330..d3ed4afdbdee 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -52,7 +52,6 @@ static struct fb_ops radeonfb_ops = { | |||
52 | .owner = THIS_MODULE, | 52 | .owner = THIS_MODULE, |
53 | .fb_check_var = drm_fb_helper_check_var, | 53 | .fb_check_var = drm_fb_helper_check_var, |
54 | .fb_set_par = drm_fb_helper_set_par, | 54 | .fb_set_par = drm_fb_helper_set_par, |
55 | .fb_setcolreg = drm_fb_helper_setcolreg, | ||
56 | .fb_fillrect = cfb_fillrect, | 55 | .fb_fillrect = cfb_fillrect, |
57 | .fb_copyarea = cfb_copyarea, | 56 | .fb_copyarea = cfb_copyarea, |
58 | .fb_imageblit = cfb_imageblit, | 57 | .fb_imageblit = cfb_imageblit, |