Commit 99d8f034 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

gma500: nuke the PSB debug stuff 



Lose all the PSB debug gunge. We can replace it with dev_dbg() like normal
drivers if and when we need debug on stuff.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0496cf5a

drivers/staging/gma500/mrst_crtc.c

+7 −16
Original line number Diff line number Diff line
@@ -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;
@@ -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);

}
@@ -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;

}
@@ -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;
@@ -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;
@@ -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);

	}
@@ -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;

	}
@@ -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);

drivers/staging/gma500/mrst_lvds.c

+2 −10
Original line number Diff line number Diff line
@@ -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;
@@ -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
@@ -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;
@@ -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;
@@ -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;

	}
@@ -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);

drivers/staging/gma500/psb_bl.c

+1 −7
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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 */
@@ -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;

drivers/staging/gma500/psb_drv.c

+11 −22
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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)
@@ -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;

	}
@@ -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);
@@ -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 =
@@ -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);
@@ -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;

		}
@@ -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;

		}
@@ -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;

}
@@ -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;

	}
@@ -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;

		}
@@ -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;

	}
@@ -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++;
@@ -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);

}

drivers/staging/gma500/psb_drv.h

+10 −86
Original line number Diff line number Diff line
@@ -659,51 +659,9 @@ extern int psb_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf); 
#define PSB_D_MSVDX   (1 << 9)

#define PSB_D_TOPAZ   (1 << 10)



#ifndef DRM_DEBUG_CODE

/* To enable debug printout, set drm_psb_debug in psb_drv.c

 * to any combination of above print flags.

 */

/* #define DRM_DEBUG_CODE 2 */

#endif



extern int drm_psb_debug;

extern int drm_psb_no_fb;

extern int drm_idle_check_interval;



#define PSB_DEBUG_GENERAL(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_GENERAL, _fmt, ##_arg)

#define PSB_DEBUG_INIT(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_INIT, _fmt, ##_arg)

#define PSB_DEBUG_IRQ(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_IRQ, _fmt, ##_arg)

#define PSB_DEBUG_ENTRY(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_ENTRY, _fmt, ##_arg)

#define PSB_DEBUG_HV(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_HV, _fmt, ##_arg)

#define PSB_DEBUG_DBI_BF(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_DBI_BF, _fmt, ##_arg)

#define PSB_DEBUG_PM(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_PM, _fmt, ##_arg)

#define PSB_DEBUG_RENDER(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_RENDER, _fmt, ##_arg)

#define PSB_DEBUG_REG(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_REG, _fmt, ##_arg)

#define PSB_DEBUG_MSVDX(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_MSVDX, _fmt, ##_arg)

