Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7531208b authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Remove ARBG/ABGR 2101010 on platform not supporting those formats 



We just have have VLV and CHV sprites programming the hardware
differently for the ABGR2101010 so keep them working.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 67fe7dc5

drivers/gpu/drm/i915/intel_display.c

+7 −10
Original line number Diff line number Diff line
@@ -64,9 +64,7 @@ static const uint32_t i965_primary_formats[] = { 
	DRM_FORMAT_ARGB8888,

	DRM_FORMAT_ABGR8888,

	DRM_FORMAT_XRGB2101010,

	DRM_FORMAT_ARGB2101010,

	DRM_FORMAT_XBGR2101010,

	DRM_FORMAT_ABGR2101010,

};



/* Cursor formats */
@@ -2716,11 +2714,9 @@ static void i9xx_update_primary_plane(struct drm_crtc *crtc, 
		dspcntr |= DISPPLANE_RGBX888;

		break;

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_ARGB2101010:

		dspcntr |= DISPPLANE_BGRX101010;

		break;

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_ABGR2101010:

		dspcntr |= DISPPLANE_RGBX101010;

		break;

	default:
@@ -2824,11 +2820,9 @@ static void ironlake_update_primary_plane(struct drm_crtc *crtc, 
		dspcntr |= DISPPLANE_RGBX888;

		break;

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_ARGB2101010:

		dspcntr |= DISPPLANE_BGRX101010;

		break;

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_ABGR2101010:

		dspcntr |= DISPPLANE_RGBX101010;

		break;

	default:
@@ -4518,9 +4512,7 @@ skl_update_scaler_users( 
		case DRM_FORMAT_ABGR8888:

		case DRM_FORMAT_ARGB8888:

		case DRM_FORMAT_XRGB2101010:

		case DRM_FORMAT_ARGB2101010:

		case DRM_FORMAT_XBGR2101010:

		case DRM_FORMAT_ABGR2101010:

		case DRM_FORMAT_YUYV:

		case DRM_FORMAT_YVYU:

		case DRM_FORMAT_UYVY:
@@ -13999,15 +13991,20 @@ static int intel_framebuffer_init(struct drm_device *dev, 
	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ABGR8888:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_ARGB2101010:

	case DRM_FORMAT_XBGR2101010:

	case DRM_FORMAT_ABGR2101010:

		if (INTEL_INFO(dev)->gen < 4) {

			DRM_DEBUG("unsupported pixel format: %s\n",

				  drm_get_format_name(mode_cmd->pixel_format));

			return -EINVAL;

		}

		break;

	case DRM_FORMAT_ABGR2101010:

		if (!IS_VALLEYVIEW(dev)) {

			DRM_DEBUG("unsupported pixel format: %s\n",

				  drm_get_format_name(mode_cmd->pixel_format));

			return -EINVAL;

		}

		break;

	case DRM_FORMAT_YUYV:

	case DRM_FORMAT_UYVY:

	case DRM_FORMAT_YVYU: