xiaomi-dior: new device (Xiaomi Redmi Note 4G) (MR 1992)
Add support for xiaomi-dior. Fix framebuffer bugs, now fbcon and X server works. [ci:skip-build] Already built in CI
This commit is contained in:
Edwin
Alexey Min
parent
184bc634e6
commit
079f4f59f9
10 changed files with 4455 additions and 0 deletions
29
device/testing/device-xiaomi-dior/APKBUILD
Normal file
29
device/testing/device-xiaomi-dior/APKBUILD
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
pkgname=device-xiaomi-dior
|
||||
pkgdesc="Xiaomi Redmi Note 4G"
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
arch="armv7"
|
||||
options="!check !archcheck"
|
||||
depends="postmarketos-base linux-xiaomi-dior mkbootimg mesa-dri-gallium msm-fb-refresher"
|
||||
makedepends="devicepkg-dev linux-headers"
|
||||
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
|
||||
source="deviceinfo"
|
||||
|
||||
build() {
|
||||
devicepkg_build $startdir $pkgname
|
||||
}
|
||||
|
||||
package() {
|
||||
devicepkg_package $startdir $pkgname
|
||||
}
|
||||
|
||||
nonfree_firmware() {
|
||||
pkgdesc="Wifi firmware"
|
||||
depends="firmware-xiaomi-dior"
|
||||
mkdir "$subpkgdir"
|
||||
}
|
||||
|
||||
sha512sums="eef6ed437a027968deb9d26146be806909dc354377082a62f4353e0556c433537ff5a9a2fbfae19c82e9a5d2e10dd6bcddd1ecf4a431ac662f9894c524a6f578 deviceinfo"
|
||||
32
device/testing/device-xiaomi-dior/deviceinfo
Normal file
32
device/testing/device-xiaomi-dior/deviceinfo
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
# Reference: <https://postmarketos.org/deviceinfo>
|
||||
# Please use double quotes only. You can source this file in shell
|
||||
# scripts.
|
||||
|
||||
deviceinfo_format_version="0"
|
||||
deviceinfo_name="Xiaomi Redmi Note 4G"
|
||||
deviceinfo_manufacturer="Xiaomi"
|
||||
deviceinfo_codename="xiaomi-dior"
|
||||
deviceinfo_year="2014"
|
||||
deviceinfo_arch="armv7"
|
||||
|
||||
# Device related
|
||||
deviceinfo_chassis="handset"
|
||||
deviceinfo_keyboard="false"
|
||||
deviceinfo_external_storage="true"
|
||||
deviceinfo_screen_width="720"
|
||||
deviceinfo_screen_height="1280"
|
||||
|
||||
# Bootloader related
|
||||
deviceinfo_flash_method="fastboot"
|
||||
deviceinfo_kernel_cmdline="console=tty1 androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 fbcon=font:VGA8x16"
|
||||
deviceinfo_generate_bootimg="true"
|
||||
deviceinfo_bootimg_qcdt="true"
|
||||
deviceinfo_bootimg_mtk_mkimage="false"
|
||||
deviceinfo_bootimg_dtb_second="false"
|
||||
deviceinfo_flash_offset_base="0x00000000"
|
||||
deviceinfo_flash_offset_kernel="0x00008000"
|
||||
deviceinfo_flash_offset_ramdisk="0x02000000"
|
||||
deviceinfo_flash_offset_second="0x00f00000"
|
||||
deviceinfo_flash_offset_tags="0x01e00000"
|
||||
deviceinfo_flash_pagesize="2048"
|
||||
|
||||
52
device/testing/firmware-xiaomi-dior/APKBUILD
Normal file
52
device/testing/firmware-xiaomi-dior/APKBUILD
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
pkgname=firmware-xiaomi-dior
|
||||
pkgver=1
|
||||
pkgrel=0
|
||||
_commit="ac0d15c78cc705c9a76506e6f761cd006018d7bd"
|
||||
pkgdesc="Firmware files for Xiaomi Redmi Note 4G"
|
||||
url="https://postmarketos.org"
|
||||
arch="armv7"
|
||||
license="proprietary"
|
||||
depends="wcnss-wlan"
|
||||
options="!check !strip !archcheck !spdx"
|
||||
|
||||
# Source
|
||||
_files="wcnss.b00 wcnss.b01 wcnss.b02 wcnss.b04 wcnss.b06 wcnss.b07 wcnss.b08 wcnss.b09 wcnss.mdt"
|
||||
_files_prima="WCNSS_cfg.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin WCNSS_qcom_wlan_nv_h3gbl.bin WCNSS_qcom_wlan_nv_h3td.bin WCNSS_qcom_wlan_nv_h3w.bin"
|
||||
_commit="421527f4e54d645adaf762b4f14cc5fd4d19a5b5"
|
||||
_commit_prima="b7a15a3640ac61c35ebe7cfdc6ae4007279dee55"
|
||||
_url="https://github.com/msfkonsole/proprietary_vendor_xiaomi/raw/$_commit/dior/proprietary/etc/firmware"
|
||||
_url_prima="https://github.com/edwin0cheng/android_device_xiaomi_dior/raw/$_commit_prima/wifi"
|
||||
for _i in $_files; do
|
||||
source="$source $pkgname-$_commit-$_i::$_url/$_i"
|
||||
done
|
||||
for _i in $_files_prima; do
|
||||
source="$source $pkgname-$_commit-$_i::$_url_prima/$_i"
|
||||
done
|
||||
|
||||
package() {
|
||||
for _i in $_files; do
|
||||
install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \
|
||||
"$pkgdir"/lib/firmware/postmarketos/"$_i"
|
||||
done
|
||||
for _i in $_files_prima; do
|
||||
install -Dm644 "$srcdir/$pkgname-$_commit-$_i" \
|
||||
"$pkgdir"/lib/firmware/postmarketos/wlan/prima/"$_i"
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
sha512sums="b62c356d95b8c9748ec7c5ea698617652962e0dcd7513a9802e3957faebff729ab79263d65f3b8202b5b4102f7748c21583758aaff87ada1378d1243e031ebf8 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b00
|
||||
67349b5771de949777cdb513c7477a939ec0b80a1e767be6d01b15d40bfc7642354e4a154bec868d56f464198653a678d1814187b3892ece2f6a48797d7209f8 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b01
|
||||
3d3e2abb8f6499592d29a736e82c99a37252048a06d94795f9b75216315d7cdbfc43c2fa8a248c045ee70a95f9f9cc612797049540aec913ed07d7a37d413e42 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b02
|
||||
cbbfa987ab510173d95a36cc4342049607ec198465a659103ce8399429dd12e98a7cc3bdfb586575d43f250ff8fa9e6442c3dac1bf8a7479c46993bff2820a28 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b04
|
||||
356c490d4f4d053c48cbf58142446e906f1cc2e9a02bac43944a128ae7a6bb9aa149e12d28568f195f3ae2546d3bcd7d8504d866b54244ebd59feb363693a8de firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b06
|
||||
c331a2a21695186c1ebd2c9facdc5fa856bedc757a50936b72577e76147373747d26bacfce0e165f089e182cc227ada737a0b42e51d9bdec16fb5f8ca795b091 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b07
|
||||
6033893c75b32cc906bcabdff02fdbbbb75f0b4d568962b38ea023c00b2273f90bce4482358d4ecc64c22bceaa628d55d17877c8301a1406f67c55c86fc08723 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b08
|
||||
5aa10ec50de6cc0c8e455ee26b3eb890de642d142fb25be8357d9a6c94bdc458e3858e8a22e65f4542e1ed4cebf37f14785438ee40645a5e35109b6c3ee5291c firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.b09
|
||||
b0d8d7f378dd4278ad5d60ec0cdef59fc9c9ee794925ad99aeb3b373f642fd8a3dd4c7120ef1a95fcb39f7344c4d0341544225642ba4e8524c419f892593acfd firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-wcnss.mdt
|
||||
6b74749c49d8bbdeda1e2effc1fa36f32465a90b81b7fa40b6b0657eaa6005614d383c369d1273d050925e936177e4fa5093a4a90d8015933464dfea3370fce3 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-WCNSS_cfg.dat
|
||||
c0d5931a6b12009c1bc203e137e9a8085da042155a1145b60ff7696921256c37cc6b2195ec307ff4ca1cf9539445110e85ddd8001829e01a2632a32f1006edce firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-WCNSS_qcom_cfg.ini
|
||||
e7be24e3f5759932405a6447916703c8bf0c3771966af392645932a9ac3cce2d60869fa4b0c68074be3d54cdd45e8754791d3738b1cbf3d94f93df162fca59f1 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-WCNSS_qcom_wlan_nv.bin
|
||||
f937a38ceabe2b707b984a59f6472b2cf44c57672fc5ee8a8b1946bacf490a0f56f4acf4a0632ef513886b0f59a69e0ea6f60a63ebf17caa03fff62de255e911 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-WCNSS_qcom_wlan_nv_h3gbl.bin
|
||||
20bf3d90b164fb9ab042a3700fb10af9cb31170a3275eaafd25b0fdb0b501a60a870442c2533964d5800efc05d4b3afb56b4cb7b85cf18e2579d7cf537c185a5 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-WCNSS_qcom_wlan_nv_h3td.bin
|
||||
8a3ad96745943d98d93e84cd12387637c47c04f8e87e7192df71d514e5db589dbfd28b42b0245e4f695330aebe0c96b9c919250ef46e1aeb40db45aa4ee91424 firmware-xiaomi-dior-421527f4e54d645adaf762b4f14cc5fd4d19a5b5-WCNSS_qcom_wlan_nv_h3w.bin"
|
||||
26
device/testing/linux-xiaomi-dior/0001-fix-refresh-rate.patch
Normal file
26
device/testing/linux-xiaomi-dior/0001-fix-refresh-rate.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
From a1f772d445488501c26e69855c11764a99c0ed36 Mon Sep 17 00:00:00 2001
|
||||
From: Edwin <edwin@manjaro.lan>
|
||||
Date: Fri, 12 Feb 2021 21:30:59 +0800
|
||||
Subject: [PATCH] fix-refresh-rate
|
||||
|
||||
---
|
||||
drivers/video/msm/mdss/mdss_fb.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
|
||||
index 030d4129fc8..37f0bc664f0 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_fb.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_fb.c
|
||||
@@ -1246,7 +1246,8 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
var->left_margin = panel_info->lcdc.h_back_porch;
|
||||
var->right_margin = panel_info->lcdc.h_front_porch;
|
||||
var->hsync_len = panel_info->lcdc.h_pulse_width;
|
||||
- var->pixclock = panel_info->clk_rate / 1000;
|
||||
+ // var->pixclock = panel_info->clk_rate / 1000;
|
||||
+ var->pixclock = 1000000 / 60;
|
||||
|
||||
/* id field for fb app */
|
||||
|
||||
--
|
||||
2.30.0
|
||||
|
||||
479
device/testing/linux-xiaomi-dior/0001-framebuffer-fixes.patch
Normal file
479
device/testing/linux-xiaomi-dior/0001-framebuffer-fixes.patch
Normal file
|
|
@ -0,0 +1,479 @@
|
|||
From 0e6f5534d67ebff379589213ab860233338ed758 Mon Sep 17 00:00:00 2001
|
||||
From: Edwin Cheng <edwin0cheng@gmail.com>
|
||||
Date: Fri, 26 Feb 2021 00:42:51 +0800
|
||||
Subject: [PATCH] framebuffer fixes
|
||||
|
||||
---
|
||||
drivers/video/msm/mdss/Makefile | 3 +-
|
||||
drivers/video/msm/mdss/mdss_fb.c | 158 +++++++++++++++++--
|
||||
drivers/video/msm/mdss/mdss_fb.h | 2 +
|
||||
drivers/video/msm/mdss/mdss_mdp.c | 6 +-
|
||||
drivers/video/msm/mdss/mdss_mdp_intf_video.c | 2 +-
|
||||
drivers/video/msm/mdss/mdss_mdp_kcal_ctrl.c | 3 +-
|
||||
drivers/video/msm/mdss/mdss_mdp_overlay.c | 5 +
|
||||
drivers/video/msm/mdss/mdss_mdp_pp.c | 5 +
|
||||
8 files changed, 162 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/drivers/video/msm/mdss/Makefile b/drivers/video/msm/mdss/Makefile
|
||||
index 27050a26d9b..ade54701ee8 100644
|
||||
--- a/drivers/video/msm/mdss/Makefile
|
||||
+++ b/drivers/video/msm/mdss/Makefile
|
||||
@@ -40,7 +40,6 @@ mdss-qpic-objs := mdss_qpic.o mdss_fb.o mdss_qpic_panel.o
|
||||
obj-$(CONFIG_FB_MSM_QPIC) += mdss-qpic.o
|
||||
obj-$(CONFIG_FB_MSM_QPIC_ILI_QVGA_PANEL) += qpic_panel_ili_qvga.o
|
||||
|
||||
-obj-$(CONFIG_FB_MSM_MDSS) += mdss_fb.o
|
||||
obj-$(CONFIG_FB_MSM_MDSS) += lcd_notify.o
|
||||
|
||||
ifeq ($(CONFIG_FB_MSM_MDSS_MDP3),y)
|
||||
@@ -50,3 +49,5 @@ obj-$(CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS) += mdss_dsi_status.o
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_FB_MSM_MDSS_KCAL_CTRL) += mdss_mdp_kcal_ctrl.o
|
||||
+
|
||||
+obj-$(CONFIG_FB_MSM_MDSS) += mdss_fb.o
|
||||
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
|
||||
index 030d4129fc8..976428e25fe 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_fb.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_fb.c
|
||||
@@ -60,6 +60,8 @@
|
||||
#define MDSS_FB_NUM 2
|
||||
#endif
|
||||
|
||||
+#define INVALID_PIPE_INDEX 0xFFFF
|
||||
+
|
||||
#define MAX_FBI_LIST 32
|
||||
static struct fb_info *fbi_list[MAX_FBI_LIST];
|
||||
static int fbi_list_index;
|
||||
@@ -96,6 +98,14 @@ static int __mdss_fb_display_thread(void *data);
|
||||
static int mdss_fb_pan_idle(struct msm_fb_data_type *mfd);
|
||||
static int mdss_fb_send_panel_event(struct msm_fb_data_type *mfd,
|
||||
int event, void *arg);
|
||||
+static int mdss_fb_pending_probe(struct msm_fb_data_type* mfd);
|
||||
+
|
||||
+static int mdss_fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
|
||||
+static int mdss_fb_copyarea(struct fb_info *info, const struct fb_copyarea *area);
|
||||
+static int mdss_fb_imageblit(struct fb_info *info, const struct fb_image *image);
|
||||
+static int mdss_fb_setcolreg(unsigned regno, unsigned red, unsigned green,
|
||||
+ unsigned blue, unsigned transp, struct fb_info *info);
|
||||
+
|
||||
void mdss_fb_no_update_notify_timer_cb(unsigned long data)
|
||||
{
|
||||
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)data;
|
||||
@@ -483,6 +493,8 @@ static int mdss_fb_probe(struct platform_device *pdev)
|
||||
mfd->bl_min_lvl = 30;
|
||||
mfd->fb_imgType = MDP_RGBA_8888;
|
||||
|
||||
+ mfd->registered = false;
|
||||
+
|
||||
mfd->pdev = pdev;
|
||||
if (pdata->next)
|
||||
mfd->split_display = true;
|
||||
@@ -500,6 +512,16 @@ static int mdss_fb_probe(struct platform_device *pdev)
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
+ if (!mfd->registered)
|
||||
+ rc = mdss_fb_pending_probe(mfd);
|
||||
+ return rc;
|
||||
+}
|
||||
+
|
||||
+static int mdss_fb_pending_probe(struct msm_fb_data_type *mfd) {
|
||||
+ int rc;
|
||||
+ struct platform_device *pdev = mfd->pdev;
|
||||
+ struct fb_info *fbi = mfd->fbi;
|
||||
+
|
||||
if (mfd->mdp.init_fnc) {
|
||||
rc = mfd->mdp.init_fnc(mfd);
|
||||
if (rc) {
|
||||
@@ -568,6 +590,7 @@ static int mdss_fb_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
INIT_DELAYED_WORK(&mfd->idle_notify_work, __mdss_fb_idle_notify_work);
|
||||
+ mfd->registered = true;
|
||||
|
||||
return rc;
|
||||
}
|
||||
@@ -578,6 +601,10 @@ static int mdss_fb_remove(struct platform_device *pdev)
|
||||
|
||||
mfd = (struct msm_fb_data_type *)platform_get_drvdata(pdev);
|
||||
|
||||
+ if(mfd && !mfd->registered) {
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
mdss_fb_remove_sysfs(mfd);
|
||||
|
||||
pm_runtime_disable(mfd->fbi->dev);
|
||||
@@ -933,6 +960,11 @@ static int mdss_fb_blank(int blank_mode, struct fb_info *info)
|
||||
{
|
||||
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_err("try to blank unregistered fb");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
mdss_fb_pan_idle(mfd);
|
||||
if (mfd->op_enable == 0) {
|
||||
if (blank_mode == FB_BLANK_UNBLANK)
|
||||
@@ -958,6 +990,11 @@ static int mdss_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
|
||||
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
|
||||
int ret = 0;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_err("try to mmap unregistered fb");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
if (!start) {
|
||||
pr_warn("No framebuffer memory is allocated.\n");
|
||||
return -ENOMEM;
|
||||
@@ -1010,14 +1047,62 @@ static struct fb_ops mdss_fb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.fb_open = mdss_fb_open,
|
||||
.fb_release = mdss_fb_release,
|
||||
- .fb_check_var = mdss_fb_check_var, /* vinfo check */
|
||||
+ // .fb_check_var = mdss_fb_check_var, /* vinfo check, which is optional */
|
||||
.fb_set_par = mdss_fb_set_par, /* set the video mode */
|
||||
.fb_blank = mdss_fb_blank, /* blank display */
|
||||
.fb_pan_display = mdss_fb_pan_display, /* pan display */
|
||||
.fb_ioctl = mdss_fb_ioctl, /* perform fb specific ioctl */
|
||||
.fb_mmap = mdss_fb_mmap,
|
||||
+
|
||||
+ .fb_fillrect = mdss_fb_fillrect,
|
||||
+ .fb_copyarea = mdss_fb_copyarea,
|
||||
+ .fb_imageblit = mdss_fb_imageblit,
|
||||
+
|
||||
+ .fb_setcolreg = mdss_fb_setcolreg,
|
||||
};
|
||||
|
||||
+static int mdss_fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) {
|
||||
+ cfb_fillrect(info, rect);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int mdss_fb_copyarea(struct fb_info *info, const struct fb_copyarea *area) {
|
||||
+ cfb_copyarea(info, area);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int mdss_fb_imageblit(struct fb_info *info, const struct fb_image *image) {
|
||||
+ cfb_imageblit(info, image);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+#define CMAP_TOHW(_val, _width) ((((_val) << (_width)) + 0x7FFF - (_val)) >> 16)
|
||||
+
|
||||
+static int mdss_fb_setcolreg(unsigned color_index, unsigned red, unsigned green,
|
||||
+ unsigned blue, unsigned transp, struct fb_info *info) {
|
||||
+ struct msm_fb_data_type* mfd;
|
||||
+
|
||||
+ if (color_index > 255)
|
||||
+ return 1;
|
||||
+
|
||||
+ red = CMAP_TOHW(red, info->var.red.length);
|
||||
+ blue = CMAP_TOHW(blue, info->var.blue.length);
|
||||
+ green = CMAP_TOHW(green, info->var.green.length);
|
||||
+ transp = CMAP_TOHW(transp, info->var.transp.length);
|
||||
+
|
||||
+ if (info->fix.visual == FB_VISUAL_TRUECOLOR) {
|
||||
+ // Do any required translations to convert red, blue, green and
|
||||
+ // transp, to values that can be directly fed to the hardware
|
||||
+ ((u32 *)(info->pseudo_palette))[color_index] =
|
||||
+ (red << info->var.red.offset) |
|
||||
+ (green << info->var.green.offset) |
|
||||
+ (blue << info->var.blue.offset) |
|
||||
+ (transp << info->var.transp.offset);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int mdss_fb_alloc_fbmem_iommu(struct msm_fb_data_type *mfd, int dom)
|
||||
{
|
||||
void *virt = NULL;
|
||||
@@ -1067,7 +1152,6 @@ static int mdss_fb_alloc_fbmem_iommu(struct msm_fb_data_type *mfd, int dom)
|
||||
|
||||
static int mdss_fb_alloc_fbmem(struct msm_fb_data_type *mfd)
|
||||
{
|
||||
-
|
||||
if (mfd->mdp.fb_mem_alloc_fnc)
|
||||
return mfd->mdp.fb_mem_alloc_fnc(mfd);
|
||||
else if (mfd->mdp.fb_mem_get_iommu_domain) {
|
||||
@@ -1109,7 +1193,7 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
var->yoffset = 0, /* resolution */
|
||||
var->grayscale = 0, /* No graylevels */
|
||||
var->nonstd = 0, /* standard pixel format */
|
||||
- var->activate = FB_ACTIVATE_VBL, /* activate it at vsync */
|
||||
+ var->activate = FB_ACTIVATE_VBL | FB_ACTIVATE_FORCE, /* activate it at vsync */
|
||||
var->height = -1, /* height of picture in mm */
|
||||
var->width = -1, /* width of picture in mm */
|
||||
var->accel_flags = 0, /* acceleration flags */
|
||||
@@ -1161,16 +1245,16 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
fix->xpanstep = 1;
|
||||
fix->ypanstep = 1;
|
||||
var->vmode = FB_VMODE_NONINTERLACED;
|
||||
- var->blue.offset = 0;
|
||||
- var->green.offset = 8;
|
||||
- var->red.offset = 16;
|
||||
+ var->blue.offset = 24;
|
||||
+ var->green.offset = 16;
|
||||
+ var->red.offset = 8;
|
||||
var->blue.length = 8;
|
||||
var->green.length = 8;
|
||||
var->red.length = 8;
|
||||
var->blue.msb_right = 0;
|
||||
var->green.msb_right = 0;
|
||||
var->red.msb_right = 0;
|
||||
- var->transp.offset = 24;
|
||||
+ var->transp.offset = 0;
|
||||
var->transp.length = 8;
|
||||
bpp = 4;
|
||||
break;
|
||||
@@ -1180,16 +1264,16 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
fix->xpanstep = 1;
|
||||
fix->ypanstep = 1;
|
||||
var->vmode = FB_VMODE_NONINTERLACED;
|
||||
- var->blue.offset = 8;
|
||||
- var->green.offset = 16;
|
||||
- var->red.offset = 24;
|
||||
+ var->blue.offset = 16;
|
||||
+ var->green.offset = 8;
|
||||
+ var->red.offset = 0;
|
||||
var->blue.length = 8;
|
||||
var->green.length = 8;
|
||||
var->red.length = 8;
|
||||
var->blue.msb_right = 0;
|
||||
var->green.msb_right = 0;
|
||||
var->red.msb_right = 0;
|
||||
- var->transp.offset = 0;
|
||||
+ var->transp.offset = 24;
|
||||
var->transp.length = 8;
|
||||
bpp = 4;
|
||||
break;
|
||||
@@ -1301,7 +1385,7 @@ static int mdss_fb_register(struct msm_fb_data_type *mfd)
|
||||
}
|
||||
|
||||
pr_info("FrameBuffer[%d] %dx%d size=%d registered successfully!\n",
|
||||
- mfd->index, fbi->var.xres, fbi->var.yres,
|
||||
+ mfd->index, mfd->fbi->var.xres, mfd->fbi->var.yres,
|
||||
fbi->fix.smem_len);
|
||||
|
||||
return 0;
|
||||
@@ -1314,6 +1398,16 @@ static int mdss_fb_open(struct fb_info *info, int user)
|
||||
int result;
|
||||
int pid = current->tgid;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_info("Try to open unregister fb\n");
|
||||
+ result = mdss_fb_pending_probe(mfd);
|
||||
+ if (result < 0) {
|
||||
+ pr_err("unable to unfinish register fb\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ pr_warn("successfully register pending fb\n");
|
||||
+ }
|
||||
+
|
||||
if (mfd->shutdown_pending) {
|
||||
pr_err("Shutdown pending. Aborting operation\n");
|
||||
return -EPERM;
|
||||
@@ -1339,7 +1433,7 @@ static int mdss_fb_open(struct fb_info *info, int user)
|
||||
result = pm_runtime_get_sync(info->dev);
|
||||
|
||||
if (result < 0) {
|
||||
- pr_err("pm_runtime: fail to wake up\n");
|
||||
+ pr_err("pm_runtime: fail to wake up, error = %d\n", result);
|
||||
goto pm_error;
|
||||
}
|
||||
|
||||
@@ -1398,6 +1492,11 @@ static int mdss_fb_release_all(struct fb_info *info, bool release_all)
|
||||
bool unknown_pid = true, release_needed = false;
|
||||
struct task_struct *task = current->group_leader;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_info("try to close unregistered fb");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
if (!mfd->ref_cnt) {
|
||||
pr_info("try to close unopened fb %d! from %s\n", mfd->index,
|
||||
task->comm);
|
||||
@@ -1700,6 +1799,11 @@ static int mdss_fb_pan_display_ex(struct fb_info *info,
|
||||
if (!mfd || (!mfd->op_enable) || (!mfd->panel_power_on))
|
||||
return -EPERM;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_err("try to pan display unregistered fb");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
if (var->xoffset > (info->var.xres_virtual - info->var.xres))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -1747,6 +1851,9 @@ static int mdss_fb_pan_display_sub(struct fb_var_screeninfo *var,
|
||||
struct fb_info *info)
|
||||
{
|
||||
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
|
||||
+ int pipe_index[2] = { INVALID_PIPE_INDEX, INVALID_PIPE_INDEX};
|
||||
+
|
||||
+ pr_debug("mdss_fb_pan_display_sub");
|
||||
|
||||
if ((!mfd->op_enable) || (!mfd->panel_power_on))
|
||||
return -EPERM;
|
||||
@@ -1765,8 +1872,12 @@ static int mdss_fb_pan_display_sub(struct fb_var_screeninfo *var,
|
||||
info->var.yoffset =
|
||||
(var->yoffset / info->fix.ypanstep) * info->fix.ypanstep;
|
||||
|
||||
- if (mfd->mdp.dma_fnc)
|
||||
- mfd->mdp.dma_fnc(mfd, NULL, 0, NULL);
|
||||
+ if (mfd->mdp.dma_fnc) {
|
||||
+ mfd->mdp.dma_fnc(mfd, NULL, 0, &pipe_index);
|
||||
+ if (pipe_index[0] == INVALID_PIPE_INDEX) {
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ }
|
||||
else
|
||||
pr_warn("dma function not set for panel type=%d\n",
|
||||
mfd->panel.type);
|
||||
@@ -1864,6 +1975,11 @@ static int mdss_fb_check_var(struct fb_var_screeninfo *var,
|
||||
{
|
||||
struct msm_fb_data_type *mfd = (struct msm_fb_data_type *)info->par;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_info("try to check unregistered var");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
if (var->rotate != FB_ROTATE_UR)
|
||||
return -EINVAL;
|
||||
if (var->grayscale != info->var.grayscale)
|
||||
@@ -1980,6 +2096,11 @@ static int mdss_fb_set_par(struct fb_info *info)
|
||||
int old_imgType;
|
||||
int ret = 0;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_info("try to set par for unregistered fb");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
ret = mdss_fb_pan_idle(mfd);
|
||||
if (ret) {
|
||||
pr_err("Shutdown pending. Aborting operation\n");
|
||||
@@ -2006,7 +2127,7 @@ static int mdss_fb_set_par(struct fb_info *info)
|
||||
break;
|
||||
|
||||
case 32:
|
||||
- if (var->transp.offset == 24)
|
||||
+ if (var->transp.offset == 0)
|
||||
mfd->fb_imgType = MDP_ARGB_8888;
|
||||
else
|
||||
mfd->fb_imgType = MDP_RGBA_8888;
|
||||
@@ -2331,6 +2452,11 @@ static int mdss_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
||||
if (!mfd)
|
||||
return -EINVAL;
|
||||
|
||||
+ if (mfd && !mfd->registered) {
|
||||
+ pr_err("try to ioctl unregistered fb");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
if (mfd->shutdown_pending)
|
||||
return -EPERM;
|
||||
|
||||
diff --git a/drivers/video/msm/mdss/mdss_fb.h b/drivers/video/msm/mdss/mdss_fb.h
|
||||
index 2b4c1245dcb..68b20acf775 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_fb.h
|
||||
+++ b/drivers/video/msm/mdss/mdss_fb.h
|
||||
@@ -172,6 +172,8 @@ struct msm_fb_data_type {
|
||||
int idle_time;
|
||||
struct delayed_work idle_notify_work;
|
||||
|
||||
+ bool registered;
|
||||
+
|
||||
int op_enable;
|
||||
u32 fb_imgType;
|
||||
int panel_reconfig;
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
|
||||
index 92be0a9c9fc..e1eafe6bc7f 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp.c
|
||||
@@ -2132,10 +2132,10 @@ static void mdss_mdp_parse_dt_fudge_factors(struct platform_device *pdev,
|
||||
rc = mdss_mdp_parse_dt_handler(pdev, prop_name, data, 2);
|
||||
if (rc) {
|
||||
pr_err("err reading %s\n", prop_name);
|
||||
- } else {
|
||||
- ff->numer = data[0];
|
||||
- ff->denom = data[1];
|
||||
}
|
||||
+
|
||||
+ ff->numer = data[0];
|
||||
+ ff->denom = data[1];
|
||||
}
|
||||
|
||||
static int mdss_mdp_parse_dt_prefill(struct platform_device *pdev)
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
|
||||
index 32fe1ba427e..bdbb0e3d8b4 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
|
||||
@@ -539,7 +539,7 @@ static int mdss_mdp_video_config_fps(struct mdss_mdp_ctl *ctl,
|
||||
int rc = 0;
|
||||
u32 hsync_period, vsync_period;
|
||||
|
||||
- pr_debug("Updating fps for ctl=%d\n", ctl->num);
|
||||
+ pr_info("Updating fps for ctl=%d\n", ctl->num);
|
||||
|
||||
ctx = (struct mdss_mdp_video_ctx *) ctl->priv_data;
|
||||
if (!ctx) {
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_kcal_ctrl.c b/drivers/video/msm/mdss/mdss_mdp_kcal_ctrl.c
|
||||
index e9da0516b3a..3dce36ad15c 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_kcal_ctrl.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_kcal_ctrl.c
|
||||
@@ -385,7 +385,8 @@ static void __exit kcal_ctrl_exit(void)
|
||||
platform_driver_unregister(&kcal_ctrl_driver);
|
||||
}
|
||||
|
||||
-late_initcall(kcal_ctrl_init);
|
||||
+//late_initcall(kcal_ctrl_init);
|
||||
+module_init(kcal_ctrl_init);
|
||||
module_exit(kcal_ctrl_exit);
|
||||
|
||||
MODULE_DESCRIPTION("LCD KCAL Driver");
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
index 07dde330b93..955ffa95d58 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
|
||||
@@ -1652,9 +1652,14 @@ static void mdss_mdp_overlay_pan_display(struct msm_fb_data_type *mfd,
|
||||
}
|
||||
mutex_unlock(&mdp5_data->ov_lock);
|
||||
|
||||
+ /*
|
||||
if ((fbi->var.activate & FB_ACTIVATE_VBL) ||
|
||||
(fbi->var.activate & FB_ACTIVATE_FORCE))
|
||||
mfd->mdp.kickoff_fnc(mfd, NULL);
|
||||
+ */
|
||||
+ // @edwin Always force kickoff the fb
|
||||
+ // otherwise suppend mode will not work
|
||||
+ mfd->mdp.kickoff_fnc(mfd, NULL);
|
||||
|
||||
return;
|
||||
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_pp.c b/drivers/video/msm/mdss/mdss_mdp_pp.c
|
||||
index 6a1d9bbc5c3..3c89f00d586 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_pp.c
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_pp.c
|
||||
@@ -2518,6 +2518,11 @@ static void pp_update_gc_one_lut(char __iomem *addr,
|
||||
{
|
||||
int i, start_idx, idx;
|
||||
|
||||
+ if( addr == NULL || lut_data == NULL ) {
|
||||
+ pr_warn("addr = %p, lut_data = %p", addr, lut_data);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
start_idx = ((readl_relaxed(addr) >> 16) & 0xF) + 1;
|
||||
for (i = start_idx; i < GC_LUT_SEGMENTS; i++) {
|
||||
idx = min((uint8_t)i, (uint8_t)(num_stages-1));
|
||||
--
|
||||
2.30.1
|
||||
|
||||
68
device/testing/linux-xiaomi-dior/APKBUILD
Normal file
68
device/testing/linux-xiaomi-dior/APKBUILD
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
# Reference: <https://postmarketos.org/vendorkernel>
|
||||
# Kernel config based on: arch/arm/configs/dior_user_defconfig
|
||||
|
||||
pkgname=linux-xiaomi-dior
|
||||
pkgver=3.4.0
|
||||
pkgrel=0
|
||||
pkgdesc="Xiaomi Redmi Note 4G kernel fork"
|
||||
arch="armv7"
|
||||
_carch="arm"
|
||||
_flavor="xiaomi-dior"
|
||||
url="https://kernel.org"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="bash bc bison devicepkg-dev flex openssl-dev perl xz dtbtool gcc4"
|
||||
|
||||
# Compiler: GCC 4 (doesn't boot when compiled with newer versions)
|
||||
if [ "${CC:0:5}" != "gcc4-" ]; then
|
||||
CC="gcc4-$CC"
|
||||
HOSTCC="gcc4-gcc"
|
||||
CROSS_COMPILE="gcc4-$CROSS_COMPILE"
|
||||
fi
|
||||
|
||||
_repository="android_kernel_xiaomi_dior"
|
||||
_commit="12f40d54ab4e34dabaeb8dd7979bedc3cc8fa064"
|
||||
|
||||
_config="config-$_flavor.$arch"
|
||||
|
||||
source="
|
||||
$pkgname-$_commit.tar.gz::https://github.com/msfkonsole/$_repository/archive/$_commit.tar.gz
|
||||
$_config
|
||||
gcc10-extern_YYLOC_global_declaration.patch
|
||||
linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
|
||||
kernel-use-the-gnu89-standard-explicitly.patch
|
||||
0001-fix-refresh-rate.patch
|
||||
0001-framebuffer-fixes.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
_outdir="out"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
build() {
|
||||
unset LDFLAGS
|
||||
make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
}
|
||||
|
||||
package() {
|
||||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
|
||||
|
||||
# Generate master DTB (deviceinfo_bootimg_qcdt)
|
||||
dtbTool -p scripts/dtc/ -o "$_outdir/arch/$_carch/boot"/dt.img "$_outdir/arch/$_carch/boot/"
|
||||
|
||||
# Master DTB (deviceinfo_bootimg_qcdt)
|
||||
install -Dm644 "$_outdir/arch/arm/boot/dt.img" "$pkgdir/boot/dt.img"
|
||||
}
|
||||
|
||||
sha512sums="540d01d6e6b405a3f20c928a3604840c096e08bdcf7817fbc153c0fed63cff7bccade64bba6ec0dea426475dae5512196d113733b8b9723c5d11611d0ce8706e linux-xiaomi-dior-12f40d54ab4e34dabaeb8dd7979bedc3cc8fa064.tar.gz
|
||||
9fe7afd20a83a3ceba65d2212eefc40386a6da4d58184b2e5f6944b4f453db4403129b46e78f6e72133da8f6202a2b57e4ffe0410f32c33dec22a48b3bce0d83 config-xiaomi-dior.armv7
|
||||
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
|
||||
5e81c20b0b30c1ab09bd59f1e1b77fcce945a27de8144c68617ddc5e8f10e1f6fa8b1e4cd5d63e43511d61dace46fb26b14a6227a667b9718d44c8b81dbe6100 linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
|
||||
ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch
|
||||
8aa95783bb2bd7540188e7850d0be16f43f446b33f1f9a8e41922e601e91cf85ca39e041535984b1dc2ed4c0792f6670bd064974136550f415c445df9339dd85 0001-fix-refresh-rate.patch
|
||||
16462e2f981eb714b86eed218dea5437e845c64b98a9fabbe7fd88396d24c0feb9561ed00bfa9c2bfe9f3802e4314056880b826c3b4cf9d2409a0d398e1a75c1 0001-framebuffer-fixes.patch"
|
||||
3766
device/testing/linux-xiaomi-dior/config-xiaomi-dior.armv7
Normal file
3766
device/testing/linux-xiaomi-dior/config-xiaomi-dior.armv7
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/linux/kernel-use-the-gnu89-standard-explicitly.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/linux/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
|
||||
Loading…
Reference in a new issue