mirror of
https://github.com/torvalds/linux
synced 2024-10-08 20:34:15 +00:00
drm/gma500: Set page-caching flags in GEM pin/unpin
Caching of the GEM object's backing pages are unrelated to GTT management. Move the respective calls from GTT code to GEM code. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211015084053.13708-9-tzimmermann@suse.de
This commit is contained in:
parent
3c101135ba
commit
33e079bc15
|
@ -13,6 +13,8 @@
|
||||||
|
|
||||||
#include <linux/pagemap.h>
|
#include <linux/pagemap.h>
|
||||||
|
|
||||||
|
#include <asm/set_memory.h>
|
||||||
|
|
||||||
#include <drm/drm.h>
|
#include <drm/drm.h>
|
||||||
#include <drm/drm_vma_manager.h>
|
#include <drm/drm_vma_manager.h>
|
||||||
|
|
||||||
|
@ -41,7 +43,9 @@ int psb_gem_pin(struct gtt_range *gt)
|
||||||
|
|
||||||
npages = gt->gem.size / PAGE_SIZE;
|
npages = gt->gem.size / PAGE_SIZE;
|
||||||
|
|
||||||
ret = psb_gtt_insert(dev, gt, 0);
|
set_pages_array_wc(pages, npages);
|
||||||
|
|
||||||
|
ret = psb_gtt_insert(dev, gt);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_drm_gem_put_pages;
|
goto err_drm_gem_put_pages;
|
||||||
|
|
||||||
|
@ -84,6 +88,9 @@ void psb_gem_unpin(struct gtt_range *gt)
|
||||||
(gpu_base + gt->offset), gt->npage, 0, 0);
|
(gpu_base + gt->offset), gt->npage, 0, 0);
|
||||||
psb_gtt_remove(dev, gt);
|
psb_gtt_remove(dev, gt);
|
||||||
|
|
||||||
|
/* Reset caching flags */
|
||||||
|
set_pages_array_wb(gt->pages, gt->npage);
|
||||||
|
|
||||||
drm_gem_put_pages(>->gem, gt->pages, true, false);
|
drm_gem_put_pages(>->gem, gt->pages, true, false);
|
||||||
gt->pages = NULL;
|
gt->pages = NULL;
|
||||||
|
|
||||||
|
|
|
@ -7,10 +7,6 @@
|
||||||
* Alan Cox <alan@linux.intel.com>
|
* Alan Cox <alan@linux.intel.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/shmem_fs.h>
|
|
||||||
|
|
||||||
#include <asm/set_memory.h>
|
|
||||||
|
|
||||||
#include "psb_drv.h"
|
#include "psb_drv.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -92,17 +88,15 @@ static u32 __iomem *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
|
||||||
* psb_gtt_insert - put an object into the GTT
|
* psb_gtt_insert - put an object into the GTT
|
||||||
* @dev: our DRM device
|
* @dev: our DRM device
|
||||||
* @r: our GTT range
|
* @r: our GTT range
|
||||||
* @resume: on resume
|
|
||||||
*
|
*
|
||||||
* Take our preallocated GTT range and insert the GEM object into
|
* Take our preallocated GTT range and insert the GEM object into
|
||||||
* the GTT. This is protected via the gtt mutex which the caller
|
* the GTT. This is protected via the gtt mutex which the caller
|
||||||
* must hold.
|
* must hold.
|
||||||
*/
|
*/
|
||||||
int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r, int resume)
|
int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r)
|
||||||
{
|
{
|
||||||
u32 __iomem *gtt_slot;
|
u32 __iomem *gtt_slot;
|
||||||
u32 pte;
|
u32 pte;
|
||||||
struct page **pages;
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (r->pages == NULL) {
|
if (r->pages == NULL) {
|
||||||
|
@ -113,12 +107,6 @@ int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r, int resume)
|
||||||
WARN_ON(r->stolen); /* refcount these maybe ? */
|
WARN_ON(r->stolen); /* refcount these maybe ? */
|
||||||
|
|
||||||
gtt_slot = psb_gtt_entry(dev, r);
|
gtt_slot = psb_gtt_entry(dev, r);
|
||||||
pages = r->pages;
|
|
||||||
|
|
||||||
if (!resume) {
|
|
||||||
/* Make sure changes are visible to the GPU */
|
|
||||||
set_pages_array_wc(pages, r->npage);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Write our page entries into the GTT itself */
|
/* Write our page entries into the GTT itself */
|
||||||
for (i = 0; i < r->npage; i++) {
|
for (i = 0; i < r->npage; i++) {
|
||||||
|
@ -158,7 +146,6 @@ void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
|
||||||
for (i = 0; i < r->npage; i++)
|
for (i = 0; i < r->npage; i++)
|
||||||
iowrite32(pte, gtt_slot++);
|
iowrite32(pte, gtt_slot++);
|
||||||
ioread32(gtt_slot - 1);
|
ioread32(gtt_slot - 1);
|
||||||
set_pages_array_wb(r->pages, r->npage);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void psb_gtt_alloc(struct drm_device *dev)
|
static void psb_gtt_alloc(struct drm_device *dev)
|
||||||
|
@ -349,7 +336,7 @@ int psb_gtt_restore(struct drm_device *dev)
|
||||||
while (r != NULL) {
|
while (r != NULL) {
|
||||||
range = container_of(r, struct gtt_range, resource);
|
range = container_of(r, struct gtt_range, resource);
|
||||||
if (range->pages) {
|
if (range->pages) {
|
||||||
psb_gtt_insert(dev, range, 1);
|
psb_gtt_insert(dev, range);
|
||||||
size += range->resource.end - range->resource.start;
|
size += range->resource.end - range->resource.start;
|
||||||
restored++;
|
restored++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ int psb_gtt_allocate_resource(struct drm_psb_private *pdev, struct resource *res
|
||||||
const char *name, resource_size_t size, resource_size_t align,
|
const char *name, resource_size_t size, resource_size_t align,
|
||||||
bool stolen, u32 *offset);
|
bool stolen, u32 *offset);
|
||||||
|
|
||||||
int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r, int resume);
|
int psb_gtt_insert(struct drm_device *dev, struct gtt_range *r);
|
||||||
void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r);
|
void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue