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

drm/radeon: Remove references to struct drm_device.pdev 



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

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201201103542.2182-17-tzimmermann@suse.de
parent abe39108

drivers/gpu/drm/radeon/atombios_encoders.c

+3 −3
Original line number Diff line number Diff line
@@ -2062,9 +2062,9 @@ atombios_apply_encoder_quirks(struct drm_encoder *encoder, 
	struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);



	/* Funky macbooks */

	if ((dev->pdev->device == 0x71C5) &&

	    (dev->pdev->subsystem_vendor == 0x106b) &&

	    (dev->pdev->subsystem_device == 0x0080)) {

	if ((rdev->pdev->device == 0x71C5) &&

	    (rdev->pdev->subsystem_vendor == 0x106b) &&

	    (rdev->pdev->subsystem_device == 0x0080)) {

		if (radeon_encoder->devices & ATOM_DEVICE_LCD1_SUPPORT) {

			uint32_t lvtma_bit_depth_control = RREG32(AVIVO_LVTMA_BIT_DEPTH_CONTROL);

drivers/gpu/drm/radeon/r100.c

+12 −13
Original line number Diff line number Diff line
@@ -2612,7 +2612,6 @@ int r100_asic_reset(struct radeon_device *rdev, bool hard) 


void r100_set_common_regs(struct radeon_device *rdev)

{

	struct drm_device *dev = rdev->ddev;

	bool force_dac2 = false;

	u32 tmp;
@@ -2630,7 +2629,7 @@ void r100_set_common_regs(struct radeon_device *rdev) 
	 * don't report it in the bios connector

	 * table.

	 */

	switch (dev->pdev->device) {

	switch (rdev->pdev->device) {

		/* RN50 */

	case 0x515e:

	case 0x5969:
@@ -2640,17 +2639,17 @@ void r100_set_common_regs(struct radeon_device *rdev) 
	case 0x5159:

	case 0x515a:

		/* DELL triple head servers */

		if ((dev->pdev->subsystem_vendor == 0x1028 /* DELL */) &&

		    ((dev->pdev->subsystem_device == 0x016c) ||

		     (dev->pdev->subsystem_device == 0x016d) ||

		     (dev->pdev->subsystem_device == 0x016e) ||

		     (dev->pdev->subsystem_device == 0x016f) ||

		     (dev->pdev->subsystem_device == 0x0170) ||

		     (dev->pdev->subsystem_device == 0x017d) ||

		     (dev->pdev->subsystem_device == 0x017e) ||

		     (dev->pdev->subsystem_device == 0x0183) ||

		     (dev->pdev->subsystem_device == 0x018a) ||

		     (dev->pdev->subsystem_device == 0x019a)))

		if ((rdev->pdev->subsystem_vendor == 0x1028 /* DELL */) &&

		    ((rdev->pdev->subsystem_device == 0x016c) ||

		     (rdev->pdev->subsystem_device == 0x016d) ||

		     (rdev->pdev->subsystem_device == 0x016e) ||

		     (rdev->pdev->subsystem_device == 0x016f) ||

		     (rdev->pdev->subsystem_device == 0x0170) ||

		     (rdev->pdev->subsystem_device == 0x017d) ||

		     (rdev->pdev->subsystem_device == 0x017e) ||

		     (rdev->pdev->subsystem_device == 0x0183) ||

		     (rdev->pdev->subsystem_device == 0x018a) ||

		     (rdev->pdev->subsystem_device == 0x019a)))

			force_dac2 = true;

		break;

	}

drivers/gpu/drm/radeon/radeon.h

+16 −16
Original line number Diff line number Diff line
@@ -2622,14 +2622,14 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); 
		(rdev->family == CHIP_RV410) ||			\

		(rdev->family == CHIP_RS400) ||			\

		(rdev->family == CHIP_RS480))

#define ASIC_IS_X2(rdev) ((rdev->ddev->pdev->device == 0x9441) || \

		(rdev->ddev->pdev->device == 0x9443) || \

		(rdev->ddev->pdev->device == 0x944B) || \

		(rdev->ddev->pdev->device == 0x9506) || \

		(rdev->ddev->pdev->device == 0x9509) || \

		(rdev->ddev->pdev->device == 0x950F) || \

		(rdev->ddev->pdev->device == 0x689C) || \

		(rdev->ddev->pdev->device == 0x689D))

#define ASIC_IS_X2(rdev) ((rdev->pdev->device == 0x9441) || \

		(rdev->pdev->device == 0x9443) || \

		(rdev->pdev->device == 0x944B) || \

		(rdev->pdev->device == 0x9506) || \

		(rdev->pdev->device == 0x9509) || \

		(rdev->pdev->device == 0x950F) || \

		(rdev->pdev->device == 0x689C) || \

		(rdev->pdev->device == 0x689D))

#define ASIC_IS_AVIVO(rdev) ((rdev->family >= CHIP_RS600))

#define ASIC_IS_DCE2(rdev) ((rdev->family == CHIP_RS600)  ||	\

			    (rdev->family == CHIP_RS690)  ||	\
@@ -2652,14 +2652,14 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); 
#define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI) || \

			     (rdev->family == CHIP_MULLINS))



