drm/komeda: Add new product "D32" support
Subsystems (4)
v3 cover drm/komeda: Add new product "D32" support
Hi All:
This series enables new product "D32" support
v2: Rebase
v3: Address Mihail's review comments.
james qian wang (Arm Technology China) (2):
drm/komeda: Update the chip identify
drm/komeda: Enable new product D32 support
.../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 | 58 +++++++++++++----- .../gpu/drm/arm/display/komeda/d71/d71_regs.h | 13 ++++ .../gpu/drm/arm/display/komeda/komeda_dev.c | 61 ++++++++++--------- .../gpu/drm/arm/display/komeda/komeda_dev.h | 14 +---- .../gpu/drm/arm/display/komeda/komeda_drv.c | 10 +-- 7 files changed, 96 insertions(+), 65 deletions(-)
--
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/2 drm/komeda: Update the chip identify
1. Drop komeda-CORE product id comparison and put it into the d71_identify
2. Update pipeline node DT-binding:
(a). Skip the needless pipeline DT node.
(b). Return fail if the essential pipeline DT node is missing.
With these changes, for chips in same family no need to change the DT.
v2: Rebase
v3: Address Mihail's comments.
--- .../gpu/drm/arm/display/komeda/d71/d71_dev.c | 19 +++++- .../gpu/drm/arm/display/komeda/komeda_dev.c | 61 ++++++++++--------- .../gpu/drm/arm/display/komeda/komeda_dev.h | 14 +---- .../gpu/drm/arm/display/komeda/komeda_drv.c | 9 +-- 4 files changed, 54 insertions(+), 49 deletions(-)
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +17 -2
@@ -597,10 +597,25 @@ static const struct komeda_dev_funcs d71_chip_funcs = {const struct komeda_dev_funcs *d71_identify (u32 __iomem *reg_base,struct komeda_chip_info *chip) { +const struct komeda_dev_funcs *funcs; +u32 product_id; + + chip->core_id =malidp_read32 (reg_base,GLB_CORE_ID ); + + product_id =MALIDP_CORE_ID_PRODUCT_ID (chip->core_id); + +switch (product_id) { +case MALIDP_D71_PRODUCT_ID : + funcs = &d71_chip_funcs; +break ; +default : +DRM_ERROR ("Unsupported product: 0x%x\n" , product_id); +return NULL ; + } + chip->arch_id =malidp_read32 (reg_base,GLB_ARCH_ID ); - chip->core_id =malidp_read32 (reg_base,GLB_CORE_ID ); chip->core_info =malidp_read32 (reg_base,GLB_CORE_INFO ); chip->bus_width =D71_BUS_WIDTH_16_BYTES ; -return &d71_chip_funcs; +return funcs; }
drivers/gpu/drm/arm/display/komeda/komeda_dev.c +33 -28
108 lines not on this page · raw message
drivers/gpu/drm/arm/display/komeda/komeda_dev.h +3 -11
@@ -58,11 +58,6 @@ | KOMEDA_EVENT_MODE \ ) -/* malidp device id */ -enum { -MALI_D71 =0 , -}; -/* pipeline DT ports */ enum {KOMEDA_OF_PORT_OUTPUT =0 ,
@@ -76,12 +71,6 @@ struct komeda_chip_info {u32 bus_width; }; -struct komeda_product_data { -u32 product_id; -const struct komeda_dev_funcs *(*identify)(u32 __iomem *reg, -struct komeda_chip_info *info); -}; -struct komeda_dev ;struct komeda_events {
@@ -234,6 +223,9 @@ komeda_product_match(struct komeda_dev *mdev, u32 target)return MALIDP_CORE_ID_PRODUCT_ID (mdev->chip.core_id) == target; } +typedef const struct komeda_dev_funcs * +(*komeda_identify_func )(u32 __iomem *reg,struct komeda_chip_info *chip); +const struct komeda_dev_funcs *d71_identify (u32 __iomem *reg,struct komeda_chip_info *chip);
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +1 -8
@@ -123,15 +123,8 @@ static int komeda_platform_remove(struct platform_device *pdev)return 0 ; } -static const struct komeda_product_data komeda_products[] = { - [MALI_D71 ] = { - .product_id =MALIDP_D71_PRODUCT_ID , - .identify = d71_identify, - }, -}; -static const struct of_device_id komeda_of_match[] = { - { .compatible ="arm,mali-d71" , .data = &komeda_products[MALI_D71 ], }, + { .compatible ="arm,mali-d71" , .data = d71_identify, }, {}, };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/2 drm/komeda: Enable new product D32 support
In reply to james qian wang (Arm Technology China)D32 is simple version of D71, the difference is:
- Only has one pipeline
- Drop the periph block and merge it to GCU
v2: Rebase.
v3: Isolate the block counting fix to a new patch
--- .../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 | 39 ++++++++++++------- .../gpu/drm/arm/display/komeda/d71/d71_regs.h | 13 +++++++ .../gpu/drm/arm/display/komeda/komeda_drv.c | 1 + 5 files changed, 42 insertions(+), 16 deletions(-)
drivers/gpu/drm/arm/display/include/malidp_product.h +2 -1
@@ -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 {
drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1 -1
@@ -1270,7 +1270,7 @@ static int d71_timing_ctrlr_init(struct d71_dev *d71, ctrlr =to_ctrlr (c); - ctrlr->supports_dual_link = true; + ctrlr->supports_dual_link = d71->supports_dual_link;return 0 ; }
drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +25 -14
@@ -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 =malidp_read32 (d71->periph_addr,BLK_BLOCK_INFO ); -if (BLOCK_INFO_BLK_TYPE (value) !=D71_BLK_TYPE_PERIPH ) { -DRM_ERROR ("access blk periph but got blk: %d.\n" , -BLOCK_INFO_BLK_TYPE (value)); - err = -EINVAL ; - goto err_cleanup; +if (BLOCK_INFO_BLK_TYPE (value) !=D71_BLK_TYPE_PERIPH ) + d71->periph_addr =NULL ; + +if (d71->periph_addr) { +/* probe PERIPHERAL in legacy HW */ + value =malidp_read32 (d71->periph_addr,PERIPH_CONFIGURATION_ID ); + + d71->max_line_size = value &PERIPH_MAX_LINE_SIZE ?4096 :2048 ; + d71->max_vsize =4096 ; + d71->num_rich_layers = value &PERIPH_NUM_RICH_LAYERS ?2 :1 ; + d71->supports_dual_link = !!(value &PERIPH_SPLIT_EN ); + d71->integrates_tbu = !!(value &PERIPH_TBU_EN ); + }else { + value =malidp_read32 (d71->gcu_addr,GCU_CONFIGURATION_ID0 ); + d71->max_line_size =GCU_MAX_LINE_SIZE (value); + d71->max_vsize =GCU_MAX_NUM_LINES (value); + + value =malidp_read32 (d71->gcu_addr,GCU_CONFIGURATION_ID1 ); + d71->num_rich_layers =GCU_NUM_RICH_LAYERS (value); + d71->supports_dual_link =GCU_DISPLAY_SPLIT_EN (value); + d71->integrates_tbu =GCU_DISPLAY_TBU_EN (value); } - value =malidp_read32 (d71->periph_addr,PERIPH_CONFIGURATION_ID ); - - d71->max_line_size = value &PERIPH_MAX_LINE_SIZE ?4096 :2048 ; - d71->max_vsize =4096 ; - d71->num_rich_layers = value &PERIPH_NUM_RICH_LAYERS ?2 :1 ; - d71->supports_dual_link = value &PERIPH_SPLIT_EN ? true : false; - d71->integrates_tbu = value &PERIPH_TBU_EN ? true : false; -for (i =0 ; i < d71->num_pipelines; i++) { pipe =komeda_pipeline_add (mdev,sizeof (struct d71_pipeline ), &d71_pipeline_funcs);
@@ -606,6 +616,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 = &d71_chip_funcs;break ;default :
drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h +13 -0
@@ -72,6 +72,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
drivers/gpu/drm/arm/display/komeda/komeda_drv.c +1 -0
@@ -125,6 +125,7 @@ static int komeda_platform_remove(struct platform_device *pdev)static const struct of_device_id komeda_of_match[] = { { .compatible ="arm,mali-d71" , .data = d71_identify, }, + { .compatible ="arm,mali-d32" , .data = d71_identify, }, {}, };
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 2/2] drm/komeda: Enable new product D32 support
Quoted 6 lines · On Tuesday, 10 December 2019 08:48:51 GMT james qian wang (Arm Technology…
D32 is simple version of D71, the difference is:
- Only has one pipeline
- Drop the periph block and merge it to GCUv2: Rebase.
v3: Isolate the block counting fix to a new patch
I would've expected the fix to be a part of this series as 2/3 and this patch as 3/3.
Otherwise, this patch is
Quoted 134 lines
--- .../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 | 39 ++++++++++++------- .../gpu/drm/arm/display/komeda/d71/d71_regs.h | 13 +++++++ .../gpu/drm/arm/display/komeda/komeda_drv.c | 1 + 5 files changed, 42 insertions(+), 16 deletions(-)drivers/gpu/drm/arm/display/include/malidp_product.h +2
-1@@ -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 {drivers/gpu/drm/arm/display/komeda/d71/d71_component.c +1
-1@@ -1270,7 +1270,7 @@ static int d71_timing_ctrlr_init(struct d71_dev *d71, ctrlr =to_ctrlr (c); - ctrlr->supports_dual_link = true; + ctrlr->supports_dual_link = d71->supports_dual_link;return 0 ; }drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c +25
-14@@ -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 =malidp_read32 (d71->periph_addr,BLK_BLOCK_INFO ); -if (BLOCK_INFO_BLK_TYPE (value) !=D71_BLK_TYPE_PERIPH ) { -DRM_ERROR ("access blk periph but got blk: %d.\n" , -BLOCK_INFO_BLK_TYPE (value)); - err = -EINVAL ; - goto err_cleanup; +if (BLOCK_INFO_BLK_TYPE (value) !=D71_BLK_TYPE_PERIPH ) + d71->periph_addr =NULL ; + +if (d71->periph_addr) { +/* probe PERIPHERAL in legacy HW */ + value =malidp_read32 (d71->periph_addr,PERIPH_CONFIGURATION_ID ); + + d71->max_line_size = value &PERIPH_MAX_LINE_SIZE ?4096 :2048 ; + d71->max_vsize =4096 ; + d71->num_rich_layers = value &PERIPH_NUM_RICH_LAYERS ?2 :1 ; + d71->supports_dual_link = !!(value &PERIPH_SPLIT_EN ); + d71->integrates_tbu = !!(value &PERIPH_TBU_EN ); + }else { + value =malidp_read32 (d71->gcu_addr,GCU_CONFIGURATION_ID0 ); + d71->max_line_size =GCU_MAX_LINE_SIZE (value); + d71->max_vsize =GCU_MAX_NUM_LINES (value); + + value =malidp_read32 (d71->gcu_addr,GCU_CONFIGURATION_ID1 ); + d71->num_rich_layers =GCU_NUM_RICH_LAYERS (value); + d71->supports_dual_link =GCU_DISPLAY_SPLIT_EN (value); + d71->integrates_tbu =GCU_DISPLAY_TBU_EN (value); } - value =malidp_read32 (d71->periph_addr,PERIPH_CONFIGURATION_ID ); - - d71->max_line_size = value &PERIPH_MAX_LINE_SIZE ?4096 :2048 ; - d71->max_vsize =4096 ; - d71->num_rich_layers = value &PERIPH_NUM_RICH_LAYERS ?2 :1 ; - d71->supports_dual_link = value &PERIPH_SPLIT_EN ? true : false; - d71->integrates_tbu = value &PERIPH_TBU_EN ? true : false; -for (i =0 ; i < d71->num_pipelines; i++) { pipe =komeda_pipeline_add (mdev,sizeof (struct d71_pipeline ), &d71_pipeline_funcs);@@ -606,6 +616,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 = &d71_chip_funcs;break ;default :drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h +13
-0@@ -72,6 +72,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 1drivers/gpu/drm/arm/display/komeda/komeda_drv.c +1
-0@@ -125,6 +125,7 @@ static int komeda_platform_remove(struct platform_device *pdev)static const struct of_device_id komeda_of_match[] = { { .compatible ="arm,mali-d71" , .data = d71_identify, }, + { .compatible ="arm,mali-d32" , .data = d71_identify, }, {}, };
Signature · 1 line
Mihail