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

Commit f90cd811 authored by Arthur Borsboom's avatar Arthur Borsboom Committed by Patrik Jakobsson
Browse files

drm/gma500: Code cleanup - style fixes 



Code cleanup by following i915 constant/variable names and ordering
Code cleanup by following directions from kernel doc: Codingstyle
Code cleanup by following directions from kernel doc: DRM

Signed-off-by: default avatarArthur Borsboom <arthurborsboom@gmail.com>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
parent af3765c7

drivers/gpu/drm/gma500/psb_drv.c

+65 −69
Original line number Diff line number Diff line
@@ -36,12 +36,14 @@ 
#include <acpi/video.h>

#include <linux/module.h>



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

static struct drm_driver driver;

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



static DEFINE_PCI_DEVICE_TABLE(pciidlist) = {

	{ 0x8086, 0x8108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },

	{ 0x8086, 0x8109, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &psb_chip_ops },

#if defined(CONFIG_DRM_GMA600)

	/* Atom E620 */

	{ 0x8086, 0x4100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },

	{ 0x8086, 0x4101, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },

	{ 0x8086, 0x4102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },
@@ -50,7 +52,6 @@ static DEFINE_PCI_DEVICE_TABLE(pciidlist) = { 
	{ 0x8086, 0x4105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },

	{ 0x8086, 0x4106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },

	{ 0x8086, 0x4107, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },

	/* Atom E620 */

	{ 0x8086, 0x4108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (long) &oaktrail_chip_ops },

#endif

#if defined(CONFIG_DRM_MEDFIELD)
@@ -91,7 +92,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist); 
static const struct drm_ioctl_desc psb_ioctls[] = {

};



static void psb_lastclose(struct drm_device *dev)

static void psb_driver_lastclose(struct drm_device *dev)

{

	int ret;

	struct drm_psb_private *dev_priv = dev->dev_private;
@@ -118,11 +119,9 @@ static int psb_do_init(struct drm_device *dev) 
		return -EINVAL;

	}





	stolen_gtt = (pg->stolen_size >> PAGE_SHIFT) * 4;

	stolen_gtt = (stolen_gtt + PAGE_SIZE - 1) >> PAGE_SHIFT;

	stolen_gtt =

	    (stolen_gtt < pg->gtt_pages) ? stolen_gtt : pg->gtt_pages;

	stolen_gtt = (stolen_gtt < pg->gtt_pages) ? stolen_gtt : pg->gtt_pages;



	dev_priv->gatt_free_offset = pg->mmu_gatt_start +

	    (stolen_gtt << PAGE_SHIFT) * 1024;
@@ -213,8 +212,7 @@ static int psb_driver_unload(struct drm_device *dev) 
	return 0;

}





static int psb_driver_load(struct drm_device *dev, unsigned long chipset)

static int psb_driver_load(struct drm_device *dev, unsigned long flags)

{

	struct drm_psb_private *dev_priv;

	unsigned long resource_start, resource_len;
@@ -228,7 +226,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) 
	if (dev_priv == NULL)

		return -ENOMEM;



	dev_priv->ops = (struct psb_ops *)chipset;

	dev_priv->ops = (struct psb_ops *)flags;

	dev_priv->dev = dev;

	dev->dev_private = (void *) dev_priv;
@@ -344,9 +342,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) 
	drm_irq_install(dev);



	dev->vblank_disable_allowed = true;



	dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */



	dev->driver->get_vblank_counter = psb_get_vblank_counter;



	psb_modeset_init(dev);
@@ -401,7 +397,7 @@ static int psb_driver_open(struct drm_device *dev, struct drm_file *priv) 
	return 0;

}



static void psb_driver_close(struct drm_device *dev, struct drm_file *priv)

static void psb_driver_postclose(struct drm_device *dev, struct drm_file *priv)

{

}
@@ -422,15 +418,21 @@ static long psb_unlocked_ioctl(struct file *filp, unsigned int cmd, 
	/* FIXME: do we need to wrap the other side of this */

}





/* When a client dies:

/*

 * When a client dies:

 *    - Check for and clean up flipped page state

 */

static void psb_driver_preclose(struct drm_device *dev, struct drm_file *priv)

{

}



static void psb_remove(struct pci_dev *pdev)

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

{

	return drm_get_pci_dev(pdev, ent, &driver);

}





static void psb_pci_remove(struct pci_dev *pdev)

