Commit a2c68495 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/gma500: Remove references to struct drm_device.pdev 



Using struct drm_device.pdev is deprecated. Convert gma500 to struct
drm_device.dev. No functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201201103542.2182-8-tzimmermann@suse.de
parent ba596ee6

drivers/gpu/drm/gma500/cdv_device.c

+15 −7
Original line number Diff line number Diff line
@@ -95,13 +95,14 @@ static u32 cdv_get_max_backlight(struct drm_device *dev) 
static int cdv_get_brightness(struct backlight_device *bd)

{

	struct drm_device *dev = bl_get_data(bd);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	u32 val = REG_READ(BLC_PWM_CTL) & BACKLIGHT_DUTY_CYCLE_MASK;



	if (cdv_backlight_combination_mode(dev)) {

		u8 lbpc;



		val &= ~1;

		pci_read_config_byte(dev->pdev, 0xF4, &lbpc);

		pci_read_config_byte(pdev, 0xF4, &lbpc);

		val *= lbpc;

	}

	return (val * 100)/cdv_get_max_backlight(dev);
@@ -111,6 +112,7 @@ static int cdv_get_brightness(struct backlight_device *bd) 
static int cdv_set_brightness(struct backlight_device *bd)

{

	struct drm_device *dev = bl_get_data(bd);

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	int level = bd->props.brightness;

	u32 blc_pwm_ctl;
@@ -128,7 +130,7 @@ static int cdv_set_brightness(struct backlight_device *bd) 
		lbpc = level * 0xfe / max + 1;

		level /= lbpc;



		pci_write_config_byte(dev->pdev, 0xF4, lbpc);

		pci_write_config_byte(pdev, 0xF4, lbpc);

	}



	blc_pwm_ctl = REG_READ(BLC_PWM_CTL) & ~BACKLIGHT_DUTY_CYCLE_MASK;
@@ -205,8 +207,9 @@ static inline void CDV_MSG_WRITE32(int domain, uint port, uint offset, 
static void cdv_init_pm(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	u32 pwr_cnt;

	int domain = pci_domain_nr(dev->pdev->bus);

	int domain = pci_domain_nr(pdev->bus);

	int i;



	dev_priv->apm_base = CDV_MSG_READ32(domain, PSB_PUNIT_PORT,
@@ -234,6 +237,8 @@ static void cdv_init_pm(struct drm_device *dev) 


static void cdv_errata(struct drm_device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	/* Disable bonus launch.

	 *	CPU and GPU competes for memory and display misses updates and

	 *	flickers. Worst with dual core, dual displays.
@@ -242,7 +247,7 @@ static void cdv_errata(struct drm_device *dev) 
	 *	Bonus Launch to work around the issue, by degrading

	 *	performance.

	 */

	 CDV_MSG_WRITE32(pci_domain_nr(dev->pdev->bus), 3, 0x30, 0x08027108);

	 CDV_MSG_WRITE32(pci_domain_nr(pdev->bus), 3, 0x30, 0x08027108);

}



/**
@@ -255,12 +260,13 @@ static void cdv_errata(struct drm_device *dev) 
static int cdv_save_display_registers(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct psb_save_area *regs = &dev_priv->regs;

	struct drm_connector *connector;



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



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

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



	regs->cdv.saveDSPCLK_GATE_D = REG_READ(DSPCLK_GATE_D);

	regs->cdv.saveRAMCLK_GATE_D = REG_READ(RAMCLK_GATE_D);
@@ -309,11 +315,12 @@ static int cdv_save_display_registers(struct drm_device *dev) 
static int cdv_restore_display_registers(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct psb_save_area *regs = &dev_priv->regs;

	struct drm_connector *connector;

	u32 temp;



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

	pci_write_config_byte(pdev, 0xF4, regs->cdv.saveLBB);



	REG_WRITE(DSPCLK_GATE_D, regs->cdv.saveDSPCLK_GATE_D);

	REG_WRITE(RAMCLK_GATE_D, regs->cdv.saveRAMCLK_GATE_D);
@@ -568,9 +575,10 @@ static const struct psb_offset cdv_regmap[2] = { 
static int cdv_chip_setup(struct drm_device *dev)

{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	INIT_WORK(&dev_priv->hotplug_work, cdv_hotplug_work_func);



	if (pci_enable_msi(dev->pdev))

	if (pci_enable_msi(pdev))

		dev_warn(dev->dev, "Enabling MSI failed!\n");

	dev_priv->regmap = cdv_regmap;

	gma_get_core_freq(dev);

drivers/gpu/drm/gma500/cdv_intel_crt.c

+1 −2
Original line number Diff line number Diff line
@@ -278,8 +278,7 @@ void cdv_intel_crt_init(struct drm_device *dev, 
	gma_encoder->ddc_bus = psb_intel_i2c_create(dev,

							  i2c_reg, "CRTDDC_A");

	if (!gma_encoder->ddc_bus) {

		dev_printk(KERN_ERR, &dev->pdev->dev, "DDC bus registration "

			   "failed.\n");

		dev_printk(KERN_ERR, dev->dev, "DDC bus registration failed.\n");

		goto failed_ddc;

	}

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+2 −2
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
							 "LVDSBLC_B");

	if (!gma_encoder->i2c_bus) {

		dev_printk(KERN_ERR,

			&dev->pdev->dev, "I2C bus registration failed.\n");

			dev->dev, "I2C bus registration failed.\n");

		goto failed_blc_i2c;

	}

	gma_encoder->i2c_bus->slave_addr = 0x2C;
@@ -575,7 +575,7 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
							 GPIOC,

							 "LVDSDDC_C");

	if (!gma_encoder->ddc_bus) {

		dev_printk(KERN_ERR, &dev->pdev->dev,

		dev_printk(KERN_ERR, dev->dev,

			   "DDC bus registration " "failed.\n");

		goto failed_ddc;

	}

drivers/gpu/drm/gma500/framebuffer.c

+5 −4
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ static int psbfb_create(struct drm_fb_helper *fb_helper, 
{

	struct drm_device *dev = fb_helper->dev;

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct fb_info *info;

	struct drm_framebuffer *fb;

	struct drm_mode_fb_cmd2 mode_cmd;
@@ -325,8 +326,8 @@ static int psbfb_create(struct drm_fb_helper *fb_helper, 


	drm_fb_helper_fill_info(info, fb_helper, sizes);



	info->fix.mmio_start = pci_resource_start(dev->pdev, 0);

	info->fix.mmio_len = pci_resource_len(dev->pdev, 0);

	info->fix.mmio_start = pci_resource_start(pdev, 0);

	info->fix.mmio_len = pci_resource_len(pdev, 0);



	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
@@ -529,6 +530,7 @@ void psb_modeset_init(struct drm_device *dev) 
{

	struct drm_psb_private *dev_priv = dev->dev_private;

	struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	int i;



	drm_mode_config_init(dev);
@@ -540,8 +542,7 @@ void psb_modeset_init(struct drm_device *dev) 


	/* set memory base */

	/* Oaktrail and Poulsbo should use BAR 2*/

	pci_read_config_dword(dev->pdev, PSB_BSM, (u32 *)

					&(dev->mode_config.fb_base));

	pci_read_config_dword(pdev, PSB_BSM, (u32 *)&(dev->mode_config.fb_base));



	/* num pipes is 2 for PSB but 1 for Mrst */

	for (i = 0; i < dev_priv->num_pipe; i++)

drivers/gpu/drm/gma500/gma_device.c

+2 −1
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ 
void gma_get_core_freq(struct drm_device *dev)

{

	uint32_t clock;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	struct pci_dev *pci_root =

		pci_get_domain_bus_and_slot(pci_domain_nr(dev->pdev->bus),

		pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus),

					    0, 0);

	struct drm_psb_private *dev_priv = dev->dev_private;