From e2292784134c41b25417442c3d58a84c3cf32d70 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 1 Apr 2011 18:42:22 +0100 Subject: [PATCH] --- yaml --- r: 249043 b: refs/heads/master c: 3350dead09da181b664775027abc51540425b93d h: refs/heads/master i: 249041: 0fda30aa3ab21e0b7d1d61e15914af997ae32010 249039: 720b85d7ab1dffea61fa0f3e280fcfdfde5059ad v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_drv.c | 3 ++- trunk/drivers/staging/gma500/psb_intel_sdvo.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ebf973b8269..a142e467fc74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3460fd3ec3819c37aeb7bd68e4705ff87733872 +refs/heads/master: 3350dead09da181b664775027abc51540425b93d diff --git a/trunk/drivers/staging/gma500/psb_drv.c b/trunk/drivers/staging/gma500/psb_drv.c index be8f11d19ee2..8978ed657857 100644 --- a/trunk/drivers/staging/gma500/psb_drv.c +++ b/trunk/drivers/staging/gma500/psb_drv.c @@ -493,7 +493,8 @@ static int psb_do_init(struct drm_device *dev) PSB_WSGX32(PSB_RSGX32(PSB_CR_BIF_CTRL) | _PSB_MMU_ER_MASK, PSB_CR_BIF_CTRL); psb_spank(dev_priv); - + + printk(KERN_INFO "TWOD base %08lX\n", (u32) pg->mmu_gatt_start); PSB_WSGX32(pg->mmu_gatt_start, PSB_CR_BIF_TWOD_REQ_BASE); return 0; diff --git a/trunk/drivers/staging/gma500/psb_intel_sdvo.c b/trunk/drivers/staging/gma500/psb_intel_sdvo.c index 731a5a2261d3..d005227b95d2 100644 --- a/trunk/drivers/staging/gma500/psb_intel_sdvo.c +++ b/trunk/drivers/staging/gma500/psb_intel_sdvo.c @@ -204,7 +204,7 @@ static void psb_intel_sdvo_write_cmd(struct psb_intel_output *psb_intel_output, struct psb_intel_sdvo_priv *sdvo_priv = psb_intel_output->dev_priv; int i; - if (1) { + if (0) { DRM_DEBUG("%s: W: %02X ", SDVO_NAME(sdvo_priv), cmd); for (i = 0; i < args_len; i++) printk(KERN_INFO"%02X ", ((u8 *) args)[i]); @@ -266,7 +266,7 @@ static u8 psb_intel_sdvo_read_response( SDVO_I2C_CMD_STATUS, &status); - if (1) { + if (0) { DRM_DEBUG("%s: R: ", SDVO_NAME(sdvo_priv)); for (i = 0; i < response_len; i++) printk(KERN_INFO"%02X ", ((u8 *) response)[i]);