diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-02-12 03:57:54 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-02-12 03:59:03 +0300 |
| commit | ef23d5008b9fb10d60fc5ad87f8ff24df4533a7d (patch) | |
| tree | 005eef4872f3ba4d37012bafed0f332c3fb59534 /drivers/gpu/drm/nouveau | |
| parent | ac35d19fe871c81b9d78053d675095b597270304 (diff) | |
| parent | e2183fb135a7f62d317aa1c61eb3d1919080edba (diff) | |
| download | linux-ef23d5008b9fb10d60fc5ad87f8ff24df4533a7d.tar.xz | |
Merge tag 'drm-misc-next-fixes-2021-02-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next-fixes cherry picked from drm-misc-next for v5.12:
- Assorted small fixes.
- Disable and remove gma3600 support.
- Fix CEC for vc4/hdmi.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/dac2ae30-c5d9-4222-39e2-f64067310491@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 7cc683b8dc7a..e8c445eb1100 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -2083,13 +2083,11 @@ nouveau_bios_init(struct drm_device *dev) { struct nouveau_drm *drm = nouveau_drm(dev); struct nvbios *bios = &drm->vbios; - struct pci_dev *pdev; int ret; /* only relevant for PCI devices */ if (!dev_is_pci(dev->dev)) return 0; - pdev = to_pci_dev(dev->dev); if (!NVInitVBIOS(dev)) return -ENODEV; |