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

Commit 57387177 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of... 

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux into drm-fixes

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux:
  drm/i915: support 32 bit BGR formats in sprite planes
  drm/i915: fix color order for BGR formats on SNB
  drm/gma500: Fix Cedarview boot failures in 3.3-rc
parents 762ad8a5 b250da79

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -2689,7 +2689,7 @@ 
#define   DVS_FORMAT_RGBX888	(2<<25)

#define   DVS_FORMAT_RGBX161616	(3<<25)

#define   DVS_SOURCE_KEY	(1<<22)

#define   DVS_RGB_ORDER_RGBX	(1<<20)

#define   DVS_RGB_ORDER_XBGR	(1<<20)

#define   DVS_YUV_BYTE_ORDER_MASK (3<<16)

#define   DVS_YUV_ORDER_YUYV	(0<<16)

#define   DVS_YUV_ORDER_UYVY	(1<<16)

drivers/gpu/drm/i915/intel_display.c

+1 −0
Original line number Diff line number Diff line
@@ -7828,6 +7828,7 @@ int intel_framebuffer_init(struct drm_device *dev, 
	case DRM_FORMAT_RGB332:

	case DRM_FORMAT_RGB565:

	case DRM_FORMAT_XRGB8888:

	case DRM_FORMAT_XBGR8888:

	case DRM_FORMAT_ARGB8888:

	case DRM_FORMAT_XRGB2101010:

	case DRM_FORMAT_ARGB2101010:

drivers/gpu/drm/i915/intel_sprite.c

+3 −3
Original line number Diff line number Diff line
@@ -225,16 +225,16 @@ snb_update_plane(struct drm_plane *plane, struct drm_framebuffer *fb, 


	/* Mask out pixel format bits in case we change it */

	dvscntr &= ~DVS_PIXFORMAT_MASK;

	dvscntr &= ~DVS_RGB_ORDER_RGBX;

	dvscntr &= ~DVS_RGB_ORDER_XBGR;

	dvscntr &= ~DVS_YUV_BYTE_ORDER_MASK;



	switch (fb->pixel_format) {

	case DRM_FORMAT_XBGR8888:

		dvscntr |= DVS_FORMAT_RGBX888;

		dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_XBGR;

		pixel_size = 4;

		break;

	case DRM_FORMAT_XRGB8888:

		dvscntr |= DVS_FORMAT_RGBX888 | DVS_RGB_ORDER_RGBX;

		dvscntr |= DVS_FORMAT_RGBX888;

		pixel_size = 4;

		break;

	case DRM_FORMAT_YUYV: