Skip to content

Commit

Permalink
Revert "drm/ast: Remove reference to struct drm_device.pdev"
Browse files Browse the repository at this point in the history
This reverts commit fcb041c which is
commit 0ecb518 upstream.

Turns out this was incomplete, as it is missing a dependancy, so drop it
from the tree.

Link: https://lore.kernel.org/r/CAJn8CcHHKSo7GF29Z1ufXJJpMUzn6+fdvwiqe9=JvgpcfvnbHQ@mail.gmail.com
Reported-by: Xiaotian Feng <xtfeng@gmail.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Michael J. Ruhl <michael.j.ruhl@intel.com>
Cc: KuoHsiang Chou <kuohsiang_chou@aspeedtech.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dave Airlie <airlied@redhat.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Jul 20, 2021
1 parent b3f8120 commit b3aea76
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/gpu/drm/ast/ast_main.c
Expand Up @@ -406,6 +406,7 @@ struct ast_private *ast_device_create(struct drm_driver *drv,
return ast;
dev = &ast->base;

dev->pdev = pdev;
pci_set_drvdata(pdev, dev);

ast->regs = pcim_iomap(pdev, 1, 0);
Expand Down Expand Up @@ -447,8 +448,8 @@ struct ast_private *ast_device_create(struct drm_driver *drv,

/* map reserved buffer */
ast->dp501_fw_buf = NULL;
if (dev->vram_mm->vram_size < pci_resource_len(pdev, 0)) {
ast->dp501_fw_buf = pci_iomap_range(pdev, 0, dev->vram_mm->vram_size, 0);
if (dev->vram_mm->vram_size < pci_resource_len(dev->pdev, 0)) {
ast->dp501_fw_buf = pci_iomap_range(dev->pdev, 0, dev->vram_mm->vram_size, 0);
if (!ast->dp501_fw_buf)
drm_info(dev, "failed to map reserved buffer!\n");
}
Expand Down

0 comments on commit b3aea76

Please sign in to comment.