From: "james qian wang (Arm Technology China)" Subject: [PATCH 2/2] drm/komeda: Enable new product D32 support Date: Tue, 9 Jul 2019 07:57:14 +0000 Message-ID: <20190709075640.22012-3-james.qian.wang@arm.com> References: <20190709075640.22012-1-james.qian.wang@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <20190709075640.22012-1-james.qian.wang@arm.com> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Liviu Dudau , "airlied@linux.ie" , Brian Starkey , "maarten.lankhorst@linux.intel.com" , "sean@poorly.run" Cc: "Jonathan Chai (Arm Technology China)" , "Julien Yin (Arm Technology China)" , "thomas Sun (Arm Technology China)" , "Lowry Li (Arm Technology China)" , Ayan Halder , "Tiannan Zhu (Arm Technology China)" , "Yiqi Kang (Arm Technology China)" , nd , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Ben Davis , "Oscar Zhang (Arm Technology China)" , "Channing Chen (Arm Technology China)" , "james qian wang (Arm Technology China)" List-Id: dri-devel@lists.freedesktop.org D32 is simple version of D71, the difference is: - Only has one pipeline - Drop the periph block and merge it to GCU Signed-off-by: James Qian Wang (Arm Technology China) --- .../drm/arm/display/include/malidp_product.h | 3 +- .../arm/display/komeda/d71/d71_component.c | 2 +- .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 43 ++++++++++++------- .../gpu/drm/arm/display/komeda/d71/d71_regs.h | 13 ++++++ .../gpu/drm/arm/display/komeda/komeda_drv.c | 1 + 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/arm/display/include/malidp_product.h b/drivers= /gpu/drm/arm/display/include/malidp_product.h index 1053b11352eb..16a8a2c22c42 100644 --- a/drivers/gpu/drm/arm/display/include/malidp_product.h +++ b/drivers/gpu/drm/arm/display/include/malidp_product.h @@ -18,7 +18,8 @@ #define MALIDP_CORE_ID_STATUS(__core_id) (((__u32)(__core_id)) & 0xFF) /* Mali-display product IDs */ -#define MALIDP_D71_PRODUCT_ID 0x0071 +#define MALIDP_D71_PRODUCT_ID 0x0071 +#define MALIDP_D32_PRODUCT_ID 0x0032 union komeda_config_id { struct { diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c b/drive= rs/gpu/drm/arm/display/komeda/d71/d71_component.c index a68954bb594a..593f8b7e9bb6 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_component.c @@ -1178,7 +1178,7 @@ static int d71_timing_ctrlr_init(struct d71_dev *d71, ctrlr =3D to_ctrlr(c); - ctrlr->supports_dual_link =3D true; + ctrlr->supports_dual_link =3D d71->supports_dual_link; ctrlr->supports_vrr =3D true; set_range(&ctrlr->vfp_range, 0, 0x3FF); diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c b/drivers/gpu= /drm/arm/display/komeda/d71/d71_dev.c index e383a781c9e9..8f7c44a0b916 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c @@ -371,23 +371,33 @@ static int d71_enum_resources(struct komeda_dev *mdev= ) goto err_cleanup; } - /* probe PERIPH */ + /* Only the legacy HW has the periph block, the newer merges the periph + * into GCU + */ value =3D malidp_read32(d71->periph_addr, BLK_BLOCK_INFO); - if (BLOCK_INFO_BLK_TYPE(value) !=3D D71_BLK_TYPE_PERIPH) { - DRM_ERROR("access blk periph but got blk: %d.\n", - BLOCK_INFO_BLK_TYPE(value)); - err =3D -EINVAL; - goto err_cleanup; + if (BLOCK_INFO_BLK_TYPE(value) !=3D D71_BLK_TYPE_PERIPH) + d71->periph_addr =3D NULL; + + if (d71->periph_addr) { + /* probe PERIPHERAL in legacy HW */ + value =3D malidp_read32(d71->periph_addr, PERIPH_CONFIGURATION_ID); + + d71->max_line_size =3D value & PERIPH_MAX_LINE_SIZE ? 4096 : 2048; + d71->max_vsize =3D 4096; + d71->num_rich_layers =3D value & PERIPH_NUM_RICH_LAYERS ? 2 : 1; + d71->supports_dual_link =3D !!(value & PERIPH_SPLIT_EN); + d71->integrates_tbu =3D !!(value & PERIPH_TBU_EN); + } else { + value =3D malidp_read32(d71->gcu_addr, GCU_CONFIGURATION_ID0); + d71->max_line_size =3D GCU_MAX_LINE_SIZE(value); + d71->max_vsize =3D GCU_MAX_NUM_LINES(value); + + value =3D malidp_read32(d71->gcu_addr, GCU_CONFIGURATION_ID1); + d71->num_rich_layers =3D GCU_NUM_RICH_LAYERS(value); + d71->supports_dual_link =3D GCU_DISPLAY_SPLIT_EN(value); + d71->integrates_tbu =3D GCU_DISPLAY_TBU_EN(value); } - value =3D malidp_read32(d71->periph_addr, PERIPH_CONFIGURATION_ID); - - d71->max_line_size =3D value & PERIPH_MAX_LINE_SIZE ? 4096 : 2048; - d71->max_vsize =3D 4096; - d71->num_rich_layers =3D value & PERIPH_NUM_RICH_LAYERS ? 2 : 1; - d71->supports_dual_link =3D value & PERIPH_SPLIT_EN ? true : false; - d71->integrates_tbu =3D value & PERIPH_TBU_EN ? true : false; - for (i =3D 0; i < d71->num_pipelines; i++) { pipe =3D komeda_pipeline_add(mdev, sizeof(struct d71_pipeline), &d71_pipeline_funcs); @@ -399,7 +409,7 @@ static int d71_enum_resources(struct komeda_dev *mdev) } /* loop the register blks and probe */ - i =3D 2; /* exclude GCU and PERIPH */ + i =3D 1; /* exclude GCU */ offset =3D D71_BLOCK_SIZE; /* skip GCU */ while (i < d71->num_blocks) { blk_base =3D mdev->reg_base + (offset >> 2); @@ -409,9 +419,9 @@ static int d71_enum_resources(struct komeda_dev *mdev) err =3D d71_probe_block(d71, &blk, blk_base); if (err) goto err_cleanup; - i++; } + i++; offset +=3D D71_BLOCK_SIZE; } @@ -587,6 +597,7 @@ d71_identify(u32 __iomem *reg_base, struct komeda_chip_= info *chip) switch (product_id) { case MALIDP_D71_PRODUCT_ID: + case MALIDP_D32_PRODUCT_ID: funcs =3D &d71_chip_funcs; break; default: diff --git a/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h b/drivers/gp= u/drm/arm/display/komeda/d71/d71_regs.h index 2d5e6d00b42c..da6bd535836d 100644 --- a/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h +++ b/drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h @@ -71,6 +71,19 @@ #define GCU_CONTROL_MODE(x) ((x) & 0x7) #define GCU_CONTROL_SRST BIT(16) +/* GCU_CONFIGURATION registers */ +#define GCU_CONFIGURATION_ID0 0x100 +#define GCU_CONFIGURATION_ID1 0x104 + +/* GCU configuration */ +#define GCU_MAX_LINE_SIZE(x) ((x) & 0xFFFF) +#define GCU_MAX_NUM_LINES(x) ((x) >> 16) +#define GCU_NUM_RICH_LAYERS(x) ((x) & 0x7) +#define GCU_NUM_PIPELINES(x) (((x) >> 3) & 0x7) +#define GCU_NUM_SCALERS(x) (((x) >> 6) & 0x7) +#define GCU_DISPLAY_SPLIT_EN(x) (((x) >> 16) & 0x1) +#define GCU_DISPLAY_TBU_EN(x) (((x) >> 17) & 0x1) + /* GCU opmode */ #define INACTIVE_MODE 0 #define TBU_CONNECT_MODE 1 diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_drv.c b/drivers/gpu/= drm/arm/display/komeda/komeda_drv.c index b7a1097c45c4..ad38bbc7431e 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_drv.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_drv.c @@ -125,6 +125,7 @@ static int komeda_platform_remove(struct platform_devic= e *pdev) static const struct of_device_id komeda_of_match[] =3D { { .compatible =3D "arm,mali-d71", .data =3D d71_identify, }, + { .compatible =3D "arm,mali-d32", .data =3D d71_identify, }, {}, }; -- 2.20.1