cpp[BytePerPlane] can't describe the 10bit data format correctly, So we use bpp[BitPerPlane] to instead cpp.
Signed-off-by: Sandy Huang hjc@rock-chips.com --- drivers/gpu/drm/gma500/framebuffer.c | 4 ++-- drivers/gpu/drm/gma500/gma_display.c | 4 ++-- drivers/gpu/drm/gma500/mdfld_intel_display.c | 6 +++--- drivers/gpu/drm/gma500/oaktrail_crtc.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c index 218f3bb..97e9274 100644 --- a/drivers/gpu/drm/gma500/framebuffer.c +++ b/drivers/gpu/drm/gma500/framebuffer.c @@ -61,7 +61,7 @@ static int psbfb_setcolreg(unsigned regno, unsigned red, unsigned green, (transp << info->var.transp.offset);
if (regno < 16) { - switch (fb->format->cpp[0] * 8) { + switch (fb->format->bpp[0]) { case 16: ((uint32_t *) info->pseudo_palette)[regno] = v; break; @@ -221,7 +221,7 @@ static int psb_framebuffer_init(struct drm_device *dev, * 4 bytes per pixel. */ info = drm_get_format_info(dev, mode_cmd); - if (!info || !info->depth || info->cpp[0] > 4) + if (!info || !info->depth || info->bpp[0] > 32) return -EINVAL;
if (mode_cmd->pitches[0] & 63) diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c index e20ccb5..95e975e 100644 --- a/drivers/gpu/drm/gma500/gma_display.c +++ b/drivers/gpu/drm/gma500/gma_display.c @@ -78,14 +78,14 @@ int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y, if (ret < 0) goto gma_pipe_set_base_exit; start = gtt->offset; - offset = y * fb->pitches[0] + x * fb->format->cpp[0]; + offset = y * fb->pitches[0] + x * fb->format->bpp[0] / 8;
REG_WRITE(map->stride, fb->pitches[0]);
dspcntr = REG_READ(map->cntr); dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
- switch (fb->format->cpp[0] * 8) { + switch (fb->format->bpp[0]) { case 8: dspcntr |= DISPPLANE_8BPP; break; diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c index b8bfb96..5564472 100644 --- a/drivers/gpu/drm/gma500/mdfld_intel_display.c +++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c @@ -139,7 +139,7 @@ static int check_fb(struct drm_framebuffer *fb) if (!fb) return 0;
- switch (fb->format->cpp[0] * 8) { + switch (fb->format->bpp[0]) { case 8: case 16: case 24: @@ -187,13 +187,13 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y, return 0;
start = to_gtt_range(fb->obj[0])->offset; - offset = y * fb->pitches[0] + x * fb->format->cpp[0]; + offset = y * fb->pitches[0] + x * fb->format->bpp[0] / 8;
REG_WRITE(map->stride, fb->pitches[0]); dspcntr = REG_READ(map->cntr); dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
- switch (fb->format->cpp[0] * 8) { + switch (fb->format->bpp[0]) { case 8: dspcntr |= DISPPLANE_8BPP; break; diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c index 167c107..8278dfb 100644 --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c @@ -607,14 +607,14 @@ static int oaktrail_pipe_set_base(struct drm_crtc *crtc, return 0;
start = to_gtt_range(fb->obj[0])->offset; - offset = y * fb->pitches[0] + x * fb->format->cpp[0]; + offset = y * fb->pitches[0] + x * fb->format->bpp[0] / 8;
REG_WRITE(map->stride, fb->pitches[0]);
dspcntr = REG_READ(map->cntr); dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
- switch (fb->format->cpp[0] * 8) { + switch (fb->format->bpp[0]) { case 8: dspcntr |= DISPPLANE_8BPP; break;