From patchwork Tue May 18 12:56:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Chanteperdrix X-Patchwork-Id: 100481 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4ICwW8e009696 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 May 2010 12:59:08 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o4ICubpK019265 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 18 May 2010 07:56:37 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o4ICubfk017578; Tue, 18 May 2010 07:56:37 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 29E188062D; Tue, 18 May 2010 07:56:37 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 3922480626 for ; Tue, 18 May 2010 07:56:31 -0500 (CDT) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id o4ICuUop008208 for ; Tue, 18 May 2010 07:56:30 -0500 (CDT) Received: from psmtp.com (na3sys009amx174.postini.com [74.125.149.100]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id o4ICuTBB012103 for ; Tue, 18 May 2010 07:56:30 -0500 Received: from source ([91.121.30.210]) by na3sys009amx174.postini.com ([74.125.148.10]) with SMTP; Tue, 18 May 2010 05:56:30 PDT Received: (qmail 12481 invoked by uid 503); 18 May 2010 13:00:27 -0000 Received: from b6.ovh.net (HELO mail627.ha.ovh.net) (213.186.33.56) by 27.mail-out.ovh.net with SMTP; 18 May 2010 13:00:26 -0000 Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 18 May 2010 12:56:28 -0000 Received: from lmontsouris-152-61-13-23.w80-13.abo.wanadoo.fr (HELO gaia) (80.13.140.23) by ns0.ovh.net with SMTP; 18 May 2010 12:56:26 -0000 Received: from gch by gaia with local (Exim 4.69) (envelope-from ) id 1OEMLS-0002rT-48; Tue, 18 May 2010 14:56:26 +0200 From: Gilles Chanteperdrix To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 4/4] davinci: Fix transparency handling with dm365. Date: Tue, 18 May 2010 14:56:25 +0200 Message-Id: <1274187385-10969-4-git-send-email-gilles.chanteperdrix@nexvision.fr> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1274187385-10969-3-git-send-email-gilles.chanteperdrix@nexvision.fr> References: <4BF28E20.3070701@nexvision.fr> <1274187385-10969-1-git-send-email-gilles.chanteperdrix@nexvision.fr> <1274187385-10969-2-git-send-email-gilles.chanteperdrix@nexvision.fr> <1274187385-10969-3-git-send-email-gilles.chanteperdrix@nexvision.fr> X-Ovh-Tracer-Id: 10266518302631918377 X-Ovh-Remote: 80.13.140.23 (lmontsouris-152-61-13-23.w80-13.abo.wanadoo.fr) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|U 0.5/N X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:66.55545/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.5000) s cv gt3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 18 May 2010 12:59:08 +0000 (UTC) diff --git a/drivers/media/video/davinci/davinci_osd.c b/drivers/media/video/davinci/davinci_osd.c index c285f99..a5fc01d 100644 --- a/drivers/media/video/davinci/davinci_osd.c +++ b/drivers/media/video/davinci/davinci_osd.c @@ -1231,7 +1231,7 @@ static void _davinci_disp_enable_color_key(enum davinci_osd_layer osdwin, case PIXFMT_2BPP: case PIXFMT_4BPP: case PIXFMT_8BPP: - if (cpu_is_davinci_dm355()) { + if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) { switch (osdwin) { case OSDWIN_OSD0: osd_merge(OSD_TRANSPBMPIDX_BMP0, @@ -1252,18 +1252,18 @@ static void _davinci_disp_enable_color_key(enum davinci_osd_layer osdwin, if (cpu_is_davinci_dm644x()) { osd_write(colorkey & OSD_TRANSPVAL_RGBTRANS, OSD_TRANSPVAL); - } else if (cpu_is_davinci_dm355()) { + } else if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) { osd_write(colorkey & OSD_TRANSPVALL_RGBL, OSD_TRANSPVALL); } break; case PIXFMT_YCbCrI: case PIXFMT_YCrCbI: - if (cpu_is_davinci_dm355()) + if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) osd_merge(OSD_TRANSPVALU_Y, colorkey, OSD_TRANSPVALU); break; case PIXFMT_RGB888: - if (cpu_is_davinci_dm355()) { + if (cpu_is_davinci_dm355() || cpu_is_davinci_dm365()) { osd_write(colorkey & OSD_TRANSPVALL_RGBL, OSD_TRANSPVALL); osd_merge(OSD_TRANSPVALU_RGBU, colorkey >> 16,