OSDN Git Service

drm/nouveau: Remove invalid reference to struct drm_device.pdev
authorThomas Zimmermann <tzimmermann@suse.de>
Wed, 12 May 2021 18:55:27 +0000 (20:55 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 13 May 2021 12:57:54 +0000 (14:57 +0200)
The pdev field got removed from struct drm_device recently. Replace
the invalid reference with an upcast from the struct's dev field.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: b347e04452ff ("drm: Remove pdev field from struct drm_device")
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Maxime Ripard <maxime@cerno.tech>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20210512185527.26050-1-tzimmermann@suse.de
drivers/gpu/drm/nouveau/nouveau_connector.c

index 7f38788..2a298c1 100644 (file)
@@ -460,7 +460,8 @@ nouveau_connector_of_detect(struct drm_connector *connector)
        struct drm_device *dev = connector->dev;
        struct nouveau_connector *nv_connector = nouveau_connector(connector);
        struct nouveau_encoder *nv_encoder;
-       struct device_node *cn, *dn = pci_device_to_OF_node(dev->pdev);
+       struct pci_dev *pdev = to_pci_dev(dev->dev);
+       struct device_node *cn, *dn = pci_device_to_OF_node(pdev);
 
        if (!dn ||
            !((nv_encoder = find_encoder(connector, DCB_OUTPUT_TMDS)) ||