Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 259663
b: refs/heads/master
c: 99d8f03
h: refs/heads/master
i:
  259661: 114ee8e
  259659: 05d2428
  259655: cea8a4b
  259647: 82245db
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent c64bd28 commit a177ff4
Show file tree
Hide file tree
Showing 15 changed files with 88 additions and 375 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0496cf5aee663fd33e0a92b9e6ee9a8cbf6f75d5
refs/heads/master: 99d8f0349bdc9e2fe232cbc729b2bd8e32c6d6a5
23 changes: 7 additions & 16 deletions trunk/drivers/staging/gma500/mrst_crtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static const struct mrst_limit_t *mrst_limit(struct drm_crtc *crtc)
}
} else {
limit = NULL;
PSB_DEBUG_ENTRY("mrst_limit Wrong display type.\n");
dev_err(dev->dev, "mrst_limit Wrong display type.\n");
}

return limit;
Expand All @@ -117,7 +117,7 @@ static void mrst_clock(int refclk, struct mrst_clock_t *clock)

void mrstPrintPll(char *prefix, struct mrst_clock_t *clock)
{
PSB_DEBUG_ENTRY("%s: dotclock = %d, m = %d, p1 = %d.\n",
pr_debug("%s: dotclock = %d, m = %d, p1 = %d.\n",
prefix, clock->dot, clock->m, clock->p1);
}

Expand Down Expand Up @@ -149,8 +149,7 @@ mrstFindBestPLL(struct drm_crtc *crtc, int target, int refclk,
}
}
}
DRM_DEBUG("mrstFindBestPLL err = %d.\n", err);

dev_dbg(crtc->dev->dev, "mrstFindBestPLL err = %d.\n", err);
return err != target;
}

Expand All @@ -172,8 +171,6 @@ static void mrst_crtc_dpms(struct drm_crtc *crtc, int mode)
u32 temp;
bool enabled;

PSB_DEBUG_ENTRY("mode = %d, pipe = %d\n", mode, pipe);

if (!gma_power_begin(dev, true))
return;

