[git pull] drm fixes - some more

2010-07-22 Thread Dave Airlie

Looks like I didn't build on IA64 (who knew), fix from Tony and a few more 
radeon fixes one for a regression since the output probing.

The following changes since commit c42750b0261274107ae85c894c088e618a3e38b9:

  drm/r600: fix possible NULL pointer derefernce (2010-07-21 10:29:32 +1000)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

Alex Deucher (3):
  drm/radeon/kms: fix legacy LVDS dpms sequence
  drm/radeon/kms: fix RADEON_INFO_CRTC_FROM_ID info ioctl
  drm/radeon/kms: add quirk to make HP DV5000 laptop resume

Dave Airlie (1):
  drm/radeon/kms: drop taking lock around crtc lookup.

Tony Luck (1):
  Fix ttm_page_alloc.c build breakage

 drivers/gpu/drm/radeon/evergreen_cs.c   |2 --
 drivers/gpu/drm/radeon/r100.c   |2 --
 drivers/gpu/drm/radeon/r600_cs.c|3 +--
 drivers/gpu/drm/radeon/radeon_combios.c |8 
 drivers/gpu/drm/radeon/radeon_kms.c |3 ++-
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c |1 +
 drivers/gpu/drm/ttm/ttm_page_alloc.c|6 +++---
 7 files changed, 15 insertions(+), 10 deletions(-)

--
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel


[PATCH] drm/kms: Simplify setup of the initial I2C encoder config.

2010-07-22 Thread Francisco Jerez
In most use cases the driver will be using the same static config all
the time: interpreting i2c_board_info::platform_data as the default
config we can can save the GPU driver a redundant set_config() call.

Signed-off-by: Francisco Jerez curroje...@riseup.net
---
 drivers/gpu/drm/drm_encoder_slave.c |7 +++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/drm_encoder_slave.c 
b/drivers/gpu/drm/drm_encoder_slave.c
index f018469..d62c064 100644
--- a/drivers/gpu/drm/drm_encoder_slave.c
+++ b/drivers/gpu/drm/drm_encoder_slave.c
@@ -41,6 +41,9 @@
  * drm_encoder_slave. The @slave_funcs field will be initialized with
  * the hooks provided by the slave driver.
  *
+ * If @info-platform_data is non-NULL it will be used as the initial
+ * slave config.
+ *
  * Returns 0 on success or a negative errno on failure, in particular,
  * -ENODEV is returned when no matching driver is found.
  */
@@ -85,6 +88,10 @@ int drm_i2c_encoder_init(struct drm_device *dev,
if (err)
goto fail_unregister;
 
+   if (info-platform_data)
+   encoder-slave_funcs-set_config(encoder-base,
+info-platform_data);
+
return 0;
 
 fail_unregister:
-- 
1.6.4.4


--
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel


[PATCH] drm: Import driver for the sil164 I2C TMDS transmitter.

2010-07-22 Thread Francisco Jerez
Signed-off-by: Francisco Jerez curroje...@riseup.net
Tested-by: Patrice Mandin patman...@gmail.com
---
I've placed the Kconfig entry next to the other slave encoders Nouveau
makes use of, I think that's OK because Nouveau is its only user.

In theory i915 could also benefit from it (i915 already has some
private code to program these chips but it's mostly a stub
implementation), I don't have the hardware so I think I'll leave it
alone for now.

 drivers/gpu/drm/i2c/Makefile |3 +
 drivers/gpu/drm/i2c/sil164_drv.c |  462 ++
 drivers/gpu/drm/nouveau/Kconfig  |9 +
 include/drm/i2c/sil164.h |   63 +
 4 files changed, 537 insertions(+), 0 deletions(-)
 create mode 100644 drivers/gpu/drm/i2c/sil164_drv.c
 create mode 100644 include/drm/i2c/sil164.h

diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
index 6d2abaf..9286256 100644
--- a/drivers/gpu/drm/i2c/Makefile
+++ b/drivers/gpu/drm/i2c/Makefile
@@ -2,3 +2,6 @@ ccflags-y := -Iinclude/drm
 
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o
+
+sil164-y := sil164_drv.o
+obj-$(CONFIG_DRM_I2C_SIL164) += sil164.o
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
new file mode 100644
index 000..0b67732
--- /dev/null
+++ b/drivers/gpu/drm/i2c/sil164_drv.c
@@ -0,0 +1,462 @@
+/*
+ * Copyright (C) 2010 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * Software), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include drmP.h
+#include drm_crtc_helper.h
+#include drm_encoder_slave.h
+#include i2c/sil164.h
+
+struct sil164_priv {
+   struct sil164_encoder_params config;
+   struct i2c_client *duallink_slave;
+
+   uint8_t saved_state[0x10];
+   uint8_t saved_slave_state[0x10];
+};
+
+#define to_sil164_priv(x) \
+   ((struct sil164_priv *)to_encoder_slave(x)-slave_priv)
+
+#define sil164_dbg(client, format, ...) do {   \
+   if (drm_debug  DRM_UT_KMS) \
+   dev_printk(KERN_DEBUG, client-dev,\
+  %s:  format, __func__, ## __VA_ARGS__); \
+   } while (0)
+#define sil164_info(client, format, ...)   \
+   dev_info(client-dev, format, __VA_ARGS__)
+#define sil164_err(client, format, ...)\
+   dev_err(client-dev, format, __VA_ARGS__)
+
+#define SIL164_I2C_ADDR_MASTER 0x38
+#define SIL164_I2C_ADDR_SLAVE  0x39
+
+/* HW register definitions */
+
+#define SIL164_VENDOR_LO   0x0
+#define SIL164_VENDOR_HI   0x1
+#define SIL164_DEVICE_LO   0x2
+#define SIL164_DEVICE_HI   0x3
+#define SIL164_REVISION0x4
+#define SIL164_FREQ_MIN0x6
+#define SIL164_FREQ_MAX0x7
+#define SIL164_CONTROL00x8
+#  define SIL164_CONTROL0_POWER_ON 0x01
+#  define SIL164_CONTROL0_EDGE_RISING  0x02
+#  define SIL164_CONTROL0_INPUT_24BIT  0x04
+#  define SIL164_CONTROL0_DUAL_EDGE0x08
+#  define SIL164_CONTROL0_HSYNC_ON 0x10
+#  define SIL164_CONTROL0_VSYNC_ON 0x20
+#define SIL164_DETECT  0x9
+#  define SIL164_DETECT_INTR_STAT  0x01
+#  define SIL164_DETECT_HOTPLUG_STAT   0x02
+#  define SIL164_DETECT_RECEIVER_STAT  0x04
+#  define SIL164_DETECT_INTR_MODE_RECEIVER 0x00
+#  define SIL164_DETECT_INTR_MODE_HOTPLUG  0x08
+#  define SIL164_DETECT_OUT_MODE_HIGH  0x00
+#  define SIL164_DETECT_OUT_MODE_INTR  0x10
+#  define SIL164_DETECT_OUT_MODE_RECEIVER  0x20
+#  define SIL164_DETECT_OUT_MODE_HOTPLUG   0x30
+#  define 

[Bug 13170] Macbook 5,2 only boots with acpi=off, or nosmp, or maxcpus=1

2010-07-22 Thread bugzilla-daemon
https://bugzilla.kernel.org/show_bug.cgi?id=13170





--- Comment #55 from David dstan...@gmail.com  2010-07-22 15:43:42 ---
This is still a problem when booting from 2.6.35

-- 
Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are watching the assignee of the bug.

--
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel