Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Sean 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

+6 -4
+6 -4
drivers/gpu/drm/ati_pcigart.c
··· 35 35 36 36 #include <drm/ati_pcigart.h> 37 37 #include <drm/drm_device.h> 38 - #include <drm/drm_os_linux.h> 39 38 #include <drm/drm_pci.h> 40 39 #include <drm/drm_print.h> 41 40 ··· 168 169 page_base = (u32) entry->busaddr[i]; 169 170 170 171 for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { 172 + u32 offset; 171 173 u32 val; 172 174 173 175 switch(gart_info->gart_reg_if) { ··· 184 184 break; 185 185 } 186 186 if (gart_info->gart_table_location == 187 - DRM_ATI_GART_MAIN) 187 + DRM_ATI_GART_MAIN) { 188 188 pci_gart[gart_idx] = cpu_to_le32(val); 189 - else 190 - DRM_WRITE32(map, gart_idx * sizeof(u32), val); 189 + } else { 190 + offset = gart_idx * sizeof(u32); 191 + writel(val, (void __iomem *)map->handle + offset); 192 + } 191 193 gart_idx++; 192 194 page_base += ATI_PCIGART_PAGE_SIZE; 193 195 }