From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vijay Purushothaman Subject: Re: [PATCH v2] drm/i915: fix color order for BGR formats on IVB Date: Thu, 23 Aug 2012 11:24:31 +0530 Message-ID: <5035C597.2020703@intel.com> References: <1345627065-27002-1-git-send-email-vijay.a.purushothaman@intel.com> <5034D7DB.8020903@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; Format="flowed" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id D1B699E74E for ; Wed, 22 Aug 2012 22:54:32 -0700 (PDT) In-Reply-To: <5034D7DB.8020903@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On 8/22/2012 6:30 PM, Antti Koskip=E4=E4 wrote: > Hi, > > On 08/22/12 12:17, Vijay Purushothaman wrote: >> This is already fixed for ILK and SNB in the below commit but somehow >> IVB is missed. >> >> commit ab2f9df10dd955f1fc0a8650e377588c98f1c029 >> Author: Jesse Barnes >> Date: Mon Feb 27 12:40:10 2012 -0800 >> >> drm/i915: fix color order for BGR formats on SNB >> >> Had the wrong bits and field definitions. >> >> Signed-off-by: Vijay Purushothaman >> Signed-off-by: Ben Lin >> --- >> drivers/gpu/drm/i915/intel_sprite.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/= intel_sprite.c >> index cc8df4d..6045a01 100644 >> --- a/drivers/gpu/drm/i915/intel_sprite.c >> +++ b/drivers/gpu/drm/i915/intel_sprite.c >> @@ -54,17 +54,17 @@ ivb_update_plane(struct drm_plane *plane, struct drm= _framebuffer *fb, >> >> /* Mask out pixel format bits in case we change it */ >> sprctl &=3D ~SPRITE_PIXFORMAT_MASK; >> - sprctl &=3D ~SPRITE_RGB_ORDER_RGBX; >> + sprctl &=3D ~SPRITE_RGB_ORDER_XBGR; > Are you sure about this? Where is the #define for _XBGR? > Thanks for the catch. I assumed SPRITE_RGB_ORDER_XBGR as defined similar = to DVS_RGB_ORDER_XBGR for SNB. The original code snippet is correct. >> sprctl &=3D ~SPRITE_YUV_BYTE_ORDER_MASK; >> sprctl &=3D ~SPRITE_TILED; >> >> switch (fb->pixel_format) { >> case DRM_FORMAT_XBGR8888: >> - sprctl |=3D SPRITE_FORMAT_RGBX888; >> + sprctl |=3D SPRITE_FORMAT_RGBX888 | SPRITE_RGB_ORDER_RGBX; >> pixel_size =3D 4; >> break; >> case DRM_FORMAT_XRGB8888: >> - sprctl |=3D SPRITE_FORMAT_RGBX888 | SPRITE_RGB_ORDER_RGBX; >> + sprctl |=3D SPRITE_FORMAT_RGBX888; >> pixel_size =3D 4; >> break; >> case DRM_FORMAT_YUYV: >