[4/4] drm/i915: Don't expose ARGB1555 on gen2/3
diff mbox

Message ID 1431713163-23900-5-git-send-email-damien.lespiau@intel.com
State New
Headers show

Commit Message

Lespiau, Damien May 15, 2015, 6:06 p.m. UTC
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Ville Syrjälä May 15, 2015, 6:57 p.m. UTC | #1
On Fri, May 15, 2015 at 07:06:03PM +0100, Damien Lespiau wrote:
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>

Based on the docs these probably only support alpha with the 8888
format.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index c784f9a..c957a45 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -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,
>  };
>  
> @@ -2707,7 +2706,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:
> @@ -13970,7 +13968,6 @@ static int intel_framebuffer_init(struct drm_device *dev,
>  	case DRM_FORMAT_XRGB8888:
>  		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));
> -- 
> 2.1.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter May 18, 2015, 8:34 a.m. UTC | #2
On Fri, May 15, 2015 at 09:57:56PM +0300, Ville Syrjälä wrote:
> On Fri, May 15, 2015 at 07:06:03PM +0100, Damien Lespiau wrote:
> > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> 
> Based on the docs these probably only support alpha with the 8888
> format.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

All four patches merged to dinq, thanks.
-Daniel
Shuang He May 18, 2015, 2:57 p.m. UTC | #3
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6420
-------------------------------------Summary-------------------------------------
Platform          Delta          drm-intel-nightly          Series Applied
PNV                 -1              272/272              271/272
ILK                 -1              302/302              301/302
SNB                 -3              315/315              312/315
IVB                 -11              343/343              332/343
BYT                                  287/287              287/287
BDW                                  317/317              317/317
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
*PNV  igt@gem_fence_thrash@bo-write-verify-threaded-none      PASS(2)      FAIL(1)
*ILK  igt@kms_render@direct-render      PASS(2)      FAIL(1)
*SNB  igt@kms_cursor_crc@cursor-size-change      PASS(2)      FAIL(1)
*SNB  igt@pm_rpm@cursor      PASS(2)      FAIL(1)
 SNB  igt@pm_rpm@dpms-mode-unset-non-lpsp      DMESG_WARN(8)PASS(1)      DMESG_WARN(1)
(dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x
*IVB  igt@kms_cursor_crc@cursor-128x128-onscreen      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-128x128-random      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-128x128-sliding      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-256x256-offscreen      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-256x256-onscreen      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-256x256-sliding      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-64x64-offscreen      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-64x64-onscreen      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-64x64-random      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-64x64-sliding      PASS(2)      FAIL(1)
*IVB  igt@kms_cursor_crc@cursor-size-change      PASS(2)      FAIL(1)
Note: You need to pay more attention to line start with '*'

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c784f9a..c957a45 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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,
 };
 
@@ -2707,7 +2706,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:
@@ -13970,7 +13968,6 @@  static int intel_framebuffer_init(struct drm_device *dev,
 	case DRM_FORMAT_XRGB8888:
 		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));