{

	struct drm_device *dev = pci_get_drvdata(pdev);

	drm_put_dev(dev);
@@ -468,8 +470,11 @@ static struct drm_driver driver = { 
			   DRIVER_MODESET | DRIVER_GEM,

	.load = psb_driver_load,

	.unload = psb_driver_unload,

	.open = psb_driver_open,

	.lastclose = psb_driver_lastclose,

	.preclose = psb_driver_preclose,

	.postclose = psb_driver_postclose,



	.ioctls = psb_ioctls,

	.num_ioctls = DRM_ARRAY_SIZE(psb_ioctls),

	.device_is_agp = psb_driver_device_is_agp,

	.irq_preinstall = psb_irq_preinstall,
@@ -479,40 +484,31 @@ static struct drm_driver driver = { 
	.enable_vblank = psb_enable_vblank,

	.disable_vblank = psb_disable_vblank,

	.get_vblank_counter = psb_get_vblank_counter,

	.lastclose = psb_lastclose,

	.open = psb_driver_open,

	.preclose = psb_driver_preclose,

	.postclose = psb_driver_close,



	.gem_free_object = psb_gem_free_object,

	.gem_vm_ops = &psb_gem_vm_ops,



	.dumb_create = psb_gem_dumb_create,

	.dumb_map_offset = psb_gem_dumb_map_gtt,

	.dumb_destroy = drm_gem_dumb_destroy,

	.ioctls = psb_ioctls,

	.fops = &psb_gem_fops,

	.name = DRIVER_NAME,

	.desc = DRIVER_DESC,

	.date = PSB_DRM_DRIVER_DATE,

	.major = PSB_DRM_DRIVER_MAJOR,

	.minor = PSB_DRM_DRIVER_MINOR,

	.patchlevel = PSB_DRM_DRIVER_PATCHLEVEL

	.date = DRIVER_DATE,

	.major = DRIVER_MAJOR,

	.minor = DRIVER_MINOR,

	.patchlevel = DRIVER_PATCHLEVEL

};



static struct pci_driver psb_pci_driver = {

	.name = DRIVER_NAME,

	.id_table = pciidlist,

	.probe = psb_probe,

	.remove = psb_remove,

	.driver = {

		.pm = &psb_pm_ops,

	}

	.probe = psb_pci_probe,

	.remove = psb_pci_remove,

	.driver.pm = &psb_pm_ops,

};



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

{

	return drm_get_pci_dev(pdev, ent, &driver);

}



static int __init psb_init(void)

{

	return drm_pci_init(&driver, &psb_pci_driver);
@@ -526,6 +522,6 @@ static void __exit psb_exit(void) 
late_initcall(psb_init);

module_exit(psb_exit);



MODULE_AUTHOR("Alan Cox <alan@linux.intel.com> and others");

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");
 
MODULE_LICENSE(DRIVER_LICENSE);

drivers/gpu/drm/gma500/psb_drv.h

+11 −11
Original line number Diff line number Diff line
@@ -35,6 +35,17 @@ 
#include "oaktrail.h"

#include "mmu.h"



#define DRIVER_AUTHOR "Alan Cox <alan@linux.intel.com> and others"

#define DRIVER_LICENSE "GPL"



#define DRIVER_NAME "gma500"

#define DRIVER_DESC "DRM driver for the Intel GMA500, GMA600, GMA3600, GMA3650"

#define DRIVER_DATE "20140314"



#define DRIVER_MAJOR 1

#define DRIVER_MINOR 0

#define DRIVER_PATCHLEVEL 0



/* Append new drm mode definition here, align with libdrm definition */

#define DRM_MODE_SCALE_NO_SCALE   	2
@@ -50,17 +61,6 @@ enum { 
#define IS_MFLD(dev) (((dev)->pdev->device & 0xfff8) == 0x0130)

#define IS_CDV(dev) (((dev)->pdev->device & 0xfff0) == 0x0be0)



/*

 * Driver definitions

 */



#define DRIVER_NAME "gma500"

#define DRIVER_DESC "DRM driver for the Intel GMA500"



#define PSB_DRM_DRIVER_DATE "2011-06-06"

#define PSB_DRM_DRIVER_MAJOR 1

#define PSB_DRM_DRIVER_MINOR 0

#define PSB_DRM_DRIVER_PATCHLEVEL 0



/*

 *	Hardware offsets