leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: clean up plane bpp confusion

Browse Source 
- 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>
This commit is contained in:
Daniel Vetter 2013-03-27 00:45:00 +01:00
parent 3600836585
commit baba133ae5
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/i915/intel_display.c
View File

@ -2113,8 +2113,7 @@ static int i9xx_update_plane(struct drm_crtc *crtc, struct drm_framebuffer *fb,
dspcntr |= DISPPLANE_RGBX101010; dspcntr |= DISPPLANE_RGBX101010;
break; break;
default: default:
DRM_ERROR("Unknown pixel format 0x%08x\n", fb->pixel_format); BUG();
return -EINVAL;
} }
if (INTEL_INFO(dev)->gen >= 4) { if (INTEL_INFO(dev)->gen >= 4) {
@ -2207,8 +2206,7 @@ static int ironlake_update_plane(struct drm_crtc *crtc,
dspcntr |= DISPPLANE_RGBX101010; dspcntr |= DISPPLANE_RGBX101010;
break; break;
default: default:
DRM_ERROR("Unknown pixel format 0x%08x\n", fb->pixel_format); BUG();
return -EINVAL;
} }
if (obj->tiling_mode != I915_TILING_NONE) if (obj->tiling_mode != I915_TILING_NONE)
@ -7400,21 +7398,19 @@ pipe_config_set_bpp(struct drm_crtc *crtc,
bpp = 8*3; bpp = 8*3;
break; break;
case 30: case 30:
if (INTEL_INFO(dev)->gen < 4) {
DRM_DEBUG_KMS("10 bpc not supported on gen2/3\n");
return -EINVAL;
}
bpp = 10*3; bpp = 10*3;
break; break;
case 48: /* TODO: gen4+ supports 16 bpc floating point, too. */
bpp = 12*3;
break;
default: default:
DRM_DEBUG_KMS("unsupported depth\n"); DRM_DEBUG_KMS("unsupported depth\n");
return -EINVAL; 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; pipe_config->pipe_bpp = bpp;
/* Clamp display bpp to EDID value */ /* Clamp display bpp to EDID value */