Skip to content

Commit

Permalink
staging: gma500: delete the RAR handling
Browse files Browse the repository at this point in the history 
RAR registers are used on MID platforms for various protected video
playback activities using video playback engines we don't support.

So Rasputin can keep his Rars

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent c69a203 commit 7e2c6c4
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 71 deletions.
16 changes: 1 addition & 15 deletions drivers/staging/gma500/psb_buffer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,6 @@ static int psb_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
man->available_caching = TTM_PL_FLAG_UNCACHED;
man->default_caching = TTM_PL_FLAG_UNCACHED;
break;
case TTM_PL_RAR: /* Unmappable RAR memory */
man->func = &ttm_bo_manager_func;
man->flags = TTM_MEMTYPE_FLAG_MAPPABLE |
TTM_MEMTYPE_FLAG_FIXED;
man->available_caching = TTM_PL_FLAG_UNCACHED;
man->default_caching = TTM_PL_FLAG_UNCACHED;
man->gpu_offset = pg->mmu_gatt_start + (pg->rar_start);
break;
case TTM_PL_TT: /* Mappable GATT memory */
man->func = &ttm_bo_manager_func;
#ifdef PSB_WORKING_HOST_MMU_ACCESS
Expand All @@ -95,8 +87,7 @@ static int psb_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
man->available_caching = TTM_PL_FLAG_CACHED |
TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
man->default_caching = TTM_PL_FLAG_WC;
man->gpu_offset = pg->mmu_gatt_start +
(pg->rar_start + dev_priv->rar_region_size);
man->gpu_offset = pg->mmu_gatt_start;
break;
default:
DRM_ERROR("Unsupported memory type %u\n", (unsigned) type);
Expand Down Expand Up @@ -387,11 +378,6 @@ static int psb_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
mem->bus.base = dev_priv->ci_region_start;;
mem->bus.is_iomem = true;
break;
case TTM_PL_RAR:
mem->bus.offset = mm_node->start << PAGE_SHIFT;
mem->bus.base = dev_priv->rar_region_start;;
mem->bus.is_iomem = true;
break;
default:
return -EINVAL;
}
Expand Down
29 changes: 1 addition & 28 deletions drivers/staging/gma500/psb_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,11 +321,6 @@ static void psb_do_takedown(struct drm_device *dev)
ttm_bo_clean_mm(bdev, TTM_PL_CI);
dev_priv->have_camera = 0;
}
if (dev_priv->have_rar) {
ttm_bo_clean_mm(bdev, TTM_PL_RAR);
dev_priv->have_rar = 0;
}

}

void mrst_get_fuse_settings(struct drm_device *dev)
Expand Down Expand Up @@ -647,7 +642,7 @@ static int psb_do_init(struct drm_device *dev)
if (!ttm_bo_init_mm(bdev, TTM_PL_TT,
pg->gatt_pages -
(pg->ci_start >> PAGE_SHIFT) -
((dev_priv->ci_region_size + dev_priv->rar_region_size)
((dev_priv->ci_region_size)
>> PAGE_SHIFT))) {

dev_priv->have_tt = 1;
Expand Down Expand Up @@ -707,12 +702,6 @@ static int psb_driver_unload(struct drm_device *dev)
(dev_priv->mmu),
pg->ci_start,
pg->ci_stolen_size >> PAGE_SHIFT);
if (pg->rar_stolen_size != 0)
psb_mmu_remove_pfn_sequence(
psb_mmu_get_default_pd
(dev_priv->mmu),
pg->rar_start,
pg->rar_stolen_size >> PAGE_SHIFT);
up_read(&pg->sem);
psb_mmu_driver_takedown(dev_priv->mmu);
dev_priv->mmu = NULL;
Expand Down Expand Up @@ -883,7 +872,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)

/* CI/RAR use the lower half of TT. */
pg->ci_start = (tt_pages / 2) << PAGE_SHIFT;
pg->rar_start = pg->ci_start + pg->ci_stolen_size;


