Commit 4c0d42f7 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/nouveau: Remove references to struct drm_device.pdev 



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

v3:
	* fix nv04_dfp_update_backlight() as well (Jeremy)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJeremy Cline <jcline@redhat.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210107080748.4768-8-tzimmermann@suse.de
parent 4d4dad21

drivers/gpu/drm/nouveau/dispnv04/arb.c

+7 −5
Original line number Diff line number Diff line
@@ -200,16 +200,17 @@ nv04_update_arb(struct drm_device *dev, int VClk, int bpp, 
	int MClk = nouveau_hw_get_clock(dev, PLL_MEMORY);

	int NVClk = nouveau_hw_get_clock(dev, PLL_CORE);

	uint32_t cfg1 = nvif_rd32(device, NV04_PFB_CFG1);

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



	sim_data.pclk_khz = VClk;

	sim_data.mclk_khz = MClk;

	sim_data.nvclk_khz = NVClk;

	sim_data.bpp = bpp;

	sim_data.two_heads = nv_two_heads(dev);

	if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ ||

	    (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) {

	if ((pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ ||

	    (pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) {

		uint32_t type;

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

		int domain = pci_domain_nr(pdev->bus);



		pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 1),

				      0x7c, &type);
@@ -251,11 +252,12 @@ void 
nouveau_calc_arb(struct drm_device *dev, int vclk, int bpp, int *burst, int *lwm)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

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



	if (drm->client.device.info.family < NV_DEVICE_INFO_V0_KELVIN)

		nv04_update_arb(dev, vclk, bpp, burst, lwm);

	else if ((dev->pdev->device & 0xfff0) == 0x0240 /*CHIPSET_C51*/ ||

		 (dev->pdev->device & 0xfff0) == 0x03d0 /*CHIPSET_C512*/) {

	else if ((pdev->device & 0xfff0) == 0x0240 /*CHIPSET_C51*/ ||

		 (pdev->device & 0xfff0) == 0x03d0 /*CHIPSET_C512*/) {

		*burst = 128;

		*lwm = 0x0480;

	} else

drivers/gpu/drm/nouveau/dispnv04/dfp.c

+3 −2
Original line number Diff line number Diff line
@@ -488,12 +488,13 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) 
#ifdef __powerpc__

	struct drm_device *dev = encoder->dev;

	struct nvif_object *device = &nouveau_drm(dev)->client.device.object;

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



	/* BIOS scripts usually take care of the backlight, thanks

	 * Apple for your consistency.

	 */

	if (dev->pdev->device == 0x0174 || dev->pdev->device == 0x0179 ||

	    dev->pdev->device == 0x0189 || dev->pdev->device == 0x0329) {

	if (pdev->device == 0x0174 || pdev->device == 0x0179 ||

	    pdev->device == 0x0189 || pdev->device == 0x0329) {

		if (mode == DRM_MODE_DPMS_ON) {

			nvif_mask(device, NV_PBUS_DEBUG_DUALHEAD_CTL, 1 << 31, 1 << 31);

			nvif_mask(device, NV_PCRTC_GPIO_EXT, 3, 1);

drivers/gpu/drm/nouveau/dispnv04/disp.h

+8 −6
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static inline bool 
nv_two_heads(struct drm_device *dev)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	const int impl = dev->pdev->device & 0x0ff0;

	const int impl = to_pci_dev(dev->dev)->device & 0x0ff0;



	if (drm->client.device.info.family >= NV_DEVICE_INFO_V0_CELSIUS && impl != 0x0100 &&

	    impl != 0x0150 && impl != 0x01a0 && impl != 0x0200)
@@ -142,14 +142,14 @@ nv_two_heads(struct drm_device *dev) 
static inline bool

nv_gf4_disp_arch(struct drm_device *dev)

{

	return nv_two_heads(dev) && (dev->pdev->device & 0x0ff0) != 0x0110;

	return nv_two_heads(dev) && (to_pci_dev(dev->dev)->device & 0x0ff0) != 0x0110;

}



static inline bool

nv_two_reg_pll(struct drm_device *dev)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

	const int impl = dev->pdev->device & 0x0ff0;

	const int impl = to_pci_dev(dev->dev)->device & 0x0ff0;



	if (impl == 0x0310 || impl == 0x0340 || drm->client.device.info.family >= NV_DEVICE_INFO_V0_CURIE)

		return true;
@@ -160,9 +160,11 @@ static inline bool 
nv_match_device(struct drm_device *dev, unsigned device,

		unsigned sub_vendor, unsigned sub_device)

{

	return dev->pdev->device == device &&

		dev->pdev->subsystem_vendor == sub_vendor &&

		dev->pdev->subsystem_device == sub_device;

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



	return pdev->device == device &&

		pdev->subsystem_vendor == sub_vendor &&

		pdev->subsystem_device == sub_device;

}



#include <subdev/bios/init.h>

drivers/gpu/drm/nouveau/dispnv04/hw.c

+6 −4
Original line number Diff line number Diff line
@@ -214,14 +214,15 @@ nouveau_hw_pllvals_to_clk(struct nvkm_pll_vals *pv) 
int

nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)

{

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

	struct nvkm_pll_vals pllvals;

	int ret;

	int domain;



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

	domain = pci_domain_nr(pdev->bus);



	if (plltype == PLL_MEMORY &&

	    (dev->pdev->device & 0x0ff0) == CHIPSET_NFORCE) {

	    (pdev->device & 0x0ff0) == CHIPSET_NFORCE) {

		uint32_t mpllP;

		pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 3),

				      0x6c, &mpllP);
@@ -232,7 +233,7 @@ nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype) 
		return 400000 / mpllP;

	} else

	if (plltype == PLL_MEMORY &&

	    (dev->pdev->device & 0xff0) == CHIPSET_NFORCE2) {

	    (pdev->device & 0xff0) == CHIPSET_NFORCE2) {

		uint32_t clock;



		pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 5),
@@ -309,6 +310,7 @@ void 
nouveau_hw_save_vga_fonts(struct drm_device *dev, bool save)

{

	struct nouveau_drm *drm = nouveau_drm(dev);

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

	uint8_t misc, gr4, gr5, gr6, seq2, seq4;

	bool graphicsmode;

	unsigned plane;
@@ -327,7 +329,7 @@ nouveau_hw_save_vga_fonts(struct drm_device *dev, bool save) 
	NV_INFO(drm, "%sing VGA fonts\n", save ? "Sav" : "Restor");



	/* map first 64KiB of VRAM, holds VGA fonts etc */

	iovram = ioremap(pci_resource_start(dev->pdev, 1), 65536);

	iovram = ioremap(pci_resource_start(pdev, 1), 65536);

	if (!iovram) {

		NV_ERROR(drm, "Failed to map VRAM, "

					"cannot save/restore VGA fonts.\n");

drivers/gpu/drm/nouveau/nouveau_abi16.c

+4 −3
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
	struct nvif_device *device = &drm->client.device;

	struct nvkm_gr *gr = nvxx_gr(device);

	struct drm_nouveau_getparam *getparam = data;

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



	switch (getparam->param) {

	case NOUVEAU_GETPARAM_CHIPSET_ID:
@@ -188,13 +189,13 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
		break;

	case NOUVEAU_GETPARAM_PCI_VENDOR:

		if (device->info.platform != NV_DEVICE_INFO_V0_SOC)

			getparam->value = dev->pdev->vendor;

			getparam->value = pdev->vendor;

		else

			getparam->value = 0;

		break;

	case NOUVEAU_GETPARAM_PCI_DEVICE:

		if (device->info.platform != NV_DEVICE_INFO_V0_SOC)

			getparam->value = dev->pdev->device;

			getparam->value = pdev->device;

		else

			getparam->value = 0;

		break;
@@ -205,7 +206,7 @@ nouveau_abi16_ioctl_getparam(ABI16_IOCTL_ARGS) 
		case NV_DEVICE_INFO_V0_PCIE: getparam->value = 2; break;

		case NV_DEVICE_INFO_V0_SOC : getparam->value = 3; break;

		case NV_DEVICE_INFO_V0_IGP :

			if (!pci_is_pcie(dev->pdev))

			if (!pci_is_pcie(pdev))

				getparam->value = 1;

			else

				getparam->value = 2;