Loading Makefile +5 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,11 @@ export LC_COLLATE LC_NUMERIC # Avoid interference with shell env settings unexport GREP_OPTIONS IRIS_KERNEL_CONFIG = true #ifeq ($(IRIS_KERNEL_CONFIG), true) export CONFIG_PXLW_IRIS=y #endif # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # Loading drivers/base/firmware_loader/main.c +18 −0 Original line number Diff line number Diff line Loading @@ -331,6 +331,24 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv) break; } #ifdef CONFIG_PXLW_IRIS if ((!strcmp(buf->fw_id, "iris6_ccf1.fw") || !strcmp(buf->fw_id, "iris6_ccf2.fw")) && i == 1) { snprintf(path, PATH_MAX, "%s/%s", "/system/etc", buf->fw_id); } if (i == 1) { if (!strcmp(buf->fw_id, "iris6_ccf1b.fw")) snprintf(path, PATH_MAX, "%s/%s", "/persist/display", buf->fw_id); if (!strcmp(buf->fw_id, "iris6_ccf2b.fw")) snprintf(path, PATH_MAX, "%s/%s", "/persist/display", buf->fw_id); if (!strcmp(buf->fw_id, "iris6_ccf3b.fw")) snprintf(path, PATH_MAX, "%s/%s", "/persist/display", buf->fw_id); } #endif fw_priv->size = 0; rc = kernel_read_file_from_path(path, &fw_priv->data, &size, msize, id); Loading drivers/gpu/drm/drm_mipi_dsi.c +9 −0 Original line number Diff line number Diff line Loading @@ -450,8 +450,13 @@ int mipi_dsi_create_packet(struct mipi_dsi_packet *packet, return -EINVAL; /* do some minimum sanity checking */ #if defined(CONFIG_PXLW_IRIS) if (!mipi_dsi_packet_format_is_short(msg->type & 0x3f) && !mipi_dsi_packet_format_is_long(msg->type & 0x3f)) #else if (!mipi_dsi_packet_format_is_short(msg->type) && !mipi_dsi_packet_format_is_long(msg->type)) #endif return -EINVAL; if (msg->channel > 3) Loading @@ -469,7 +474,11 @@ int mipi_dsi_create_packet(struct mipi_dsi_packet *packet, * Short write packets encode up to two parameters in header bytes 1 * and 2. */ #if defined(CONFIG_PXLW_IRIS) if (mipi_dsi_packet_format_is_long(msg->type & 0x3f)) { #else if (mipi_dsi_packet_format_is_long(msg->type)) { #endif packet->header[0] = (msg->tx_len >> 0) & 0xff; packet->header[1] = (msg->tx_len >> 8) & 0xff; Loading gen_headers_arm.bp +1 −0 Original line number Diff line number Diff line Loading @@ -109,6 +109,7 @@ gen_headers_out_arm = [ "drm/via_drm.h", "drm/virtgpu_drm.h", "drm/vmwgfx_drm.h", "drm/msm_drm_iris.h", "linux/acct.h", "linux/adb.h", "linux/adfs_fs.h", Loading gen_headers_arm64.bp +1 −0 Original line number Diff line number Diff line Loading @@ -104,6 +104,7 @@ gen_headers_out_arm64 = [ "drm/via_drm.h", "drm/virtgpu_drm.h", "drm/vmwgfx_drm.h", "drm/msm_drm_iris.h", "linux/acct.h", "linux/adb.h", "linux/adfs_fs.h", Loading Loading
Makefile +5 −0 Original line number Diff line number Diff line Loading @@ -29,6 +29,11 @@ export LC_COLLATE LC_NUMERIC # Avoid interference with shell env settings unexport GREP_OPTIONS IRIS_KERNEL_CONFIG = true #ifeq ($(IRIS_KERNEL_CONFIG), true) export CONFIG_PXLW_IRIS=y #endif # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # Loading
drivers/base/firmware_loader/main.c +18 −0 Original line number Diff line number Diff line Loading @@ -331,6 +331,24 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv) break; } #ifdef CONFIG_PXLW_IRIS if ((!strcmp(buf->fw_id, "iris6_ccf1.fw") || !strcmp(buf->fw_id, "iris6_ccf2.fw")) && i == 1) { snprintf(path, PATH_MAX, "%s/%s", "/system/etc", buf->fw_id); } if (i == 1) { if (!strcmp(buf->fw_id, "iris6_ccf1b.fw")) snprintf(path, PATH_MAX, "%s/%s", "/persist/display", buf->fw_id); if (!strcmp(buf->fw_id, "iris6_ccf2b.fw")) snprintf(path, PATH_MAX, "%s/%s", "/persist/display", buf->fw_id); if (!strcmp(buf->fw_id, "iris6_ccf3b.fw")) snprintf(path, PATH_MAX, "%s/%s", "/persist/display", buf->fw_id); } #endif fw_priv->size = 0; rc = kernel_read_file_from_path(path, &fw_priv->data, &size, msize, id); Loading
drivers/gpu/drm/drm_mipi_dsi.c +9 −0 Original line number Diff line number Diff line Loading @@ -450,8 +450,13 @@ int mipi_dsi_create_packet(struct mipi_dsi_packet *packet, return -EINVAL; /* do some minimum sanity checking */ #if defined(CONFIG_PXLW_IRIS) if (!mipi_dsi_packet_format_is_short(msg->type & 0x3f) && !mipi_dsi_packet_format_is_long(msg->type & 0x3f)) #else if (!mipi_dsi_packet_format_is_short(msg->type) && !mipi_dsi_packet_format_is_long(msg->type)) #endif return -EINVAL; if (msg->channel > 3) Loading @@ -469,7 +474,11 @@ int mipi_dsi_create_packet(struct mipi_dsi_packet *packet, * Short write packets encode up to two parameters in header bytes 1 * and 2. */ #if defined(CONFIG_PXLW_IRIS) if (mipi_dsi_packet_format_is_long(msg->type & 0x3f)) { #else if (mipi_dsi_packet_format_is_long(msg->type)) { #endif packet->header[0] = (msg->tx_len >> 0) & 0xff; packet->header[1] = (msg->tx_len >> 8) & 0xff; Loading
gen_headers_arm.bp +1 −0 Original line number Diff line number Diff line Loading @@ -109,6 +109,7 @@ gen_headers_out_arm = [ "drm/via_drm.h", "drm/virtgpu_drm.h", "drm/vmwgfx_drm.h", "drm/msm_drm_iris.h", "linux/acct.h", "linux/adb.h", "linux/adfs_fs.h", Loading
gen_headers_arm64.bp +1 −0 Original line number Diff line number Diff line Loading @@ -104,6 +104,7 @@ gen_headers_out_arm64 = [ "drm/via_drm.h", "drm/virtgpu_drm.h", "drm/vmwgfx_drm.h", "drm/msm_drm_iris.h", "linux/acct.h", "linux/adb.h", "linux/adfs_fs.h", Loading