| 240,7 → 240,7 |
|---|
| } |
| EXPORT_SYMBOL(drm_fb_helper_init_crtc_count); |
| |
| static void setcolreg(struct drm_crtc *crtc, u16 red, u16 green, |
| static int setcolreg(struct drm_crtc *crtc, u16 red, u16 green, |
| u16 blue, u16 regno, struct fb_info *info) |
| { |
| struct drm_fb_helper *fb_helper = info->par; |
| 247,6 → 247,23 |
|---|
| struct drm_framebuffer *fb = fb_helper->fb; |
| int pindex; |
| |
| if (info->fix.visual == FB_VISUAL_TRUECOLOR) { |
| u32 *palette; |
| u32 value; |
| /* place color in psuedopalette */ |
| if (regno > 16) |
| return -EINVAL; |
| palette = (u32 *)info->pseudo_palette; |
| red >>= (16 - info->var.red.length); |
| green >>= (16 - info->var.green.length); |
| blue >>= (16 - info->var.blue.length); |
| value = (red << info->var.red.offset) | |
| (green << info->var.green.offset) | |
| (blue << info->var.blue.offset); |
| palette[regno] = value; |
| return 0; |
| } |
| |
| pindex = regno; |
| |
| if (fb->bits_per_pixel == 16) { |
| 253,9 → 270,9 |
|---|
| pindex = regno << 3; |
| |
| if (fb->depth == 16 && regno > 63) |
| return; |
| return -EINVAL; |
| if (fb->depth == 15 && regno > 31) |
| return; |
| return -EINVAL; |
| |
| if (fb->depth == 16) { |
| u16 r, g, b; |
| 279,14 → 296,8 |
|---|
| |
| if (fb->depth != 16) |
| fb_helper->funcs->gamma_set(crtc, red, green, blue, pindex); |
| |
| if (regno < 16 && info->fix.visual == FB_VISUAL_DIRECTCOLOR) { |
| ((u32 *) fb->pseudo_palette)[regno] = |
| (regno << info->var.red.offset) | |
| (regno << info->var.green.offset) | |
| (regno << info->var.blue.offset); |
| return 0; |
| } |
| } |
| |
| int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info) |
| { |
| 322,7 → 333,9 |
|---|
| if (transp) |
| htransp = *transp++; |
| |
| setcolreg(crtc, hred, hgreen, hblue, start++, info); |
| rc = setcolreg(crtc, hred, hgreen, hblue, start++, info); |
| if (rc) |
| return rc; |
| } |
| crtc_funcs->load_lut(crtc); |
| } |
| 341,6 → 354,7 |
|---|
| struct drm_device *dev = fb_helper->dev; |
| struct drm_crtc *crtc; |
| int i; |
| int ret; |
| |
| if (regno > 255) |
| return 1; |
| 354,8 → 368,10 |
|---|
| if (i == fb_helper->crtc_count) |
| continue; |
| |
| ret = setcolreg(crtc, red, green, blue, regno, info); |
| if (ret) |
| return ret; |
| |
| setcolreg(crtc, red, green, blue, regno, info); |
| crtc_funcs->load_lut(crtc); |
| } |
| return 0; |
| 702,7 → 718,7 |
|---|
| { |
| info->fix.type = FB_TYPE_PACKED_PIXELS; |
| info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR : |
| FB_VISUAL_DIRECTCOLOR; |
| FB_VISUAL_TRUECOLOR; |
| info->fix.type_aux = 0; |
| info->fix.xpanstep = 1; /* doing it in hw */ |
| info->fix.ypanstep = 1; /* doing it in hw */ |