Skip to content

Commit

Permalink
drm/i915: clean up plane bpp confusion
Browse files Browse the repository at this point in the history
- There is no 16bpc linear color format in our hw. gen4+ has a 16 bpc
  float layout, but we don't really support it.
- 10bpc is a gen4+ feature, fix up the support for it.
- Update_plane should never see a wrong fb bpp value, BUG in the
  corresponding cases.

v2: Rebase on top of Ville's plane pixel layout changes.

v3: Actually drop the old gen4 check for 10bpc planes, spotted
by Ville Syrjälä.

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Mar 28, 2013
1 parent 3600836 commit baba133
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -2113,8 +2113,7 @@ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
dspcntr |= DISPPLANE_RGBX101010;
break;
default:
DRM_ERROR("Unknown pixel format 0x%08x\n", fb->pixel_format);
return -EINVAL;
BUG();
}

if (INTEL_INFO(dev)->gen >= 4) {
Expand Down Expand Up @@ -2207,8 +2206,7 @@ static int ironlake_update_plane(struct drm_crtc *crtc,
dspcntr |= DISPPLANE_RGBX101010;
break;
default:
DRM_ERROR("Unknown pixel format 0x%08x\n", fb->pixel_format);
return -EINVAL;
BUG();
}

if (obj->tiling_mode != I915_TILING_NONE)
Expand Down Expand Up @@ -7400,21 +7398,19 @@ pipe_config_set_bpp(struct drm_crtc *crtc,
bpp = 8*3;
break;
case 30:
if (INTEL_INFO(dev)->gen < 4) {
DRM_DEBUG_KMS("10 bpc not supported on gen2/3\n");
return -EINVAL;
}

bpp = 10*3;
break;
case 48:
bpp = 12*3;
break;
/* TODO: gen4+ supports 16 bpc floating point, too. */
default:
DRM_DEBUG_KMS("unsupported depth\n");
return -EINVAL;
}

if (fb->depth > 24 && !HAS_PCH_SPLIT(dev)) {
DRM_DEBUG_KMS("high depth not supported on gmch platforms\n");
return -EINVAL;
}

pipe_config->pipe_bpp = bpp;

/* Clamp display bpp to EDID value */
Expand Down

0 comments on commit baba133

Please sign in to comment.