shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: update osd_count according to the chip [2/4]

Browse Source 
PD#SWPL-3996

Problem:
g12b/g12a wayland-drm device print below error
"fb: error osd index=0" while start wayland-client.
while start wayland-client.

Solution:
set to the proper osd_count

Verify:
W400

Change-Id: I3c4c6d821ff0778cd4912a67046f7dbab60be2ad
Signed-off-by: lingjie li <lingjie.li@amlogic.com>
This commit is contained in:
lingjie li
2019-02-19 19:47:06 +08:00
committed by Luke Go
parent 4d4e4149c0
commit ecb536d3db
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/amlogic/drm/drm-v0/am_meson_vpu.c
View File

@@ -209,7 +209,7 @@ static struct osd_device_data_s osd_g12a = {
.cpu_id = __MESON_CPU_MAJOR_ID_G12A,
.osd_ver = OSD_HIGH_ONE,
.afbc_type = MALI_AFBC,
.osd_count = 3,
.osd_count = 4,
.has_deband = 1,
.has_lut = 1,
.has_rdma = 1,
@@ -224,7 +224,7 @@ static struct osd_device_data_s osd_g12b = {
.cpu_id = __MESON_CPU_MAJOR_ID_G12B,
.osd_ver = OSD_HIGH_ONE,
.afbc_type = MALI_AFBC,
.osd_count = 3,
.osd_count = 4,
.has_deband = 1,
.has_lut = 1,
.has_rdma = 1,
@@ -241,15 +241,22 @@ static struct page *logo_page;
static struct delayed_work osd_dwork;
static struct platform_device *gp_dev;
int am_meson_crtc_dts_info_set(const void *dt_match_data)
{
struct osd_device_data_s *osd_meson;
osd_meson = (struct osd_device_data_s *)dt_match_data;
if (osd_meson)
if (osd_meson) {
memcpy(&osd_meson_dev, osd_meson,
sizeof(struct osd_device_data_s));
else {
osd_meson_dev.viu1_osd_count = osd_meson_dev.osd_count;
if (osd_meson_dev.has_viu2) {
/* set viu1 osd count */
osd_meson_dev.viu1_osd_count--;
osd_meson_dev.viu2_index = osd_meson_dev.viu1_osd_count;
}
} else {
DRM_ERROR("%s data NOT match\n", __func__);
return -1;
}