diff options
author | James Simmons <jsimmons@infradead.org> | 2010-04-07 11:06:21 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-07 20:09:50 -0400 |
commit | b1f201980eb4a7a59277a13cf18acdbb46167ad5 (patch) | |
tree | 7c10f2ed19e731db08db035686077e64d953a1aa /drivers/gpu/drm/nouveau/nouveau_fbcon.c | |
parent | 4abe35204af82a018ca3ce6db4102aa09719698e (diff) |
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: James Simmons <jsimmons@infradead.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.c | 3 |
1 files changed, 0 insertions, 3 deletions
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, |