[meego-commits] 14938: Changes to Trunk:Testing/kernel-adaptation-connext
Liu Xinyun
no_reply at build.meego.com
Thu Mar 17 11:02:40 UTC 2011
Hi,
I have made the following changes to kernel-adaptation-connext in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Liu Xinyun
[This message was auto-generated]
---
Request #14938:
submit: devel:kernel/kernel-adaptation-connext(r11) -> Trunk:Testing/kernel-adaptation-connext
Message:
BMC #14512. Update to EMGD 1.6 EC3 (build 1893). Added STM SDVO support
State: new 2011-03-17T04:02:31 xyl
Comment: None
changes files:
--------------
--- kernel-adaptation-connext.changes
+++ kernel-adaptation-connext.changes
@@ -0,0 +1,4 @@
+* Thu Mar 17 2011 Liu Xinyun <xinyun.liu at intel.com> - 2.6.37.2
+- BMC #14512. Update to EMGD 1.6 EC3 (build 1893).
+- Added STM SDVO support.
+
new:
----
linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch
spec files:
-----------
--- kernel-adaptation-connext.spec
+++ kernel-adaptation-connext.spec
@@ -251,10 +251,10 @@
Patch231: linux-2.6.37-emgd-0002-add-makefile.patch
Patch232: linux-2.6.37-emgd-0003-1859-build.patch
Patch233: linux-2.6.37-emgd-0004-add-2.6.37-support.patch
-
+Patch234: linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch234: linux-2.6.35-fatal-signals.patch
+Patch235: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -504,11 +504,12 @@
%patch232 -p1
# linux-2.6.37-emgd-0004-add-2.6.37-support.patch
%patch233 -p1
-
+# linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch
+%patch234 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch234 -p1
+%patch235 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
other changes:
--------------
++++++ linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch (new)
--- linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch
+++ linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch
+Subject: [PATCH] Update to EMGD 1.6 EC3 (build 1893).
+
+The biggest fix on the kernel side here are the changes to
+STM SDVO support.
+---
+ .../staging/emgd/emgd/display/mode/cmn/igd_mode.c | 20 ++---
+ drivers/staging/emgd/emgd/display/pi/cmn/edid.c | 8 +-
+ drivers/staging/emgd/emgd/pal/sdvo/sdvo_attr.c | 21 ++++-
+ drivers/staging/emgd/emgd/pal/sdvo/sdvo_port.c | 81 +++++++++++---------
+ drivers/staging/emgd/include/igd_pd.h | 8 ++-
+ 5 files changed, 82 insertions(+), 56 deletions(-)
+
+diff --git a/drivers/staging/emgd/emgd/display/mode/cmn/igd_mode.c b/drivers/staging/emgd/emgd/display/mode/cmn/igd_mode.c
+index 1606ff6..b6575ee 100644
+--- a/drivers/staging/emgd/emgd/display/mode/cmn/igd_mode.c
++++ b/drivers/staging/emgd/emgd/display/mode/cmn/igd_mode.c
+@@ -1,7 +1,7 @@
+ /* -*- pse-c -*-
+ *-----------------------------------------------------------------------------
+ * Filename: igd_mode.c
+- * $Revision: 1.24 $
++ * $Revision: 1.26 $
+ *-----------------------------------------------------------------------------
+ * Copyright © 2002-2010, Intel Corporation.
+ *
+@@ -1905,6 +1905,8 @@ void full_clear_fb(mode_context_t *mode_context,
+ {
+ unsigned short line, index;
+ unsigned char *fb;
++ volatile unsigned long *base_line_pitch;
++ volatile unsigned long pitch_value;
+
+ if(user_fb) {
+ fb = user_fb;
+@@ -1913,18 +1915,14 @@ void full_clear_fb(mode_context_t *mode_context,
+ fb_info->fb_base_offset);
+ EMGD_DEBUG("After gmm_map(), fb = 0x%p", fb);
+ }
++ base_line_pitch = (unsigned long *)fb;
++ pitch_value = fb_info->screen_pitch / 4;
+
+ for (line = 0; line < fb_info->height; line++) {
+- for(index = 0; index < fb_info->screen_pitch; index++) {
+- OS_MEMSET(fb +
+- (unsigned long)line *
+- (unsigned long)fb_info->screen_pitch +
+- index,
+- (mode_context->display_color>>
+- ((index%sizeof(unsigned long)) * 8)) &
+- 0xFF,
+- 1);
++ for(index = 0; index < pitch_value; index++) {
++ base_line_pitch[index] = mode_context->display_color;
+ }
++ base_line_pitch += pitch_value;
+ }
+
+ if(!user_fb) {
+@@ -2198,6 +2196,6 @@ int query_seamless(unsigned long dc,
+
+ /*----------------------------------------------------------------------------
+ * File Revision History
+- * $Id: igd_mode.c,v 1.24 2011/02/16 17:04:47 astead Exp $
++ * $Id: igd_mode.c,v 1.26 2011/03/02 23:01:46 astead Exp $
+ *----------------------------------------------------------------------------
+ */
+diff --git a/drivers/staging/emgd/emgd/display/pi/cmn/edid.c b/drivers/staging/emgd/emgd/display/pi/cmn/edid.c
+index eeebd12..ad6719a 100644
+--- a/drivers/staging/emgd/emgd/display/pi/cmn/edid.c
++++ b/drivers/staging/emgd/emgd/display/pi/cmn/edid.c
+@@ -1,7 +1,7 @@
+ /* -*- pse-c -*-
+ *-----------------------------------------------------------------------------
+ * Filename: edid.c
+- * $Revision: 1.7 $
++ * $Revision: 1.9 $
+ *-----------------------------------------------------------------------------
+ * Copyright © 2002-2010, Intel Corporation.
+ *
+@@ -941,7 +941,8 @@ int edid_parse_cea (unsigned char *buffer,
+ edid->cea->rev_number = buffer [1];
+ edid->cea->caps = buffer [3];
+
+- if(offset == 0){
++ // no data block found or data block exceeds maximum buffer size
++ if(offset == 0 || offset > 124) {
+ EMGD_ERROR("No data block and no DTD ");
+ return 1;
+ }
+@@ -1003,6 +1004,7 @@ int edid_parse_cea (unsigned char *buffer,
+ // -----------+-----------------------------------------------------------+*/
+ data_block_buffer=&buffer[4];
+ /* Start reading data block collection */
++ i = 0;
+ while(i<offset){
+ unsigned int total_bytes;
+ tag_code = (unsigned int)*data_block_buffer & 0xE0;
+@@ -1185,7 +1187,7 @@ int edid_ext_parse(
+
+ /*----------------------------------------------------------------------------
+ * File Revision History
+- * $Id: edid.c,v 1.7 2011/02/16 17:04:48 astead Exp $
++ * $Id: edid.c,v 1.9 2011/03/09 19:53:51 hpang2 Exp $
+ * $Source: /nfs/fm/proj/eia/cvsroot/koheo/linux/egd_drm/emgd/display/pi/cmn/edid.c,v $
+ *----------------------------------------------------------------------------
+ */
+diff --git a/drivers/staging/emgd/emgd/pal/sdvo/sdvo_attr.c b/drivers/staging/emgd/emgd/pal/sdvo/sdvo_attr.c
+index fb254e7..ed28627 100644
+--- a/drivers/staging/emgd/emgd/pal/sdvo/sdvo_attr.c
++++ b/drivers/staging/emgd/emgd/pal/sdvo/sdvo_attr.c
+@@ -1,7 +1,7 @@
+ /* -*- pse-c -*-
+ *-----------------------------------------------------------------------------
+ * Filename: sdvo_attr.c
+- * $Revision: 1.12 $
++ * $Revision: 1.14 $
+ *-----------------------------------------------------------------------------
+ * Copyright © 2002-2010, Intel Corporation.
+ *
+@@ -536,9 +536,16 @@ sdvo_status_t sdvo_query_static_attr(sdvo_device_context_t *p_ctx,
+ b_error = 0;
+ break;
+ case PD_ATTR_ID_RB_SWAP_MODE:
+- sdvo_read_i2c_reg(p_ctx, 0x30, &temp_reg);
+- p_attr->current_value = (temp_reg & 0x2)?1:0;
+- b_error = 0;
++ {
++ sdvo_read_i2c_reg(p_ctx, 0x30, &temp_reg);
++ if (!(p_attr->flags & PD_ATTR_FLAG_NEED_RESTORE)){
++ p_attr->current_value = (temp_reg & 0x2)?1:0;
++ }
++ /*Impossible to return correct value since the encoder
++ has been reset.*/
++
++ b_error = 0;
++ }
+ break;
+ }
+
+@@ -591,9 +598,13 @@ sdvo_status_t sdvo_alter_static_attr(sdvo_device_context_t *p_ctx,
+ sdvo_read_i2c_reg(p_ctx, 0x30, &temp_reg);
+ if(new_value){
+ temp_reg |= 0x2;
++ p_attr->current_value = 1;
+ }else{
+ temp_reg &= ~(0x2);
++ p_attr->current_value = 0;
+ }
++ p_attr->flags |= PD_ATTR_FLAG_SETMODE;
++ p_attr->flags &= ~PD_ATTR_FLAG_NEED_RESTORE;
+ sdvo_write_i2c_reg(p_ctx, 0x30, temp_reg);
+ b_error = 0;
+ break;
+@@ -1473,7 +1484,7 @@ sdvo_status_t sdvo_alter_list_attr(sdvo_device_context_t *p_ctx,
+ }
+ /*----------------------------------------------------------------------------
+ * File Revision History
+- * $Id: sdvo_attr.c,v 1.12 2011/02/16 17:04:49 astead Exp $
++ * $Id: sdvo_attr.c,v 1.14 2011/03/12 10:56:13 nanuar Exp $
+ * $Source: /nfs/fm/proj/eia/cvsroot/koheo/linux/egd_drm/emgd/pal/sdvo/sdvo_attr.c,v $
+ *----------------------------------------------------------------------------
+ */
+diff --git a/drivers/staging/emgd/emgd/pal/sdvo/sdvo_port.c b/drivers/staging/emgd/emgd/pal/sdvo/sdvo_port.c
+index 2e1e1d6..c8c5084 100644
+--- a/drivers/staging/emgd/emgd/pal/sdvo/sdvo_port.c
++++ b/drivers/staging/emgd/emgd/pal/sdvo/sdvo_port.c
+@@ -1,7 +1,7 @@
+ /* -*- pse-c -*-
+ *-----------------------------------------------------------------------------
+ * Filename: sdvo_port.c
+- * $Revision: 1.18 $
++ * $Revision: 1.22 $
+ *-----------------------------------------------------------------------------
+ * Copyright © 2002-2010, Intel Corporation.
+ *
+@@ -59,6 +59,10 @@ void sdvo_convert_pd_timing_to_dtd(pd_timing_t *p_mode, sdvo_dtd_t *p_dtd,
+ unsigned long dclk);
+ void sdvo_convert_dtd_to_pd_timing(sdvo_dtd_t *p_dtd, pd_timing_t *p_mode);
+
++#ifndef CONFIG_MICRO
++static sdvo_status_t sdvo_reset_encoder(sdvo_device_context_t *p_ctx);
++#endif
++
+ static pd_version_t g_sdvo_version = {3, 4, 0, 0};
+ static unsigned long g_sdvo_dab_list[] = {0x70, 0x72, PD_DAB_LIST_END};
+
+@@ -2048,7 +2052,7 @@ int sdvo_get_timing_list(void *p_context, pd_timing_t *p_in_list,
+
+ #ifndef CONFIG_MICRO
+ /* reset context to avoid wrong timing list */
+- sdvo_reset(p_context);
++ sdvo_reset_encoder(p_context);
+ #endif
+
+ /* ...................................................................... */
+@@ -2254,14 +2258,6 @@ int sdvo_set_mode(void *p_context, pd_timing_t *p_mode, unsigned long flags)
+
+ sdvo_convert_pd_timing_to_dtd(p_native_mode, &dtd_out,
(157 more lines skipped)
++++++ series
--- series
+++ series
@@ -101,7 +101,7 @@
linux-2.6.37-emgd-0002-add-makefile.patch
linux-2.6.37-emgd-0003-1859-build.patch
linux-2.6.37-emgd-0004-add-2.6.37-support.patch
-
+linux-2.6.37-emgd-0005-SDVO-for-NV-EC3.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
linux-2.6.35-fatal-signals.patch
More information about the MeeGo-commits
mailing list