Expand Down Expand Up @@ -320,8 +317,6 @@ static int mrst_crtc_mode_set(struct drm_crtc *crtc,
uint64_t scalingType = DRM_MODE_SCALE_FULLSCREEN;
struct drm_encoder *encoder;

PSB_DEBUG_ENTRY("pipe = 0x%x\n", pipe);

if (!gma_power_begin(dev, true))
return 0;

Expand Down Expand Up @@ -446,10 +441,9 @@ static int mrst_crtc_mode_set(struct drm_crtc *crtc,
ok = mrstFindBestPLL(crtc, adjusted_mode->clock, refclk, &clock);

if (!ok) {
PSB_DEBUG_ENTRY(
"mrstFindBestPLL fail in mrst_crtc_mode_set.\n");
dev_dbg(dev->dev, "mrstFindBestPLL fail in mrst_crtc_mode_set.\n");
} else {
PSB_DEBUG_ENTRY("mrst_crtc_mode_set pixel clock = %d,"
dev_dbg(dev->dev, "mrst_crtc_mode_set pixel clock = %d,"
"m = %x, p1 = %x.\n", clock.dot, clock.m,
clock.p1);
}
Expand Down Expand Up @@ -540,11 +534,9 @@ int mrst_pipe_set_base(struct drm_crtc *crtc,
u32 dspcntr;
int ret = 0;

PSB_DEBUG_ENTRY("\n");

/* no fb bound */
if (!crtc->fb) {
DRM_DEBUG("No FB bound\n");
dev_dbg(dev->dev, "No FB bound\n");
return 0;
}

Expand Down Expand Up @@ -574,13 +566,12 @@ int mrst_pipe_set_base(struct drm_crtc *crtc,
dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
break;
default:
DRM_ERROR("Unknown color depth\n");
dev_err(dev->dev, "Unknown color depth\n");
ret = -EINVAL;
goto pipe_set_base_exit;
}
REG_WRITE(dspcntr_reg, dspcntr);

DRM_DEBUG("Writing base %08lX %08lX %d %d\n", start, offset, x, y);
if (0 /* FIXMEAC - check what PSB needs */) {
REG_WRITE(dspbase, offset);
REG_READ(dspbase);
Expand Down
12 changes: 2 additions & 10 deletions trunk/drivers/staging/gma500/mrst_lvds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ static void mrst_lvds_set_power(struct drm_device *dev,
{
u32 pp_status;
struct drm_psb_private *dev_priv = dev->dev_private;
PSB_DEBUG_ENTRY("\n");

if (!gma_power_begin(dev, true))
return;
Expand Down Expand Up @@ -77,8 +76,6 @@ static void mrst_lvds_dpms(struct drm_encoder *encoder, int mode)
struct drm_device *dev = encoder->dev;
struct psb_intel_output *output = enc_to_psb_intel_output(encoder);

PSB_DEBUG_ENTRY("\n");

if (mode == DRM_MODE_DPMS_ON)
mrst_lvds_set_power(dev, output, true);
else
Expand All @@ -97,8 +94,6 @@ static void mrst_lvds_mode_set(struct drm_encoder *encoder,
u32 lvds_port;
uint64_t v = DRM_MODE_SCALE_FULLSCREEN;

PSB_DEBUG_ENTRY("\n");

if (!gma_power_begin(dev, true))
return;

Expand Down Expand Up @@ -252,8 +247,6 @@ void mrst_lvds_init(struct drm_device *dev,
struct i2c_adapter *i2c_adap;
struct drm_display_mode *scan; /* *modes, *bios_mode; */

PSB_DEBUG_ENTRY("\n");

psb_intel_output = kzalloc(sizeof(struct psb_intel_output), GFP_KERNEL);
if (!psb_intel_output)
return;
Expand Down Expand Up @@ -348,8 +341,7 @@ void mrst_lvds_init(struct drm_device *dev,

/* If we still don't have a mode after all that, give up. */
if (!mode_dev->panel_fixed_mode) {
DRM_DEBUG
("Found no modes on the lvds, ignoring the LVDS\n");
dev_err(dev->dev, "Found no modes on the lvds, ignoring the LVDS\n");
goto failed_find;
}

Expand All @@ -358,7 +350,7 @@ void mrst_lvds_init(struct drm_device *dev,
return;

failed_find:
DRM_DEBUG("No LVDS modes found, disabling.\n");
dev_dbg(dev->dev, "No LVDS modes found, disabling.\n");
if (psb_intel_output->ddc_bus)
psb_intel_i2c_destroy(psb_intel_output->ddc_bus);

Expand Down
8 changes: 1 addition & 7 deletions trunk/drivers/staging/gma500/psb_bl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ int psb_set_brightness(struct backlight_device *bd)
struct drm_device *dev = bl_get_data(psb_backlight_device);
int level = bd->props.brightness;

DRM_DEBUG_DRIVER("backlight level set to %d\n", level);

/* Percentage 1-100% being valid */
if (level < 1)
level = 1;
Expand All @@ -75,8 +73,6 @@ int mrst_set_brightness(struct backlight_device *bd)
u32 blc_pwm_ctl;
u32 max_pwm_blc;

DRM_DEBUG_DRIVER("backlight level set to %d\n", level);

/* Percentage 1-100% being valid */
if (level < 1)
level = 1;
Expand Down Expand Up @@ -111,8 +107,6 @@ int mrst_set_brightness(struct backlight_device *bd)

int psb_get_brightness(struct backlight_device *bd)
{
DRM_DEBUG_DRIVER("brightness = 0x%x\n", psb_brightness);

/* return locally cached var instead of HW read (due to DPST etc.) */
/* FIXME: ideally return actual value in case firmware fiddled with
it */
Expand Down Expand Up @@ -144,7 +138,7 @@ static int device_backlight_init(struct drm_device *dev)
} else {
/* get bl_max_freq and pol from dev_priv*/
if (!dev_priv->lvds_bl) {
DRM_ERROR("Has no valid LVDS backlight info\n");
dev_err(dev->dev, "Has no valid LVDS backlight info\n");
return 1;
}
bl_max_freq = dev_priv->lvds_bl->freq;
Expand Down
33 changes: 11 additions & 22 deletions trunk/drivers/staging/gma500/psb_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,14 @@
#include <linux/pm_runtime.h>
#include <acpi/video.h>

int drm_psb_debug;
static int drm_psb_trap_pagefaults;

int drm_psb_no_fb;

static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);

MODULE_PARM_DESC(debug, "Enable debug output");
MODULE_PARM_DESC(no_fb, "Disable FBdev");
MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults");
module_param_named(debug, drm_psb_debug, int, 0600);
module_param_named(no_fb, drm_psb_no_fb, int, 0600);
module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600);

Expand Down Expand Up @@ -215,7 +212,8 @@ void mrst_get_fuse_settings(struct drm_device *dev)
dev_priv->core_freq = 166;
break;
default:
DRM_ERROR("Invalid SKU values, SKU value = 0x%08x\n", fuse_value_tmp);
dev_warn(dev->dev, "Invalid SKU values, SKU value = 0x%08x\n",
fuse_value_tmp);
dev_priv->core_freq = 0;
}
DRM_INFO("LNC core clk is %dMHz.\n", dev_priv->core_freq);
Expand All @@ -231,7 +229,8 @@ void mid_get_pci_revID (struct drm_psb_private *dev_priv)
pci_read_config_dword(pci_gfx_root, 0x08, &platform_rev_id);
dev_priv->platform_rev_id = (uint8_t) platform_rev_id;
pci_dev_put(pci_gfx_root);
PSB_DEBUG_ENTRY("platform_rev_id is %x\n", dev_priv->platform_rev_id);
dev_info(dev_priv->dev->dev, "platform_rev_id is %x\n",
dev_priv->platform_rev_id);
}

void mrst_get_vbt_data(struct drm_psb_private *dev_priv)
Expand Down Expand Up @@ -413,7 +412,7 @@ static int psb_do_init(struct drm_device *dev)
int ret = -ENOMEM;

if (pg->mmu_gatt_start & 0x0FFFFFFF) {
DRM_ERROR("Gatt must be 256M aligned. This is a bug.\n");
dev_err(dev->dev, "Gatt must be 256M aligned. This is a bug.\n");
ret = -EINVAL;
goto out_err;
}
Expand Down Expand Up @@ -447,9 +446,6 @@ static int psb_do_init(struct drm_device *dev)

spin_lock_init(&dev_priv->irqmask_lock);

/* FIXME: can we kill ta_mem_size ? */
dev_priv->sizes.ta_mem_size = 0;

PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK0);
PSB_WSGX32(0x00000000, PSB_CR_BIF_BANK1);
PSB_RSGX32(PSB_CR_BIF_BANK1);
Expand Down Expand Up @@ -553,7 +549,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
dev->dev_private = (void *) dev_priv;
dev_priv->chipset = chipset;

PSB_DEBUG_INIT("Mapping MMIO\n");
resource_start = pci_resource_start(dev->pdev, PSB_MMIO_RESOURCE);

dev_priv->vdc_reg =
Expand Down Expand Up @@ -679,7 +674,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
pm_runtime_set_active(&dev->pdev->dev);
#endif
/*Intel drm driver load is done, continue doing pvr load*/
DRM_DEBUG("Pvr driver load\n");
return 0;
out_err:
psb_driver_unload(dev);
Expand Down Expand Up @@ -721,7 +715,7 @@ static int psb_dc_state_ioctl(struct drm_device *dev, void * data,
obj = drm_mode_object_find(dev, obj_id,
DRM_MODE_OBJECT_CRTC);
if (!obj) {
DRM_DEBUG("Invalid CRTC object.\n");
dev_dbg(dev->dev, "Invalid CRTC object.\n");
return -EINVAL;
}

Expand All @@ -741,7 +735,7 @@ static int psb_dc_state_ioctl(struct drm_device *dev, void * data,
obj = drm_mode_object_find(dev, obj_id,
DRM_MODE_OBJECT_CONNECTOR);
if (!obj) {
DRM_DEBUG("Invalid connector id.\n");
dev_dbg(dev->dev, "Invalid connector id.\n");
return -EINVAL;
}

Expand All @@ -753,8 +747,6 @@ static int psb_dc_state_ioctl(struct drm_device *dev, void * data,

return 0;
}

DRM_DEBUG("Bad flags 0x%x\n", flags);
return -EINVAL;
}

Expand Down Expand Up @@ -832,7 +824,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
obj_id = lut_arg->output_id;
obj = drm_mode_object_find(dev, obj_id, DRM_MODE_OBJECT_CONNECTOR);
if (!obj) {
DRM_DEBUG("Invalid Connector object.\n");
dev_dbg(dev->dev, "Invalid Connector object.\n");
return -EINVAL;
}

Expand Down Expand Up @@ -873,7 +865,7 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
case PSB_MODE_OPERATION_SET_DC_BASE:
obj = drm_mode_object_find(dev, obj_id, DRM_MODE_OBJECT_FB);
if (!obj) {
DRM_ERROR("Invalid FB id %d\n", obj_id);
dev_dbg(dev->dev, "Invalid FB id %d\n", obj_id);
return -EINVAL;
}

Expand Down Expand Up @@ -945,7 +937,7 @@ static int psb_mode_operation_ioctl(struct drm_device *dev, void *data,
return ret;

default:
DRM_DEBUG("Unsupported psb mode operation");
dev_dbg(dev->dev, "Unsupported psb mode operation\n");
return -EOPNOTSUPP;
}

Expand Down Expand Up @@ -1336,9 +1328,6 @@ static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd,
struct drm_device *dev = file_priv->minor->dev;
struct drm_psb_private *dev_priv = dev->dev_private;
static unsigned int runtime_allowed;
unsigned int nr = DRM_IOCTL_NR(cmd);

DRM_DEBUG("cmd = %x, nr = %x\n", cmd, nr);

if (runtime_allowed == 1 && dev_priv->is_lvds_on) {
runtime_allowed++;
Expand Down Expand Up @@ -1439,7 +1428,7 @@ static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
/* MLD Added this from Inaky's patch */
if (pci_enable_msi(pdev))
DRM_ERROR("Enable MSI failed!\n");
dev_warn(&pdev->dev, "Enable MSI failed!\n");
return drm_get_pci_dev(pdev, ent, &driver);
}

Expand Down
Loading

0 comments on commit a177ff4

Please sign in to comment.