Commit 03fda35d authored by Sam Ravnborg's avatar Sam Ravnborg

drm/ati_pcigart: drop dependency on drm_os_linux.h

The drm_os_linux.h header is deprecated.
Just opencode the sole DRM_WRITE32().
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarSean Paul <sean@poorly.run>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190718161507.2047-5-sam@ravnborg.org
parent 3e37c715
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <drm/ati_pcigart.h> #include <drm/ati_pcigart.h>
#include <drm/drm_device.h> #include <drm/drm_device.h>
#include <drm/drm_os_linux.h>
#include <drm/drm_pci.h> #include <drm/drm_pci.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
...@@ -169,6 +168,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga ...@@ -169,6 +168,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
page_base = (u32) entry->busaddr[i]; page_base = (u32) entry->busaddr[i];
for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) {
u32 offset;
u32 val; u32 val;
switch(gart_info->gart_reg_if) { switch(gart_info->gart_reg_if) {
...@@ -184,10 +184,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga ...@@ -184,10 +184,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
break; break;
} }
if (gart_info->gart_table_location == if (gart_info->gart_table_location ==
DRM_ATI_GART_MAIN) DRM_ATI_GART_MAIN) {
pci_gart[gart_idx] = cpu_to_le32(val); pci_gart[gart_idx] = cpu_to_le32(val);
else } else {
DRM_WRITE32(map, gart_idx * sizeof(u32), val); offset = gart_idx * sizeof(u32);
writel(val, (void __iomem *)map->handle + offset);
}
gart_idx++; gart_idx++;
page_base += ATI_PCIGART_PAGE_SIZE; page_base += ATI_PCIGART_PAGE_SIZE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment