drm/i915: Don't expose ARGB1555 on gen2/3
authorDamien Lespiau <damien.lespiau@intel.com>
Fri, 15 May 2015 18:06:03 +0000 (19:06 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 20 May 2015 09:26:05 +0000 (11:26 +0200)
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 73f5e5b01125a73a23495274fee9d6193a4de18a..8a3d9363918161f52b0b694ebff90593d48f7693 100644 (file)
@@ -50,7 +50,6 @@ static const uint32_t i8xx_primary_formats[] = {
        DRM_FORMAT_C8,
        DRM_FORMAT_RGB565,
        DRM_FORMAT_XRGB1555,
-       DRM_FORMAT_ARGB1555,
        DRM_FORMAT_XRGB8888,
        DRM_FORMAT_ARGB8888,
 };
@@ -2699,7 +2698,6 @@ static void i9xx_update_primary_plane(struct drm_crtc *crtc,
                dspcntr |= DISPPLANE_8BPP;
                break;
        case DRM_FORMAT_XRGB1555:
-       case DRM_FORMAT_ARGB1555:
                dspcntr |= DISPPLANE_BGRX555;
                break;
        case DRM_FORMAT_RGB565:
@@ -13981,7 +13979,6 @@ static int intel_framebuffer_init(struct drm_device *dev,
        case DRM_FORMAT_ARGB8888:
                break;
        case DRM_FORMAT_XRGB1555:
-       case DRM_FORMAT_ARGB1555:
                if (INTEL_INFO(dev)->gen > 3) {
                        DRM_DEBUG("unsupported pixel format: %s\n",
                                  drm_get_format_name(mode_cmd->pixel_format));