Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fc86860 authored by Dave Airlie's avatar Dave Airlie
Browse files

radeon: set the address to access the GART table on the CPU side correctly 



This code relied on the CPU and GPU address for the aperture being the same,
On some r5xx hardware I was playing with I noticed that this isn't always true.
This fixes issues seen on some r400 cards. (bugs.freedesktop.org 9957)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 5da0c7aa

drivers/char/drm/radeon_cp.c

+3 −2
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init) 
			dev_priv->gart_info.bus_addr =

			    dev_priv->pcigart_offset + dev_priv->fb_location;

			dev_priv->gart_info.mapping.offset =

			    dev_priv->gart_info.bus_addr;

			    dev_priv->pcigart_offset + dev_priv->fb_aper_offset;

			dev_priv->gart_info.mapping.size =

			    dev_priv->gart_info.table_size;
@@ -2275,7 +2275,8 @@ int radeon_driver_firstopen(struct drm_device *dev) 
	if (ret != 0)

		return ret;



	ret = drm_addmap(dev, drm_get_resource_start(dev, 0),

	dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);

	ret = drm_addmap(dev, dev_priv->fb_aper_offset,

			 drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,

			 _DRM_WRITE_COMBINING, &map);

	if (ret != 0)

drivers/char/drm/radeon_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ typedef struct drm_radeon_private { 


	/* starting from here on, data is preserved accross an open */

	uint32_t flags;		/* see radeon_chip_flags */

	unsigned long fb_aper_offset;

} drm_radeon_private_t;



typedef struct drm_radeon_buf_priv {