diff options
| author | Xinliang Liu <xinliang.liu@linaro.org> | 2015-06-01 09:42:48 -0400 |
|---|---|---|
| committer | Jorge Ramirez-Ortiz <jro@xenomai.org> | 2015-06-01 09:42:48 -0400 |
| commit | 5daa86208dbf3e22022143e7ad7dcd5f7e296a2f (patch) | |
| tree | 5bf0352f252c912f92bd80c3599985611d3c8cfa /arch | |
| parent | bd6eef26bdf9f67c21b2fd3ccc582ff314215e46 (diff) | |
drivers: drm: cursor support and desktop acceleration
test: execute es2gears
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/hi6220-hikey.dts | 15 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hi6220.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hi6220-hikey.dts b/arch/arm64/boot/dts/hi6220-hikey.dts index 2e5db3ee4de6..8f22c03ab977 100644 --- a/arch/arm64/boot/dts/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hi6220-hikey.dts @@ -41,6 +41,21 @@ reg = <0x0 0x00000000 0x0 0x40000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* global autoconfigured region for contiguous allocations */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x0 0x4000000>; /* 64M */ + alignment = <0x0 0x2000>; /* 4k page alignment */ + linux,cma-default; + }; + }; + smb { uart0: uart@f8015000 { /* console */ status = "ok"; diff --git a/arch/arm64/boot/dts/hi6220.dtsi b/arch/arm64/boot/dts/hi6220.dtsi index 99ad9c552dec..022328966923 100644 --- a/arch/arm64/boot/dts/hi6220.dtsi +++ b/arch/arm64/boot/dts/hi6220.dtsi @@ -667,6 +667,7 @@ #address-cells = <2>; #size-cells = <2>; ranges; + dma-coherent; ade: ade@f4100000 { compatible = "hisilicon,hi6220-ade"; @@ -1001,6 +1002,7 @@ dfs_profile_num = <2>; dfs_profiles = <250 3 0>, <500 1 0>; mali_type = <2>; + dma-coherent; }; dwmmc_0: dwmmc0@f723d000 { diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 536a21f4d269..d4b8a0328077 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -269,6 +269,7 @@ CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_MALI400=m +CONFIG_MALI400_DEBUG=y CONFIG_MALI450=y # CONFIG_MALI400_PROFILING is not set # CONFIG_MALI_DVFS is not set @@ -278,6 +279,7 @@ CONFIG_MALI_PLAT_SPECIFIC_DT=y CONFIG_DRM=y CONFIG_DRM_I2C_ADV7533=y CONFIG_DRM_HISI=y +# CONFIG_DRM_HISI_FBDEV is not set CONFIG_ION=y CONFIG_ION_HISI=y CONFIG_FB_ARMCLCD=y |