#define ASIC_IS_LOMBOK(rdev) ((rdev->ddev->pdev->device == 0x6849) || \

			      (rdev->ddev->pdev->device == 0x6850) || \

			      (rdev->ddev->pdev->device == 0x6858) || \

			      (rdev->ddev->pdev->device == 0x6859) || \

			      (rdev->ddev->pdev->device == 0x6840) || \

			      (rdev->ddev->pdev->device == 0x6841) || \

			      (rdev->ddev->pdev->device == 0x6842) || \

			      (rdev->ddev->pdev->device == 0x6843))

#define ASIC_IS_LOMBOK(rdev) ((rdev->pdev->device == 0x6849) || \

			      (rdev->pdev->device == 0x6850) || \

			      (rdev->pdev->device == 0x6858) || \

			      (rdev->pdev->device == 0x6859) || \

			      (rdev->pdev->device == 0x6840) || \

			      (rdev->pdev->device == 0x6841) || \

			      (rdev->pdev->device == 0x6842) || \

			      (rdev->pdev->device == 0x6843))



/*

 * BIOS helpers.

drivers/gpu/drm/radeon/radeon_atombios.c

+45 −44
Original line number Diff line number Diff line
@@ -284,46 +284,47 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
				     uint16_t *line_mux,

				     struct radeon_hpd *hpd)

{

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



	/* Asus M2A-VM HDMI board lists the DVI port as HDMI */

	if ((dev->pdev->device == 0x791e) &&

	    (dev->pdev->subsystem_vendor == 0x1043) &&

	    (dev->pdev->subsystem_device == 0x826d)) {

	if ((pdev->device == 0x791e) &&

	    (pdev->subsystem_vendor == 0x1043) &&

	    (pdev->subsystem_device == 0x826d)) {

		if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) &&

		    (supported_device == ATOM_DEVICE_DFP3_SUPPORT))

			*connector_type = DRM_MODE_CONNECTOR_DVID;

	}



	/* Asrock RS600 board lists the DVI port as HDMI */

	if ((dev->pdev->device == 0x7941) &&

	    (dev->pdev->subsystem_vendor == 0x1849) &&

	    (dev->pdev->subsystem_device == 0x7941)) {

	if ((pdev->device == 0x7941) &&

	    (pdev->subsystem_vendor == 0x1849) &&

	    (pdev->subsystem_device == 0x7941)) {

		if ((*connector_type == DRM_MODE_CONNECTOR_HDMIA) &&

		    (supported_device == ATOM_DEVICE_DFP3_SUPPORT))

			*connector_type = DRM_MODE_CONNECTOR_DVID;

	}



	/* MSI K9A2GM V2/V3 board has no HDMI or DVI */

	if ((dev->pdev->device == 0x796e) &&

	    (dev->pdev->subsystem_vendor == 0x1462) &&

	    (dev->pdev->subsystem_device == 0x7302)) {

	if ((pdev->device == 0x796e) &&

	    (pdev->subsystem_vendor == 0x1462) &&

	    (pdev->subsystem_device == 0x7302)) {

		if ((supported_device == ATOM_DEVICE_DFP2_SUPPORT) ||

		    (supported_device == ATOM_DEVICE_DFP3_SUPPORT))

			return false;

	}



	/* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */

	if ((dev->pdev->device == 0x7941) &&

	    (dev->pdev->subsystem_vendor == 0x147b) &&

	    (dev->pdev->subsystem_device == 0x2412)) {

	if ((pdev->device == 0x7941) &&

	    (pdev->subsystem_vendor == 0x147b) &&

	    (pdev->subsystem_device == 0x2412)) {

		if (*connector_type == DRM_MODE_CONNECTOR_DVII)

			return false;

	}



	/* Falcon NW laptop lists vga ddc line for LVDS */

	if ((dev->pdev->device == 0x5653) &&

	    (dev->pdev->subsystem_vendor == 0x1462) &&

	    (dev->pdev->subsystem_device == 0x0291)) {

	if ((pdev->device == 0x5653) &&

	    (pdev->subsystem_vendor == 0x1462) &&

	    (pdev->subsystem_device == 0x0291)) {

		if (*connector_type == DRM_MODE_CONNECTOR_LVDS) {

			i2c_bus->valid = false;

			*line_mux = 53;
@@ -331,26 +332,26 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
	}



	/* HIS X1300 is DVI+VGA, not DVI+DVI */

	if ((dev->pdev->device == 0x7146) &&

	    (dev->pdev->subsystem_vendor == 0x17af) &&

	    (dev->pdev->subsystem_device == 0x2058)) {

	if ((pdev->device == 0x7146) &&

	    (pdev->subsystem_vendor == 0x17af) &&

	    (pdev->subsystem_device == 0x2058)) {

		if (supported_device == ATOM_DEVICE_DFP1_SUPPORT)

			return false;

	}



	/* Gigabyte X1300 is DVI+VGA, not DVI+DVI */

	if ((dev->pdev->device == 0x7142) &&

	    (dev->pdev->subsystem_vendor == 0x1458) &&

	    (dev->pdev->subsystem_device == 0x2134)) {

	if ((pdev->device == 0x7142) &&

	    (pdev->subsystem_vendor == 0x1458) &&

	    (pdev->subsystem_device == 0x2134)) {

		if (supported_device == ATOM_DEVICE_DFP1_SUPPORT)

			return false;

	}





	/* Funky macbooks */

	if ((dev->pdev->device == 0x71C5) &&

	    (dev->pdev->subsystem_vendor == 0x106b) &&

	    (dev->pdev->subsystem_device == 0x0080)) {

	if ((pdev->device == 0x71C5) &&

	    (pdev->subsystem_vendor == 0x106b) &&

	    (pdev->subsystem_device == 0x0080)) {

		if ((supported_device == ATOM_DEVICE_CRT1_SUPPORT) ||

		    (supported_device == ATOM_DEVICE_DFP2_SUPPORT))

			return false;
@@ -366,27 +367,27 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
	}



	/* ASUS HD 3600 XT board lists the DVI port as HDMI */

	if ((dev->pdev->device == 0x9598) &&

	    (dev->pdev->subsystem_vendor == 0x1043) &&

	    (dev->pdev->subsystem_device == 0x01da)) {

	if ((pdev->device == 0x9598) &&

	    (pdev->subsystem_vendor == 0x1043) &&

	    (pdev->subsystem_device == 0x01da)) {

		if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {

			*connector_type = DRM_MODE_CONNECTOR_DVII;

		}

	}



	/* ASUS HD 3600 board lists the DVI port as HDMI */

	if ((dev->pdev->device == 0x9598) &&

	    (dev->pdev->subsystem_vendor == 0x1043) &&

	    (dev->pdev->subsystem_device == 0x01e4)) {

	if ((pdev->device == 0x9598) &&

	    (pdev->subsystem_vendor == 0x1043) &&

	    (pdev->subsystem_device == 0x01e4)) {

		if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {

			*connector_type = DRM_MODE_CONNECTOR_DVII;

		}

	}



	/* ASUS HD 3450 board lists the DVI port as HDMI */

	if ((dev->pdev->device == 0x95C5) &&

	    (dev->pdev->subsystem_vendor == 0x1043) &&

	    (dev->pdev->subsystem_device == 0x01e2)) {

	if ((pdev->device == 0x95C5) &&

	    (pdev->subsystem_vendor == 0x1043) &&

	    (pdev->subsystem_device == 0x01e2)) {

		if (*connector_type == DRM_MODE_CONNECTOR_HDMIA) {

			*connector_type = DRM_MODE_CONNECTOR_DVII;

		}
@@ -411,9 +412,9 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
	 * with different crtcs which isn't possible on the hardware

	 * side and leaves no crtcs for LVDS or VGA.

	 */

	if (((dev->pdev->device == 0x95c4) || (dev->pdev->device == 0x9591)) &&

	    (dev->pdev->subsystem_vendor == 0x1025) &&

	    (dev->pdev->subsystem_device == 0x013c)) {

	if (((pdev->device == 0x95c4) || (pdev->device == 0x9591)) &&

	    (pdev->subsystem_vendor == 0x1025) &&

	    (pdev->subsystem_device == 0x013c)) {

		if ((*connector_type == DRM_MODE_CONNECTOR_DVII) &&

		    (supported_device == ATOM_DEVICE_DFP1_SUPPORT)) {

			/* actually it's a DVI-D port not DVI-I */
@@ -425,9 +426,9 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
	/* XFX Pine Group device rv730 reports no VGA DDC lines

	 * even though they are wired up to record 0x93

	 */

	if ((dev->pdev->device == 0x9498) &&

	    (dev->pdev->subsystem_vendor == 0x1682) &&

	    (dev->pdev->subsystem_device == 0x2452) &&

	if ((pdev->device == 0x9498) &&

	    (pdev->subsystem_vendor == 0x1682) &&

	    (pdev->subsystem_device == 0x2452) &&

	    (i2c_bus->valid == false) &&

	    !(supported_device & (ATOM_DEVICE_TV_SUPPORT | ATOM_DEVICE_CV_SUPPORT))) {

		struct radeon_device *rdev = dev->dev_private;
@@ -435,11 +436,11 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, 
	}



	/* Fujitsu D3003-S2 board lists DVI-I as DVI-D and VGA */

	if (((dev->pdev->device == 0x9802) ||

	     (dev->pdev->device == 0x9805) ||

	     (dev->pdev->device == 0x9806)) &&

	    (dev->pdev->subsystem_vendor == 0x1734) &&

	    (dev->pdev->subsystem_device == 0x11bd)) {

	if (((pdev->device == 0x9802) ||

	     (pdev->device == 0x9805) ||

	     (pdev->device == 0x9806)) &&

	    (pdev->subsystem_vendor == 0x1734) &&

	    (pdev->subsystem_device == 0x11bd)) {

		if (*connector_type == DRM_MODE_CONNECTOR_VGA) {

			*connector_type = DRM_MODE_CONNECTOR_DVII;

			*line_mux = 0x3103;

drivers/gpu/drm/radeon/radeon_bios.c

+3 −3
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev) 
	crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL);

	fp2_gen_cntl = 0;



	if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {

	if (rdev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {

		fp2_gen_cntl = RREG32(RADEON_FP2_GEN_CNTL);

	}
@@ -565,7 +565,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev) 
		(RADEON_CRTC_SYNC_TRISTAT |

		 RADEON_CRTC_DISPLAY_DIS)));



	if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {

	if (rdev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {

		WREG32(RADEON_FP2_GEN_CNTL, (fp2_gen_cntl & ~RADEON_FP2_ON));

	}
@@ -583,7 +583,7 @@ static bool legacy_read_disabled_bios(struct radeon_device *rdev) 
		WREG32(RADEON_CRTC2_GEN_CNTL, crtc2_gen_cntl);

	}

	WREG32(RADEON_CRTC_EXT_CNTL, crtc_ext_cntl);

	if (rdev->ddev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {

	if (rdev->pdev->device == PCI_DEVICE_ID_ATI_RADEON_QY) {

		WREG32(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);

	}

	return r;