aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-10-04 19:58:02 -0400
committerDave Airlie <airlied@redhat.com>2009-10-04 20:00:59 -0400
commit068143d38804825d59d951a192cfadd2e22f457d (patch)
tree87acefe03fe5a97577e90f89c79909aad5ba2a5e /drivers/gpu/drm/i915
parentdfee5614e4d83a32cef9193a8b19bc1d8900f93d (diff)
drm/fb: add setcmap and fix 8-bit support.
This adds support for the setcmap api and fixes the 8bpp support at least on radeon hardware. It adds a new load_lut hook which can be called once the color map is setup. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c1
-rw-r--r--drivers/gpu/drm/i915/intel_fb.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 155719ff99d1..a840cb1bd36a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3513,6 +3513,7 @@ static const struct drm_crtc_helper_funcs intel_helper_funcs = {
3513 .mode_set_base = intel_pipe_set_base, 3513 .mode_set_base = intel_pipe_set_base,
3514 .prepare = intel_crtc_prepare, 3514 .prepare = intel_crtc_prepare,
3515 .commit = intel_crtc_commit, 3515 .commit = intel_crtc_commit,
3516 .load_lut = intel_crtc_load_lut,
3516}; 3517};
3517 3518
3518static const struct drm_crtc_funcs intel_crtc_funcs = { 3519static const struct drm_crtc_funcs intel_crtc_funcs = {
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index e85d7e9eed7d..3ee8db1fbcd0 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -60,6 +60,7 @@ static struct fb_ops intelfb_ops = {
60 .fb_imageblit = cfb_imageblit, 60 .fb_imageblit = cfb_imageblit,
61 .fb_pan_display = drm_fb_helper_pan_display, 61 .fb_pan_display = drm_fb_helper_pan_display,
62 .fb_blank = drm_fb_helper_blank, 62 .fb_blank = drm_fb_helper_blank,
63 .fb_setcmap = drm_fb_helper_setcmap,
63}; 64};
64 65
65static struct drm_fb_helper_funcs intel_fb_helper_funcs = { 66static struct drm_fb_helper_funcs intel_fb_helper_funcs = {
@@ -206,7 +207,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
206 207
207// memset(info->screen_base, 0, size); 208// memset(info->screen_base, 0, size);
208 209
209 drm_fb_helper_fill_fix(info, fb->pitch); 210 drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);
210 drm_fb_helper_fill_var(info, fb, fb_width, fb_height); 211 drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
211 212
212 /* FIXME: we really shouldn't expose mmio space at all */ 213 /* FIXME: we really shouldn't expose mmio space at all */