Commit ac798eb1 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Maarten Lankhorst
Browse files

drm/gma500: Remove CONFIG_X86 conditionals from source files 



Remove the CONFIG_X86 conditionals from the source code. The driver
already depends on X86 in the Kconfig file. Also, no one has been
trying to build it on a non-x86 platform recently, or they would have
noticed that drm_ttm_cache_flush() doesn't exist.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210129095604.32423-5-tzimmermann@suse.de


(cherry picked from commit 6455af65)
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 26499e05

drivers/gpu/drm/gma500/mmu.c

+0 −21
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ static inline uint32_t psb_mmu_pd_index(uint32_t offset) 
	return offset >> PSB_PDE_SHIFT;

}



#if defined(CONFIG_X86)

static inline void psb_clflush(void *addr)

{

	__asm__ __volatile__("clflush (%0)\n" : : "r"(addr) : "memory");
@@ -63,13 +62,6 @@ static inline void psb_mmu_clflush(struct psb_mmu_driver *driver, void *addr) 
	psb_clflush(addr);

	mb();

}

#else



static inline void psb_mmu_clflush(struct psb_mmu_driver *driver, void *addr)

{;

}



#endif



static void psb_mmu_flush_pd_locked(struct psb_mmu_driver *driver, int force)

{
@@ -293,7 +285,6 @@ static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd) 
	for (i = 0; i < (PAGE_SIZE / sizeof(uint32_t)); ++i)

		*ptes++ = pd->invalid_pte;



#if defined(CONFIG_X86)

	if (pd->driver->has_clflush && pd->hw_context != -1) {

		mb();

		for (i = 0; i < clflush_count; ++i) {
@@ -302,7 +293,6 @@ static struct psb_mmu_pt *psb_mmu_alloc_pt(struct psb_mmu_pd *pd) 
		}

		mb();

	}

#endif

	kunmap_atomic(v);

	spin_unlock(lock);
@@ -459,7 +449,6 @@ struct psb_mmu_driver *psb_mmu_driver_init(struct drm_device *dev, 


	driver->has_clflush = 0;



#if defined(CONFIG_X86)

	if (boot_cpu_has(X86_FEATURE_CLFLUSH)) {

		uint32_t tfms, misc, cap0, cap4, clflush_size;
@@ -476,7 +465,6 @@ struct psb_mmu_driver *psb_mmu_driver_init(struct drm_device *dev, 
		driver->clflush_mask = driver->clflush_add - 1;

		driver->clflush_mask = ~driver->clflush_mask;

	}

#endif



	up_write(&driver->sem);

	return driver;
@@ -486,7 +474,6 @@ struct psb_mmu_driver *psb_mmu_driver_init(struct drm_device *dev, 
	return NULL;

}



#if defined(CONFIG_X86)

static void psb_mmu_flush_ptes(struct psb_mmu_pd *pd, unsigned long address,

			       uint32_t num_pages, uint32_t desired_tile_stride,

			       uint32_t hw_tile_stride)
@@ -534,14 +521,6 @@ static void psb_mmu_flush_ptes(struct psb_mmu_pd *pd, unsigned long address, 
	}

	mb();

}

#else

static void psb_mmu_flush_ptes(struct psb_mmu_pd *pd, unsigned long address,

			       uint32_t num_pages, uint32_t desired_tile_stride,

			       uint32_t hw_tile_stride)

{

	drm_ttm_cache_flush();

}

#endif



void psb_mmu_remove_pfn_sequence(struct psb_mmu_pd *pd,

				 unsigned long address, uint32_t num_pages)