Skip to contentSkip to conversation

drm: add cache support for arm64

PATCH In review Rob Clark 1 participant 2 messages Jul 30, 2019

Subsystems (2)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/1 drm: add cache support for arm64

From: Rob Clark <[email protected]>

---
Not sure about 32b arm, but at least for aarch64 this is relatively easy. So lets at least enable for arm64.

 drivers/gpu/drm/drm_cache.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_cache.c +17 -3
index 3bd76e918b5d..90105c637797 100644
@@ -69,6 +69,14 @@ static void drm_cache_flush_clflush(struct page *pages[],
 }
 #endif
 
+#if defined(__powerpc__)
+static void __flush_dcache_area(void *addr, size_t len)
+{
+	flush_dcache_range((unsigned long)addr,
+			   (unsigned long)addr + PAGE_SIZE);
+}
+#endif
+
 /**
  * drm_clflush_pages - Flush dcache lines of a set of pages.
  * @pages: List of pages to be flushed.
@@ -90,7 +98,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 	if (wbinvd_on_all_cpus())
 		pr_err("Timed out waiting for cache flush\n");
 
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(CONFIG_ARM64)
 	unsigned long i;
 	for (i = 0; i < num_pages; i++) {
 		struct page *page = pages[i];
@@ -100,8 +108,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
 			continue;
 
 		page_virtual = kmap_atomic(page);
-		flush_dcache_range((unsigned long)page_virtual,
-				   (unsigned long)page_virtual + PAGE_SIZE);
+		__flush_dcache_area(page_virtual, PAGE_SIZE);
 		kunmap_atomic(page_virtual);
 	}
 #else
@@ -135,6 +142,13 @@ drm_clflush_sg(struct sg_table *st)
 
 	if (wbinvd_on_all_cpus())
 		pr_err("Timed out waiting for cache flush\n");
+#elif defined(CONFIG_ARM64)
+	struct sg_page_iter sg_iter;
+
+	for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) {
+		struct page *p = sg_page_iter_page(&sg_iter);
+		drm_clflush_pages(&p, 1);
+	}
 #else
 	pr_err("Architecture has no drm_cache.c support\n");
 	WARN_ON_ONCE(1);
Signature · 1 line
2.21.0
author
#1 lore raw
Quoted 7 lines · Rob Clark

From: Rob Clark <[email protected]>

---
Not sure about 32b arm, but at least for aarch64 this is relatively easy. So lets at least enable for arm64.

hmm, bleh, I thought this was too easy.. I hadn't noticed that (even though driver was =m) CONFIG_DRM was =y

Can we make drm_cache.o built-in even if the rest of drm is a module?

BR,
-R

Quoted 59 lines
 drivers/gpu/drm/drm_cache.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_cache.c +17 -4
index 3bd76e918b5d..90105c637797 100644
@@ -69,6 +69,14 @@ static void drm_cache_flush_clflush(struct page *pages[],
 }
 #endif
 
+#if defined(__powerpc__)
+static void __flush_dcache_area(void *addr, size_t len)
+{
+       flush_dcache_range((unsigned long)addr,
+                          (unsigned long)addr + PAGE_SIZE);
+}
+#endif
+
 /**
  * drm_clflush_pages - Flush dcache lines of a set of pages.
  * @pages: List of pages to be flushed.
@@ -90,7 +98,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
        if (wbinvd_on_all_cpus())
                pr_err("Timed out waiting for cache flush\n");
 
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) || defined(CONFIG_ARM64)
        unsigned long i;
        for (i = 0; i < num_pages; i++) {
                struct page *page = pages[i];
@@ -100,8 +108,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
                        continue;
 
                page_virtual = kmap_atomic(page);
-               flush_dcache_range((unsigned long)page_virtual,
-                                  (unsigned long)page_virtual + PAGE_SIZE);
+               __flush_dcache_area(page_virtual, PAGE_SIZE);
                kunmap_atomic(page_virtual);
        }
 #else
@@ -135,6 +142,13 @@ drm_clflush_sg(struct sg_table *st)
 
        if (wbinvd_on_all_cpus())
                pr_err("Timed out waiting for cache flush\n");
+#elif defined(CONFIG_ARM64)
+       struct sg_page_iter sg_iter;
+
+       for_each_sg_page(st->sgl, &sg_iter, st->nents, 0) {
+               struct page *p = sg_page_iter_page(&sg_iter);
+               drm_clflush_pages(&p, 1);
+       }
 #else
        pr_err("Architecture has no drm_cache.c support\n");
        WARN_ON_ONCE(1);
--

2.21.0