/*
Expand All @@ -901,21 +889,6 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
goto out_err;
}

/*
* Make MSVDX/TOPAZ MMU aware of the rar stolen memory area.
*/
if (dev_priv->pg->rar_stolen_size != 0) {
down_read(&pg->sem);
ret = psb_mmu_insert_pfn_sequence(
psb_mmu_get_default_pd(dev_priv->mmu),
dev_priv->rar_region_start >> PAGE_SHIFT,
pg->mmu_gatt_start + pg->rar_start,
pg->rar_stolen_size >> PAGE_SHIFT, 0);
up_read(&pg->sem);
if (ret)
goto out_err;
}

dev_priv->pf_pd = psb_mmu_alloc_pd(dev_priv->mmu, 1, 0);
if (!dev_priv->pf_pd)
goto out_err;
Expand Down
6 changes: 0 additions & 6 deletions drivers/staging/gma500/psb_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,12 +605,6 @@ struct drm_psb_private {
unsigned int ci_region_start;
unsigned int ci_region_size;

/*
* RAR share buffer;
*/
unsigned int rar_region_start;
unsigned int rar_region_size;

/*
*Memory managers
*/
Expand Down
22 changes: 0 additions & 22 deletions drivers/staging/gma500/psb_gtt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
struct drm_psb_private *dev_priv = dev->dev_private;
unsigned gtt_pages;
unsigned long stolen_size, vram_stolen_size, ci_stolen_size;
unsigned long rar_stolen_size;
unsigned i, num_pages;
unsigned pfn_base;
uint32_t ci_pages, vram_pages;
Expand Down Expand Up @@ -118,8 +117,6 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
* managed by TTM to stolen_size */
stolen_size = vram_stolen_size;

rar_stolen_size = dev_priv->rar_region_size;

printk(KERN_INFO"GMMADR(region 0) start: 0x%08x (%dM).\n",
pg->gatt_start, pg->gatt_pages/256);
printk(KERN_INFO"GTTADR(region 3) start: 0x%08x (can map %dM RAM), and actual RAM base 0x%08x.\n",
Expand All @@ -136,10 +133,6 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
printk(KERN_INFO"CI Stole memory: RAM base = 0x%08x, size = %lu M\n",
dev_priv->ci_region_start,
ci_stolen_size / 1024 / 1024);
if (rar_stolen_size > 0)
printk(KERN_INFO "RAR Stole memory: RAM base = 0x%08x, size = %lu M\n",
dev_priv->rar_region_start,
rar_stolen_size / 1024 / 1024);

if (resume && (gtt_pages != pg->gtt_pages) &&
(stolen_size != pg->stolen_size)) {
Expand All @@ -152,7 +145,6 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
pg->stolen_size = stolen_size;
pg->vram_stolen_size = vram_stolen_size;
pg->ci_stolen_size = ci_stolen_size;
pg->rar_stolen_size = rar_stolen_size;
pg->gtt_map =
ioremap_nocache(pg->gtt_phys_start, gtt_pages << PAGE_SHIFT);
if (!pg->gtt_map) {
Expand Down Expand Up @@ -209,20 +201,6 @@ int psb_gtt_init(struct psb_gtt *pg, int resume)
iowrite32(pte, ttm_gtt_map + i);
}

/*
* insert RAR stolen pages
*/
if (rar_stolen_size != 0) {
pfn_base = dev_priv->rar_region_start >> PAGE_SHIFT;
num_pages = rar_stolen_size >> PAGE_SHIFT;
printk(KERN_INFO"Set up %d RAR stolen pages starting at 0x%08x, GTT offset %dK\n",
num_pages, pfn_base,
(ttm_gtt_map - pg->gtt_map + i) * 4);
for (; i < num_pages + ci_pages; ++i) {
pte = psb_gtt_mask_pte(pfn_base + i - ci_pages, 0);
iowrite32(pte, ttm_gtt_map + i);
}
}
/*
* Init rest of gtt managed by TTM.
*/
Expand Down

0 comments on commit 7e2c6c4

Please sign in to comment.