#define PSB_DEBUG_TOPAZ(_fmt, _arg...) \

	PSB_DEBUG(PSB_D_TOPAZ, _fmt, ##_arg)



#if DRM_DEBUG_CODE

#define PSB_DEBUG(_flag, _fmt, _arg...)					\

	do {								\

		if (unlikely((_flag) & drm_psb_debug))			\

			printk(KERN_DEBUG				\

			       "[psb:0x%02x:%s] " _fmt , _flag,		\

			       __func__ , ##_arg);			\

	} while (0)

#else

#define PSB_DEBUG(_fmt, _arg...)     do { } while (0)

#endif



/*

 *	Utilities
@@ -749,19 +707,15 @@ static inline void MDFLD_MSG_WRITE32(uint port, uint offset, u32 value) 
static inline uint32_t REGISTER_READ(struct drm_device *dev, uint32_t reg)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	int reg_val = ioread32(dev_priv->vdc_reg + (reg));

	PSB_DEBUG_REG("reg = 0x%x. reg_val = 0x%x. \n", reg, reg_val);

	return reg_val;

	return ioread32(dev_priv->vdc_reg + reg);

}



#define REG_READ(reg)	       REGISTER_READ(dev, (reg))



static inline void REGISTER_WRITE(struct drm_device *dev, uint32_t reg,

				      uint32_t val)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	if ((reg < 0x70084 || reg >0x70088) && (reg < 0xa000 || reg >0xa3ff))

		PSB_DEBUG_REG("reg = 0x%x, val = 0x%x. \n", reg, val);



	iowrite32((val), dev_priv->vdc_reg + (reg));

}
@@ -771,9 +725,6 @@ static inline void REGISTER_WRITE16(struct drm_device *dev, 
					uint32_t reg, uint32_t val)

{

	struct drm_psb_private *dev_priv = dev->dev_private;



	PSB_DEBUG_REG("reg = 0x%x, val = 0x%x. \n", reg, val);



	iowrite16((val), dev_priv->vdc_reg + (reg));

}
@@ -783,20 +734,13 @@ static inline void REGISTER_WRITE8(struct drm_device *dev, 
				       uint32_t reg, uint32_t val)

{

	struct drm_psb_private *dev_priv = dev->dev_private;



	PSB_DEBUG_REG("reg = 0x%x, val = 0x%x. \n", reg, val);



	iowrite8((val), dev_priv->vdc_reg + (reg));

}



#define REG_WRITE8(reg, val)		REGISTER_WRITE8(dev, (reg), (val))



#define PSB_ALIGN_TO(_val, _align) \

  (((_val) + ((_align) - 1)) & ~((_align) - 1))

#define PSB_WVDC32(_val, _offs) \

  iowrite32(_val, dev_priv->vdc_reg + (_offs))

#define PSB_RVDC32(_offs) \

  ioread32(dev_priv->vdc_reg + (_offs))

#define PSB_WVDC32(_val, _offs)		iowrite32(_val, dev_priv->vdc_reg + (_offs))

#define PSB_RVDC32(_offs)		ioread32(dev_priv->vdc_reg + (_offs))



/* #define TRAP_SGX_PM_FAULT 1 */

#ifdef TRAP_SGX_PM_FAULT
@@ -810,33 +754,13 @@ static inline void REGISTER_WRITE8(struct drm_device *dev, 
    ioread32(dev_priv->sgx_reg + (_offs));			\

})

#else

#define PSB_RSGX32(_offs)					\

  ioread32(dev_priv->sgx_reg + (_offs))

#define PSB_RSGX32(_offs)		ioread32(dev_priv->sgx_reg + (_offs))

#endif

#define PSB_WSGX32(_val, _offs) \

  iowrite32(_val, dev_priv->sgx_reg + (_offs))

#define PSB_WSGX32(_val, _offs)		iowrite32(_val, dev_priv->sgx_reg + (_offs))



#define MSVDX_REG_DUMP 0

#if MSVDX_REG_DUMP



#define PSB_WMSVDX32(_val, _offs) \

  printk("MSVDX: write %08x to reg 0x%08x\n", (unsigned int)(_val), (unsigned int)(_offs));\

  iowrite32(_val, dev_priv->msvdx_reg + (_offs))

#define PSB_RMSVDX32(_offs) \

  ioread32(dev_priv->msvdx_reg + (_offs))



#else



#define PSB_WMSVDX32(_val, _offs) \

  iowrite32(_val, dev_priv->msvdx_reg + (_offs))

#define PSB_RMSVDX32(_offs) \

  ioread32(dev_priv->msvdx_reg + (_offs))



#endif



#define PSB_ALPL(_val, _base)			\

  (((_val) >> (_base ## _ALIGNSHIFT)) << (_base ## _SHIFT))

#define PSB_ALPLM(_val, _base)			\

  ((((_val) >> (_base ## _ALIGNSHIFT)) << (_base ## _SHIFT)) & (_base ## _MASK))

#define PSB_WMSVDX32(_val, _offs)	iowrite32(_val, dev_priv->msvdx_reg + (_offs))

#define PSB_RMSVDX32(_offs)		ioread32(dev_priv->msvdx_reg + (_offs))



#endif