Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31a0685a authored by Alan Cox's avatar Alan Cox Committed by Dave Airlie
Browse files

gma500: Clean up some of the noise 



We have a lot of debug type stuff we don't actually need any more.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 213a8434

drivers/gpu/drm/gma500/cdv_device.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,7 @@ static int cdv_save_display_registers(struct drm_device *dev) 
	struct psb_save_area *regs = &dev_priv->regs;

	struct psb_save_area *regs = &dev_priv->regs;

	struct drm_connector *connector;

	struct drm_connector *connector;





	dev_info(dev->dev, "Saving GPU registers.\n");

	dev_dbg(dev->dev, "Saving GPU registers.\n");





	pci_read_config_byte(dev->pdev, 0xF4, &regs->cdv.saveLBB);

	pci_read_config_byte(dev->pdev, 0xF4, &regs->cdv.saveLBB);

drivers/gpu/drm/gma500/framebuffer.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -476,7 +476,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, 




	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */

	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */





	dev_info(dev->dev, "allocated %dx%d fb\n",

	dev_dbg(dev->dev, "allocated %dx%d fb\n",

					psbfb->base.width, psbfb->base.height);

					psbfb->base.width, psbfb->base.height);





	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/gma500/gtt.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -416,7 +416,6 @@ int psb_gtt_init(struct drm_device *dev, int resume) 
	unsigned long stolen_size, vram_stolen_size;

	unsigned long stolen_size, vram_stolen_size;

	unsigned i, num_pages;

	unsigned i, num_pages;

	unsigned pfn_base;

	unsigned pfn_base;

	uint32_t dvmt_mode = 0;

	struct psb_gtt *pg;

	struct psb_gtt *pg;





	int ret = 0;

	int ret = 0;
@@ -489,13 +488,8 @@ int psb_gtt_init(struct drm_device *dev, int resume) 




	stolen_size = vram_stolen_size;

	stolen_size = vram_stolen_size;





	printk(KERN_INFO "Stolen memory information\n");

	dev_dbg(dev->dev, "Stolen memory base 0x%x, size %luK\n",

	printk(KERN_INFO "       base in RAM: 0x%x\n", dev_priv->stolen_base);

			dev_priv->stolen_base, vram_stolen_size / 1024);

	printk(KERN_INFO "       size: %luK, calculated by (GTT RAM base) - (Stolen base), seems wrong\n",

		vram_stolen_size/1024);

	dvmt_mode = (dev_priv->gmch_ctrl >> 4) & 0x7;

	printk(KERN_INFO "      the correct size should be: %dM(dvmt mode=%d)\n",

		(dvmt_mode == 1) ? 1 : (2 << (dvmt_mode - 1)), dvmt_mode);





	if (resume && (gtt_pages != pg->gtt_pages) &&

	if (resume && (gtt_pages != pg->gtt_pages) &&

	    (stolen_size != pg->stolen_size)) {

	    (stolen_size != pg->stolen_size)) {
@@ -532,7 +526,7 @@ int psb_gtt_init(struct drm_device *dev, int resume) 




	pfn_base = dev_priv->stolen_base >> PAGE_SHIFT;

	pfn_base = dev_priv->stolen_base >> PAGE_SHIFT;

	num_pages = vram_stolen_size >> PAGE_SHIFT;

	num_pages = vram_stolen_size >> PAGE_SHIFT;

	printk(KERN_INFO"Set up %d stolen pages starting at 0x%08x, GTT offset %dK\n",

	dev_dbg(dev->dev, "Set up %d stolen pages starting at 0x%08x, GTT offset %dK\n",

		num_pages, pfn_base << PAGE_SHIFT, 0);

		num_pages, pfn_base << PAGE_SHIFT, 0);

	for (i = 0; i < num_pages; ++i) {

	for (i = 0; i < num_pages; ++i) {

		pte = psb_gtt_mask_pte(pfn_base + i, 0);

		pte = psb_gtt_mask_pte(pfn_base + i, 0);

drivers/gpu/drm/gma500/psb_drv.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -172,24 +172,6 @@ static int psb_do_init(struct drm_device *dev) 
	dev_priv->gatt_free_offset = pg->mmu_gatt_start +

	dev_priv->gatt_free_offset = pg->mmu_gatt_start +

	    (stolen_gtt << PAGE_SHIFT) * 1024;

	    (stolen_gtt << PAGE_SHIFT) * 1024;





	if (1 || drm_debug) {

		uint32_t core_id = PSB_RSGX32(PSB_CR_CORE_ID);

		uint32_t core_rev = PSB_RSGX32(PSB_CR_CORE_REVISION);

		DRM_INFO("SGX core id = 0x%08x\n", core_id);

		DRM_INFO("SGX core rev major = 0x%02x, minor = 0x%02x\n",

			 (core_rev & _PSB_CC_REVISION_MAJOR_MASK) >>

			 _PSB_CC_REVISION_MAJOR_SHIFT,

			 (core_rev & _PSB_CC_REVISION_MINOR_MASK) >>

			 _PSB_CC_REVISION_MINOR_SHIFT);

		DRM_INFO

		    ("SGX core rev maintenance = 0x%02x, designer = 0x%02x\n",

		     (core_rev & _PSB_CC_REVISION_MAINTENANCE_MASK) >>

		     _PSB_CC_REVISION_MAINTENANCE_SHIFT,

		     (core_rev & _PSB_CC_REVISION_DESIGNER_MASK) >>

		     _PSB_CC_REVISION_DESIGNER_SHIFT);

	}





	spin_lock_init(&dev_priv->irqmask_lock);

	spin_lock_init(&dev_priv->irqmask_lock);

	spin_lock_init(&dev_priv->lock_2d);

	spin_lock_init(&dev_priv->lock_2d);