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

Commit 0df8bae5 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Remove code for CONFIG_QCOM_IOMMU"

parents 52a95c85 bc26ea7b

arch/arm64/include/asm/io.h

+6 −6
Original line number Diff line number Diff line
@@ -251,13 +251,13 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); 
/*

 * io{read,write}{16,32,64}be() macros

 */

#define ioread16be(p)		({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; })

#define ioread32be(p)		({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; })

#define ioread64be(p)		({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq(p)); __iormb(); __v; })

#define ioread16be(p)		({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw_no_log(p)); __iormb(); __v; })

#define ioread32be(p)		({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl_no_log(p)); __iormb(); __v; })

#define ioread64be(p)		({ __u64 __v = be64_to_cpu((__force __be64)__raw_readq_no_log(p)); __iormb(); __v; })



#define iowrite16be(v,p)	({ __iowmb(); __raw_writew((__force __u16)cpu_to_be16(v), p); })

#define iowrite32be(v,p)	({ __iowmb(); __raw_writel((__force __u32)cpu_to_be32(v), p); })

#define iowrite64be(v,p)	({ __iowmb(); __raw_writeq((__force __u64)cpu_to_be64(v), p); })

#define iowrite16be(v,p)	({ __iowmb(); __raw_writew_no_log((__force __u16)cpu_to_be16(v), p); })

#define iowrite32be(v,p)	({ __iowmb(); __raw_writel_no_log((__force __u32)cpu_to_be32(v), p); })

#define iowrite64be(v,p)	({ __iowmb(); __raw_writeq_no_log((__force __u64)cpu_to_be64(v), p); })



#include <asm-generic/io.h>

drivers/gpu/drm/msm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ config DRM_MSM_SDE 


config DRM_MSM_DP

	bool "Enable Display Port"

	depends on DRM_MSM_SDE

	depends on DRM_MSM_SDE && USB_PD

	default n

	help

	  This option enables compilation of Display Port

drivers/gpu/drm/msm/msm_drv.h

+7 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *
@@ -877,6 +877,12 @@ static inline void __init msm_edp_register(void) 
static inline void __exit msm_edp_unregister(void)

{

}



static inline int msm_edp_modeset_init(struct msm_edp *edp,

		struct drm_device *dev, struct drm_encoder *encoder)

{

	return -EINVAL;

}

#endif



struct msm_dsi;

drivers/gpu/msm/kgsl_iommu.h

+1 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

 */

#ifndef __KGSL_IOMMU_H

#define __KGSL_IOMMU_H



#ifdef CONFIG_QCOM_IOMMU

#include <linux/qcom_iommu.h>

#endif

#include <linux/of.h>

#include "kgsl.h"

drivers/gpu/msm/kgsl_mmu.h

+1 −27
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (c) 2002,2007-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2002,2007-2019, The Linux Foundation. All rights reserved.

 */

#ifndef __KGSL_MMU_H

#define __KGSL_MMU_H
@@ -394,31 +394,6 @@ kgsl_mmu_pagetable_get_contextidr(struct kgsl_pagetable *pagetable) 
	return 0;

}



#ifdef CONFIG_QCOM_IOMMU

#include <linux/qcom_iommu.h>

#ifndef CONFIG_ARM_SMMU

static inline bool kgsl_mmu_bus_secured(struct device *dev)

{

	struct bus_type *bus = msm_iommu_get_bus(dev);



	return (bus == &msm_iommu_sec_bus_type) ? true : false;

}

#else

static inline bool kgsl_mmu_bus_secured(struct device *dev)

{

	/* ARM driver contains all context banks on single bus */

	return true;

}

#endif /* CONFIG_ARM_SMMU */

static inline struct bus_type *kgsl_mmu_get_bus(struct device *dev)

{

	return msm_iommu_get_bus(dev);

}

static inline struct device *kgsl_mmu_get_ctx(const char *name)

{

	return msm_iommu_get_ctx(name);

}

#else

static inline bool kgsl_mmu_bus_secured(struct device *dev)

{

	/*ARM driver contains all context banks on single bus */
@@ -433,6 +408,5 @@ static inline struct device *kgsl_mmu_get_ctx(const char *name) 
{

	return ERR_PTR(-ENODEV);

}

#endif



#endif /* __KGSL_MMU_H */