Add support for XLCDC to sam9x7 SoC family.
Subsystems (6)
Manikandan Muralidharan
maintainerv2 cover Add support for XLCDC to sam9x7 SoC family.
This patch series aims to add support for XLCDC IP of sam9x7 SoC family to the DRM subsystem.XLCDC IP has additional registers and new configuration bits compared to the existing register set of HLCDC IP. The new compatible string "microchip,sam9x75-xlcdc" is defined for sam9x75 variant of the sam9x7 SoC family.The is_xlcdc flag under driver data helps to differentiate the XLCDC and existing HLCDC code within the same driver.
changes in v2:
* Change the driver compatible name from "microchip,sam9x7-xlcdc" to "microchip,sam9x75-xlcdc".
* Move is_xlcdc flag to driver data.
* Remove unsed Macro definitions.
* Add co-developed-bys tags
* Replace regmap_read() with regmap_read_poll_timeout() call
* Split code into two helpers for code readablitity.
Durai Manickam KR (1):
drm: atmel-hlcdc: Define SAM9X7 SoC XLCDC specific registers
Manikandan Muralidharan (8):
dt-bindings: mfd: Add bindings for SAM9X75 LCD controller
mfd: atmel-hlcdc: Add compatible for sam9x75 XLCD controller
drm: atmel-hlcdc: add flag to differentiate XLCDC and HLCDC IP
drm: atmel-hlcdc: add LCD controller layer definition for sam9x75
drm: atmel_hlcdc: Add support for XLCDC in atmel LCD driver
drm: atmel-hlcdc: add DPI mode support for XLCDC
drm: atmel-hlcdc: add vertical and horizontal scaling support for
XLCDC
drm: atmel-hlcdc: add support for DSI output formats
.../devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 171 +++++++-- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 99 +++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 48 +++ .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 357 +++++++++++++++--- drivers/mfd/atmel-hlcdc.c | 1 + include/linux/mfd/atmel-hlcdc.h | 10 + 7 files changed, 596 insertions(+), 91 deletions(-)
Signature · 1 line
2.25.1
Manikandan Muralidharan
maintainerPATCH v2 1/9 dt-bindings: mfd: Add bindings for SAM9X75 LCD controller
Add new compatible string for the XLCD controller on sam9x75 variant of the SAM9X7 SoC family.
The XLCD controller in sam9x75 variant supports interfacing with LVDS and MIPI-DSI and parallel port RGB.
--- Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt +1 -0
@@ -8,6 +8,7 @@ Required properties: "atmel,sama5d3-hlcdc" "atmel,sama5d4-hlcdc" "microchip,sam9x60-hlcdc" + "microchip,sam9x75-xlcdc" - reg: base address and size of the HLCDC device registers. - clock-names: the name of the 3 clocks requested by the HLCDC device. Should contain "periph_clk", "sys_clk" and "slow_clk".
Signature · 1 line
2.25.1
Re: [PATCH v2 1/9] dt-bindings: mfd: Add bindings for SAM9X75 LCD controller
Quoted 4 lines · Manikandan Muralidharan
Add new compatible string for the XLCD controller on sam9x75 variant of the SAM9X7 SoC family.
The XLCD controller in sam9x75 variant supports interfacing with LVDS and MIPI-DSI and parallel port RGB.
Best regards,
Krzysztof
Re: [PATCH v2 1/9] dt-bindings: mfd: Add bindings for SAM9X75 LCD controller
In reply to Manikandan MuralidharanQuoted 9 lines · Manikandan Muralidharan
Add new compatible string for the XLCD controller on sam9x75 variant of the SAM9X7 SoC family.
The XLCD controller in sam9x75 variant supports interfacing with LVDS and MIPI-DSI and parallel port RGB.Signed-off-by Manikandan Muralidharan <[email protected]>--- Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + 1 file changed, 1 insertion(+)
Applied, thanks
Signature · 1 line
Lee Jones [李琼斯]
Manikandan Muralidharan
maintainerPATCH v2 2/9 mfd: atmel-hlcdc: Add compatible for sam9x75 XLCD controller
In reply to Manikandan MuralidharanAdd compatible for sam9x75 XLCD controller.
--- drivers/mfd/atmel-hlcdc.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/atmel-hlcdc.c +1 -0
@@ -141,6 +141,7 @@ static const struct of_device_id atmel_hlcdc_match[] = { { .compatible = "atmel,sama5d3-hlcdc" }, { .compatible = "atmel,sama5d4-hlcdc" }, { .compatible = "microchip,sam9x60-hlcdc" }, + { .compatible = "microchip,sam9x75-xlcdc" }, { /* sentinel */ }, };MODULE_DEVICE_TABLE (of, atmel_hlcdc_match);
Signature · 1 line
2.25.1
Manikandan Muralidharan
maintainerPATCH v2 3/9 drm: atmel-hlcdc: add flag to differentiate XLCDC and HLCDC IP
In reply to Manikandan MuralidharanAdd is_xlcdc flag in driver data to differentiate XLCDC and HLCDC code within the atmel-hlcdc driver files.
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +2 -0
@@ -304,6 +304,7 @@ atmel_hlcdc_layer_to_plane(struct atmel_hlcdc_layer *layer)* @conflicting_output_formats: true if RGBXXX output formats conflict with * each other. * @fixed_clksrc: true if clock source is fixed +* @is_xlcdc: true if XLCDC IP is supported * @layers: a layer description table describing available layers * @nlayers: layer description table size */
@@ -317,6 +318,7 @@ struct atmel_hlcdc_dc_desc {int max_hpw;bool conflicting_output_formats;bool fixed_clksrc; +bool is_xlcdc;const struct atmel_hlcdc_layer_desc *layers;int nlayers; };
Signature · 1 line
2.25.1
Manikandan Muralidharan
maintainerPATCH v2 4/9 drm: atmel-hlcdc: add LCD controller layer definition for sam9x75
In reply to Manikandan MuralidharanAdd the LCD controller layer definition and descriptor structure for sam9x75 for the following layers,
- Base Layer
- Overlay1 Layer
- Overlay2 Layer
- High End Overlay
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 97 ++++++++++++++++++++ 1 file changed, 97 insertions(+)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +97 -0
@@ -462,6 +462,99 @@ static const struct atmel_hlcdc_dc_desc atmel_hlcdc_dc_sam9x60 = { .layers = atmel_hlcdc_sam9x60_layers, }; +static const struct atmel_hlcdc_layer_desc atmel_xlcdc_sam9x75_layers[] = { + { + .name ="base" , + .formats = &atmel_hlcdc_plane_rgb_formats, + .regs_offset =0x60 , + .id =0 , + .type =ATMEL_HLCDC_BASE_LAYER , + .cfgs_offset =0x1c , + .layout = { + .xstride = {2 }, + .default_color =3 , + .general_config =4 , + .disc_pos =5 , + .disc_size =6 , + }, + .clut_offset =0x700 , + }, + { + .name ="overlay1" , + .formats = &atmel_hlcdc_plane_rgb_formats, + .regs_offset =0x160 , + .id =1 , + .type =ATMEL_HLCDC_OVERLAY_LAYER , + .cfgs_offset =0x1c , + .layout = { + .pos =2 , + .size =3 , + .xstride = {4 }, + .pstride = {5 }, + .default_color =6 , + .chroma_key =7 , + .chroma_key_mask =8 , + .general_config =9 , + }, + .clut_offset =0xb00 , + }, + { + .name ="overlay2" , + .formats = &atmel_hlcdc_plane_rgb_formats, + .regs_offset =0x260 , + .id =2 , + .type =ATMEL_HLCDC_OVERLAY_LAYER , + .cfgs_offset =0x1c , + .layout = { + .pos =2 , + .size =3 , + .xstride = {4 }, + .pstride = {5 }, + .default_color =6 , + .chroma_key =7 , + .chroma_key_mask =8 , + .general_config =9 , + }, + .clut_offset =0xf00 , + }, + { + .name ="high-end-overlay" , + .formats = &atmel_hlcdc_plane_rgb_and_yuv_formats, + .regs_offset =0x360 , + .id =3 , + .type =ATMEL_HLCDC_OVERLAY_LAYER , + .cfgs_offset =0x30 , + .layout = { + .pos =2 , + .size =3 , + .memsize =4 , + .xstride = {5 ,7 }, + .pstride = {6 ,8 }, + .default_color =9 , + .chroma_key =10 , + .chroma_key_mask =11 , + .general_config =12 , + .csc =16 , + .scaler_config =23 , + }, + .clut_offset =0x1300 , + }, +}; + +static const struct atmel_hlcdc_dc_desc atmel_xlcdc_dc_sam9x75 = { + .min_width =0 , + .min_height =0 , + .max_width =2048 , + .max_height =2048 , + .max_spw =0xff , + .max_vpw =0xff , + .max_hpw =0x3ff , + .fixed_clksrc = true, + .is_xlcdc = true, + .nlayers =ARRAY_SIZE (atmel_xlcdc_sam9x75_layers), + .layers = atmel_xlcdc_sam9x75_layers, +}; +static const struct of_device_id atmel_hlcdc_of_match[] = { { .compatible ="atmel,at91sam9n12-hlcdc" ,
@@ -487,6 +580,10 @@ static const struct of_device_id atmel_hlcdc_of_match[] = { .compatible = "microchip,sam9x60-hlcdc", .data = &atmel_hlcdc_dc_sam9x60, }, + { + .compatible = "microchip,sam9x75-xlcdc", + .data = &atmel_xlcdc_dc_sam9x75, + }, { /* sentinel */ }, };MODULE_DEVICE_TABLE (of, atmel_hlcdc_of_match);
Signature · 1 line
2.25.1
Manikandan Muralidharan
maintainerPATCH v2 5/9 drm: atmel-hlcdc: Define SAM9X7 SoC XLCDC specific registers
In reply to Manikandan MuralidharanFrom: Durai Manickam KR <[email protected]>
The register address of the XLCDC IP used in SAM9X7 SoC family are different from the previous HLCDC.Defining those address space with valid macros.
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 42 ++++++++++++++++++++ include/linux/mfd/atmel-hlcdc.h | 10 +++++ 2 files changed, 52 insertions(+)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +42 -0
@@ -15,6 +15,7 @@#include <drm/drm_plane.h> +/* LCD controller common registers */ #define ATMEL_HLCDC_LAYER_CHER 0x0#define ATMEL_HLCDC_LAYER_CHDR 0x4#define ATMEL_HLCDC_LAYER_CHSR 0x8
@@ -128,6 +129,47 @@#define ATMEL_HLCDC_MAX_LAYERS 6 +/* XLCDC controller specific registers */ +#define ATMEL_XLCDC_LAYER_ENR 0x10 +#define ATMEL_XLCDC_LAYER_EN BIT(0) + +#define ATMEL_XLCDC_LAYER_IER 0x0 +#define ATMEL_XLCDC_LAYER_IDR 0x4 +#define ATMEL_XLCDC_LAYER_ISR 0xc +#define ATMEL_XLCDC_LAYER_OVR_IRQ (p) BIT(2 + (8 * (p))) + +#define ATMEL_XLCDC_LAYER_PLANE_ADDR (p) (((p) * 0x4) + 0x18) + +#define ATMEL_XLCDC_LAYER_DMA_CFG 0 + +#define ATMEL_XLCDC_LAYER_DMA BIT(0) +#define ATMEL_XLCDC_LAYER_REP BIT(1) +#define ATMEL_XLCDC_LAYER_DISCEN BIT(4) + +#define ATMEL_XLCDC_LAYER_SFACTC_A0_MULT_AS (4 << 6) +#define ATMEL_XLCDC_LAYER_SFACTA_ONE BIT(9) +#define ATMEL_XLCDC_LAYER_DFACTC_M_A0_MULT_AS (6 << 11) +#define ATMEL_XLCDC_LAYER_DFACTA_ONE BIT(14) + +#define ATMEL_XLCDC_LAYER_A0_SHIFT 16 +#define ATMEL_XLCDC_LAYER_A0 (x) \ + ((x) << ATMEL_XLCDC_LAYER_A0_SHIFT) + +#define ATMEL_XLCDC_LAYER_VSCALER_LUMA_ENABLE BIT(0) +#define ATMEL_XLCDC_LAYER_VSCALER_CHROMA_ENABLE BIT(1) +#define ATMEL_XLCDC_LAYER_HSCALER_LUMA_ENABLE BIT(4) +#define ATMEL_XLCDC_LAYER_HSCALER_CHROMA_ENABLE BIT(5) + +#define ATMEL_XLCDC_LAYER_VXSYCFG_ONE BIT(0) +#define ATMEL_XLCDC_LAYER_VXSYTAP2_ENABLE BIT(4) +#define ATMEL_XLCDC_LAYER_VXSCCFG_ONE BIT(16) +#define ATMEL_XLCDC_LAYER_VXSCTAP2_ENABLE BIT(20) + +#define ATMEL_XLCDC_LAYER_HXSYCFG_ONE BIT(0) +#define ATMEL_XLCDC_LAYER_HXSYTAP2_ENABLE BIT(4) +#define ATMEL_XLCDC_LAYER_HXSCCFG_ONE BIT(16) +#define ATMEL_XLCDC_LAYER_HXSCTAP2_ENABLE BIT(20) +/** * Atmel HLCDC Layer registers layout structure *
include/linux/mfd/atmel-hlcdc.h +10 -0
@@ -22,6 +22,8 @@#define ATMEL_HLCDC_DITHER BIT(6)#define ATMEL_HLCDC_DISPDLY BIT(7)#define ATMEL_HLCDC_MODE_MASK GENMASK(9, 8) +#define ATMEL_XLCDC_MODE_MASK GENMASK(10, 8) +#define ATMEL_XLCDC_DPI BIT(11)#define ATMEL_HLCDC_PP BIT(10)#define ATMEL_HLCDC_VSPSU BIT(12)#define ATMEL_HLCDC_VSPHO BIT(13)
@@ -34,6 +36,12 @@#define ATMEL_HLCDC_IDR 0x30#define ATMEL_HLCDC_IMR 0x34#define ATMEL_HLCDC_ISR 0x38 +#define ATMEL_XLCDC_ATTRE 0x3c + +#define ATMEL_XLCDC_BASE_UPDATE BIT(0) +#define ATMEL_XLCDC_OVR1_UPDATE BIT(1) +#define ATMEL_XLCDC_OVR3_UPDATE BIT(2) +#define ATMEL_XLCDC_HEO_UPDATE BIT(3)#define ATMEL_HLCDC_CLKPOL BIT(0)#define ATMEL_HLCDC_CLKSEL BIT(2)
@@ -48,6 +56,8 @@#define ATMEL_HLCDC_DISP BIT(2)#define ATMEL_HLCDC_PWM BIT(3)#define ATMEL_HLCDC_SIP BIT(4) +#define ATMEL_XLCDC_SD BIT(5) +#define ATMEL_XLCDC_CM BIT(6)#define ATMEL_HLCDC_SOF BIT(0)#define ATMEL_HLCDC_SYNCDIS BIT(1)
Signature · 1 line
2.25.1
Manikandan Muralidharan
maintainerPATCH v2 6/9 drm: atmel_hlcdc: Add support for XLCDC in atmel LCD driver
In reply to Manikandan Muralidharan- XLCDC in SAM9X7 has different sets of registers and additional configuration bits when compared to previous HLCDC IP. Read/write operation on the controller registers is now separated using the XLCDC status flag.
- HEO scaling, window resampling, Alpha blending, YUV-to-RGB
conversion in XLCDC is derived and handled using additional configuration bits and registers.
- Writing one to the Enable fields of each layer in LCD_ATTRE
is required to reflect the values set in Configuration, FBA, Enable registers of each layer
--- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 32 +- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 337 +++++++++++++++--- 2 files changed, 312 insertions(+), 57 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +30 -2
@@ -139,10 +139,10 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) state =drm_crtc_state_to_atmel_hlcdc_crtc_state (c->state); cfg = state->output_mode <<8 ; -if (adj->flags &DRM_MODE_FLAG_NVSYNC ) +if (!crtc->dc->desc->is_xlcdc && (adj->flags &DRM_MODE_FLAG_NVSYNC )) cfg |=ATMEL_HLCDC_VSPOL ; -if (adj->flags &DRM_MODE_FLAG_NHSYNC ) +if (!crtc->dc->desc->is_xlcdc && (adj->flags &DRM_MODE_FLAG_NHSYNC )) cfg |=ATMEL_HLCDC_HSPOL ; regmap_update_bits(regmap, ATMEL_HLCDC_CFG(5),
@@ -177,6 +177,20 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c,pm_runtime_get_sync (dev->dev); +if (crtc->dc->desc->is_xlcdc) { +regmap_write (regmap,ATMEL_HLCDC_DIS ,ATMEL_XLCDC_CM ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + !(status &ATMEL_XLCDC_CM ),10 , +0 )) +cpu_relax (); + +regmap_write (regmap,ATMEL_HLCDC_DIS ,ATMEL_XLCDC_SD ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + status &ATMEL_XLCDC_SD ,10 , +0 )) +cpu_relax (); + } +regmap_write (regmap,ATMEL_HLCDC_DIS ,ATMEL_HLCDC_DISP );while (!regmap_read (regmap,ATMEL_HLCDC_SR , &status) && (status &ATMEL_HLCDC_DISP ))
@@ -231,6 +245,20 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c, !(status & ATMEL_HLCDC_DISP))cpu_relax (); +if (crtc->dc->desc->is_xlcdc) { +regmap_write (regmap,ATMEL_HLCDC_EN ,ATMEL_XLCDC_CM ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + status &ATMEL_XLCDC_CM ,10 , +0 )) +cpu_relax (); + +regmap_write (regmap,ATMEL_HLCDC_EN ,ATMEL_XLCDC_SD ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + !(status &ATMEL_XLCDC_SD ),10 , +0 )) +cpu_relax (); + } +pm_runtime_put_sync (dev->dev); }
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +282 -55
432 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v2 6/9] drm: atmel_hlcdc: Add support for XLCDC in atmel LCD driver
Quoted 26 lines · Manikandan Muralidharan
- XLCDC in SAM9X7 has different sets of registers and additional configuration bits when compared to previous HLCDC IP. Read/write operation on the controller registers is now separated using the XLCDC status flag.
- HEO scaling, window resampling, Alpha blending, YUV-to-RGB
conversion in XLCDC is derived and handled using additional configuration bits and registers.
- Writing one to the Enable fields of each layer inLCD_ATTRE
is required to reflect the values set in Configuration, FBA, Enable registers of each layerSigned-off-by Manikandan Muralidharan <[email protected]>Co-developed-by Hari Prasath Gujulan Elango <[email protected]>Signed-off-by Hari Prasath Gujulan Elango <[email protected]>Co-developed-by Durai Manickam KR <[email protected]>Signed-off-by Durai Manickam KR <[email protected]>--- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 32 +- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 337 +++++++++++++++--- 2 files changed, 312 insertions(+), 57 deletions(-)drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +0
-0
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) · line 142
Quoted 5 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +1
-1@@ -139,10 +139,10 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) state =drm_crtc_state_to_atmel_hlcdc_crtc_state (c->state); cfg = state->output_mode <<8 ; -if (adj->flags &DRM_MODE_FLAG_NVSYNC ) +if (!crtc->dc->desc->is_xlcdc && (adj->flags &DRM_MODE_FLAG_NVSYNC ))
Instead of de-referencing the value of is_xlcdc flag multiple times, can we have it assigned to a local variable instead to make it more readable and avoid multiple memory accesses ?
Quoted 8 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +1
-1cfg |=ATMEL_HLCDC_VSPOL ; -if (adj->flags &DRM_MODE_FLAG_NHSYNC ) +if (!crtc->dc->desc->is_xlcdc && (adj->flags &DRM_MODE_FLAG_NHSYNC )) cfg |=ATMEL_HLCDC_HSPOL ; regmap_update_bits(regmap, ATMEL_HLCDC_CFG(5),
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c, · line 185
Quoted 9 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +6
-0@@ -177,6 +177,20 @@ static void atmel_hlcdc_crtc_atomic_disable(struct drm_crtc *c,pm_runtime_get_sync (dev->dev); +if (crtc->dc->desc->is_xlcdc) { +regmap_write (regmap,ATMEL_HLCDC_DIS ,ATMEL_XLCDC_CM ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + !(status &ATMEL_XLCDC_CM ),10 , +0 )) +cpu_relax ();
cpu_relax() is not required here and at other places below since the above function yields the cpu anyway,remove them.
Quoted 47 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +22
-0+ +regmap_write (regmap,ATMEL_HLCDC_DIS ,ATMEL_XLCDC_SD ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + status &ATMEL_XLCDC_SD ,10 , +0 )) +cpu_relax (); + } +regmap_write (regmap,ATMEL_HLCDC_DIS ,ATMEL_HLCDC_DISP );while (!regmap_read (regmap,ATMEL_HLCDC_SR , &status) && (status &ATMEL_HLCDC_DISP ))@@ -231,6 +245,20 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c, !(status & ATMEL_HLCDC_DISP))cpu_relax (); +if (crtc->dc->desc->is_xlcdc) { +regmap_write (regmap,ATMEL_HLCDC_EN ,ATMEL_XLCDC_CM ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + status &ATMEL_XLCDC_CM ,10 , +0 )) +cpu_relax (); + +regmap_write (regmap,ATMEL_HLCDC_EN ,ATMEL_XLCDC_SD ); +if (!regmap_read_poll_timeout (regmap,ATMEL_HLCDC_SR , status, + !(status &ATMEL_XLCDC_SD ),10 , +0 )) +cpu_relax (); + } +pm_runtime_put_sync (dev->dev); }drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +7
-0@@ -330,11 +330,59 @@ static void atmel_hlcdc_plane_setup_scaler(struct atmel_hlcdc_plane *plane, yfactor)); } +static void atmel_xlcdc_plane_setup_scaler (struct atmel_hlcdc_plane *plane, +struct atmel_hlcdc_plane_state *state) +{ +const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; +u32 xfactor, yfactor; + +if (!desc->layout.scaler_config)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c static void atmel_hlcdc_plane_setup_scaler(struct atmel_hlcdc_plane *plane, · line 349
Quoted 10 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +10
-0+return ; + +if (state->crtc_w == state->src_w && state->crtc_h == state->src_h) { +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.scaler_config,0 ); +return ; + } + +/* xfactor = round[(2^20 * XMEMSIZE)/XSIZE)] */ + xfactor = (1048576 * state->src_w) / state->crtc_w;
Use the left shift operator to represent 2^20. The comment says we need to round off the result of this math operation but the actual code doesn't implement this.Look for kernel macro's that does this.Shouldn't the variables xfactor & yfactor below be declared as u64 ?
Quoted 329 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +220
-35+ +/* yfactor = round[(2^20 * YMEMSIZE)/YSIZE)] */ + yfactor = (1048576 * state->src_h) / state->crtc_h; + +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config, +ATMEL_XLCDC_LAYER_VSCALER_LUMA_ENABLE | +ATMEL_XLCDC_LAYER_VSCALER_CHROMA_ENABLE | +ATMEL_XLCDC_LAYER_HSCALER_LUMA_ENABLE | +ATMEL_XLCDC_LAYER_HSCALER_CHROMA_ENABLE ); + +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config +1 , + yfactor); +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config +3 , + xfactor); + +/* As per YCbCr window resampling configuration */ +if (state->base.fb->format->format ==DRM_FORMAT_YUV420 ) { +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config +2 , + yfactor /2 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config +4 , + xfactor /2 ); + }else { +/* As per ARGB window resampling configuration */ +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config +2 , + yfactor); +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.scaler_config +4 , + xfactor); + } +} +static void atmel_hlcdc_plane_update_pos_and_size (struct atmel_hlcdc_plane *plane,struct atmel_hlcdc_plane_state *state) {const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; +struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private;if (desc->layout.size) atmel_hlcdc_layer_write_cfg(&plane->layer, desc->layout.size,@@ -352,7 +400,10 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane,ATMEL_HLCDC_LAYER_POS (state->crtc_x, state->crtc_y)); -atmel_hlcdc_plane_setup_scaler (plane, state); +if (dc->desc->is_xlcdc) +atmel_xlcdc_plane_setup_scaler (plane, state); +else +atmel_hlcdc_plane_setup_scaler (plane, state); } static void@@ -393,6 +444,40 @@ atmel_hlcdc_plane_update_general_settings(struct atmel_hlcdc_plane *plane, cfg); } +static void +atmel_xlcdc_plane_update_general_settings (struct atmel_hlcdc_plane *plane, +struct atmel_hlcdc_plane_state *state) +{ +unsigned int cfg; +const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; +const struct drm_format_info *format = state->base.fb->format; + +atmel_hlcdc_layer_write_cfg (&plane->layer,ATMEL_XLCDC_LAYER_DMA_CFG , +ATMEL_HLCDC_LAYER_DMA_BLEN_INCR16 | state->ahb_id); + + cfg =ATMEL_XLCDC_LAYER_DMA |ATMEL_XLCDC_LAYER_REP ; + +if (plane->base.type !=DRM_PLANE_TYPE_PRIMARY ) { +/* +* Alpha Blending bits specific to SAM9X7 SoC +*/ + cfg |=ATMEL_XLCDC_LAYER_SFACTC_A0_MULT_AS | +ATMEL_XLCDC_LAYER_SFACTA_ONE | +ATMEL_XLCDC_LAYER_DFACTC_M_A0_MULT_AS | +ATMEL_XLCDC_LAYER_DFACTA_ONE ; +if (format->has_alpha) + cfg |=ATMEL_XLCDC_LAYER_A0 (0xff ); +else + cfg |=ATMEL_XLCDC_LAYER_A0 (state->base.alpha); + } + +if (state->disc_h && state->disc_w) + cfg |=ATMEL_XLCDC_LAYER_DISCEN ; + +atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.general_config, + cfg); +} +static void atmel_hlcdc_plane_update_format (struct atmel_hlcdc_plane *plane,struct atmel_hlcdc_plane_state *state) {@@ -437,36 +522,55 @@ static void atmel_hlcdc_plane_update_clut(struct atmel_hlcdc_plane *plane, } } +static void update_hlcdc_buffers (struct atmel_hlcdc_plane *plane, +struct atmel_hlcdc_plane_state *state,u32 sr,int i) +{ +atmel_hlcdc_layer_write_reg (&plane->layer, +ATMEL_HLCDC_LAYER_PLANE_HEAD (i), + state->dscrs[i]->self); + +if (!(sr &ATMEL_HLCDC_LAYER_EN )) { +atmel_hlcdc_layer_write_reg (&plane->layer, +ATMEL_HLCDC_LAYER_PLANE_ADDR (i), + state->dscrs[i]->addr); +atmel_hlcdc_layer_write_reg (&plane->layer, +ATMEL_HLCDC_LAYER_PLANE_CTRL (i), + state->dscrs[i]->ctrl); +atmel_hlcdc_layer_write_reg (&plane->layer, +ATMEL_HLCDC_LAYER_PLANE_NEXT (i), + state->dscrs[i]->self); + } +} + +static void update_xlcdc_buffers (struct atmel_hlcdc_plane *plane, +struct atmel_hlcdc_plane_state *state,int i) +{ +atmel_hlcdc_layer_write_reg (&plane->layer, +ATMEL_XLCDC_LAYER_PLANE_ADDR (i), + state->dscrs[i]->addr); +} +static void atmel_hlcdc_plane_update_buffers (struct atmel_hlcdc_plane *plane, -struct atmel_hlcdc_plane_state *state) +struct atmel_hlcdc_plane_state *state) {const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; +struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private;struct drm_framebuffer *fb = state->base.fb;u32 sr;int i; - sr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_CHSR ); +if (!dc->desc->is_xlcdc) + sr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_CHSR );for (i =0 ; i < state->nplanes; i++) {struct drm_gem_dma_object *gem =drm_fb_dma_get_gem_obj (fb, i); state->dscrs[i]->addr = gem->dma_addr + state->offsets[i]; -atmel_hlcdc_layer_write_reg (&plane->layer, -ATMEL_HLCDC_LAYER_PLANE_HEAD (i), - state->dscrs[i]->self); - -if (!(sr &ATMEL_HLCDC_LAYER_EN )) { -atmel_hlcdc_layer_write_reg (&plane->layer, -ATMEL_HLCDC_LAYER_PLANE_ADDR (i), - state->dscrs[i]->addr); -atmel_hlcdc_layer_write_reg (&plane->layer, -ATMEL_HLCDC_LAYER_PLANE_CTRL (i), - state->dscrs[i]->ctrl); -atmel_hlcdc_layer_write_reg (&plane->layer, -ATMEL_HLCDC_LAYER_PLANE_NEXT (i), - state->dscrs[i]->self); - } +if (dc->desc->is_xlcdc) +update_xlcdc_buffers (plane, state, i); +else +update_hlcdc_buffers (plane, state, sr, i);if (desc->layout.xstride[i]) atmel_hlcdc_layer_write_cfg(&plane->layer,@@ -712,11 +816,8 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p,return 0 ; } -static void atmel_hlcdc_plane_atomic_disable (struct drm_plane *p, -struct drm_atomic_state *state) +static void hlcdc_atomic_disable (struct atmel_hlcdc_plane *plane) { -struct atmel_hlcdc_plane *plane =drm_plane_to_atmel_hlcdc_plane (p); -/* Disable interrupts */ atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_HLCDC_LAYER_IDR ,0xffffffff );@@ -731,6 +832,72 @@ static void atmel_hlcdc_plane_atomic_disable(struct drm_plane *p,atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_ISR ); } +static void xlcdc_atomic_disable (struct atmel_hlcdc_plane *plane) +{ +/* Disable interrupts */ +atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_XLCDC_LAYER_IDR , +0xffffffff ); + +/* Disable the layer */ +atmel_hlcdc_layer_write_reg (&plane->layer, +ATMEL_XLCDC_LAYER_ENR ,0 ); + +/* Clear all pending interrupts */ +atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_XLCDC_LAYER_ISR ); +} + +static void atmel_hlcdc_plane_atomic_disable (struct drm_plane *p, +struct drm_atomic_state *state) +{ +struct atmel_hlcdc_plane *plane =drm_plane_to_atmel_hlcdc_plane (p); +struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private; + +if (dc->desc->is_xlcdc) +xlcdc_atomic_disable (plane); +else +hlcdc_atomic_disable (plane); +} + +static void hlcdc_atomic_update (struct atmel_hlcdc_plane *plane) +{ +u32 sr; + +/* Enable the overrun interrupts. */ +atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_HLCDC_LAYER_IER , +ATMEL_HLCDC_LAYER_OVR_IRQ (0 ) | +ATMEL_HLCDC_LAYER_OVR_IRQ (1 ) | +ATMEL_HLCDC_LAYER_OVR_IRQ (2 )); + +/* Apply the new config at the next SOF event. */ + sr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_CHSR ); +atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_HLCDC_LAYER_CHER , +ATMEL_HLCDC_LAYER_UPDATE | + (sr &ATMEL_HLCDC_LAYER_EN ? +ATMEL_HLCDC_LAYER_A2Q :ATMEL_HLCDC_LAYER_EN )); +} + +static void xlcdc_atomic_update (struct atmel_hlcdc_plane *plane, +struct atmel_hlcdc_dc *dc) +{ +/* Enable the overrun interrupts. */ +atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_XLCDC_LAYER_IER , +ATMEL_XLCDC_LAYER_OVR_IRQ (0 ) | +ATMEL_XLCDC_LAYER_OVR_IRQ (1 ) | +ATMEL_XLCDC_LAYER_OVR_IRQ (2 )); + +atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_XLCDC_LAYER_ENR , +ATMEL_XLCDC_LAYER_EN ); + +/* +* Updating XLCDC_xxxCFGx, XLCDC_xxxFBA and XLCDC_xxxEN, +* (where xxx indicates each layer) requires writing one to the +* Update Attribute field for each layer in LCDC_ATTRE register for SAM9X7. +*/ +regmap_write (dc->hlcdc->regmap,ATMEL_XLCDC_ATTRE ,ATMEL_XLCDC_BASE_UPDATE | +ATMEL_XLCDC_OVR1_UPDATE |ATMEL_XLCDC_OVR3_UPDATE | +ATMEL_XLCDC_HEO_UPDATE ); +} +static void atmel_hlcdc_plane_atomic_update (struct drm_plane *p,struct drm_atomic_state *state) {@@ -739,7 +906,7 @@ static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p,struct atmel_hlcdc_plane *plane =drm_plane_to_atmel_hlcdc_plane (p);struct atmel_hlcdc_plane_state *hstate =drm_plane_state_to_atmel_hlcdc_plane_state (new_s); -u32 sr; +struct atmel_hlcdc_dc *dc = p->dev->dev_private;if (!new_s->crtc || !new_s->fb)return ;@@ -750,29 +917,73 @@ static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p, }atmel_hlcdc_plane_update_pos_and_size (plane, hstate); -atmel_hlcdc_plane_update_general_settings (plane, hstate); +if (dc->desc->is_xlcdc) +atmel_xlcdc_plane_update_general_settings (plane, hstate); +else +atmel_hlcdc_plane_update_general_settings (plane, hstate);atmel_hlcdc_plane_update_format (plane, hstate);atmel_hlcdc_plane_update_clut (plane, hstate);atmel_hlcdc_plane_update_buffers (plane, hstate);atmel_hlcdc_plane_update_disc_area (plane, hstate); -/* Enable the overrun interrupts. */ -atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_HLCDC_LAYER_IER , -ATMEL_HLCDC_LAYER_OVR_IRQ (0 ) | -ATMEL_HLCDC_LAYER_OVR_IRQ (1 ) | -ATMEL_HLCDC_LAYER_OVR_IRQ (2 )); +if (dc->desc->is_xlcdc) +xlcdc_atomic_update (plane, dc); +else +hlcdc_atomic_update (plane); +} -/* Apply the new config at the next SOF event. */ - sr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_CHSR ); -atmel_hlcdc_layer_write_reg (&plane->layer,ATMEL_HLCDC_LAYER_CHER , -ATMEL_HLCDC_LAYER_UPDATE | - (sr &ATMEL_HLCDC_LAYER_EN ? -ATMEL_HLCDC_LAYER_A2Q :ATMEL_HLCDC_LAYER_EN )); +static void hlcdc_csc_init (struct atmel_hlcdc_plane *plane, +const struct atmel_hlcdc_layer_desc *desc) +{ +/* +* TODO: declare a "yuv-to-rgb-conv-factors" property to let +* userspace modify these factors (using a BLOB property ?). +*/ +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc, +0x4c900091 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +1 , +0x7a5f5090 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +2 , +0x40040890 ); +} + +static void xlcdc_csc_init (struct atmel_hlcdc_plane *plane, +const struct atmel_hlcdc_layer_desc *desc) +{ +/* +* yuv-to-rgb-conv-factors are now defined from LCDC_HEOCFG16 to +* LCDC_HEOCFG21 registers in SAM9X7. +*/ +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc, +0x00000488 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +1 , +0x00000648 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +2 , +0x1EA00480 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +3 , +0x00001D28 ); + atmel_hlcdc_layer_write_cfg(&plane->layer,
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c static void atmel_hlcdc_plane_atomic_update(struct drm_plane *p, · line 982
Quoted 10 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +8
-0+ desc->layout.csc +4 , + 0x08100480); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +5 , +0x00000000 ); +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.csc +6 , +0x00000007 ); }
Both the above functions can be made more readable/easier to maintain by having the configs in an array and just loop through them.
Quoted 16 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +1
-5static int atmel_hlcdc_plane_init_properties (struct atmel_hlcdc_plane *plane) {const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; +struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private;if (desc->type ==ATMEL_HLCDC_OVERLAY_LAYER || desc->type ==ATMEL_HLCDC_CURSOR_LAYER ) {@@ -796,31 +1007,19 @@ static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane)return ret; } -if (desc->layout.csc) { -/* -* TODO: decare a "yuv-to-rgb-conv-factors" property to let -* userspace modify these factors (using a BLOB property ?). -*/
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c static int atmel_hlcdc_plane_init_properties(struct atmel_hlcdc_plane *plane) · line 813
Quoted 10 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +0
-10-atmel_hlcdc_layer_write_cfg (&plane->layer, - desc->layout.csc, -0x4c900091 ); -atmel_hlcdc_layer_write_cfg (&plane->layer, - desc->layout.csc +1 , -0x7a5f5090 ); -atmel_hlcdc_layer_write_cfg (&plane->layer, - desc->layout.csc +2 , -0x40040890 ); - }
Same as above.
Quoted 30 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +13
-5+if (dc->desc->is_xlcdc && desc->layout.csc) +xlcdc_csc_init (plane, desc); +else +if (desc->layout.csc) +hlcdc_csc_init (plane, desc);return 0 ; } -void atmel_hlcdc_plane_irq (struct atmel_hlcdc_plane *plane) +void hlcdc_irq_dbg (struct atmel_hlcdc_plane *plane, +const struct atmel_hlcdc_layer_desc *desc) { -const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; -u32 isr; - - isr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_ISR ); +u32 isr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_HLCDC_LAYER_ISR );/* * There's not much we can do in case of overrun except informing @@ -834,6 +1033,34 @@ void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane) desc->name); } +void xlcdc_irq_dbg (struct atmel_hlcdc_plane *plane, +const struct atmel_hlcdc_layer_desc *desc) +{ +u32 isr =atmel_hlcdc_layer_read_reg (&plane->layer,ATMEL_XLCDC_LAYER_ISR ); +
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane) · line 1050
Quoted 10 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +10
-0+/* +* There's not much we can do in case of overrun except informing +* the user. However, we are in interrupt context here, hence the +* use of dev_dbg(). +*/ +if (isr & + (ATMEL_XLCDC_LAYER_OVR_IRQ (0 ) |ATMEL_XLCDC_LAYER_OVR_IRQ (1 ) | +ATMEL_XLCDC_LAYER_OVR_IRQ (2 ))) +dev_dbg (plane->base.dev->dev,"overrun on plane %s\n" , + desc->name);
use pr_warn() instead.
Quoted 6 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +6
-0+} + +void atmel_hlcdc_plane_irq (struct atmel_hlcdc_plane *plane) +{ +const struct atmel_hlcdc_layer_desc *desc = plane->layer.desc; +struct atmel_hlcdc_dc *dc = plane->base.dev->dev_private;
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c void atmel_hlcdc_plane_irq(struct atmel_hlcdc_plane *plane) · line 1066
Quoted 10 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +7
-0+ +if (dc->desc->is_xlcdc) +xlcdc_irq_dbg (plane, desc); +else +hlcdc_irq_dbg (plane, desc); +} +static const struct drm_plane_helper_funcs atmel_hlcdc_layer_plane_helper_funcs = { .atomic_check = atmel_hlcdc_plane_atomic_check, .atomic_update = atmel_hlcdc_plane_atomic_update,
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Manikandan Muralidharan
maintainerPATCH v2 7/9 drm: atmel-hlcdc: add DPI mode support for XLCDC
In reply to Manikandan MuralidharanAdd support for Display Pixel Interface (DPI) Compatible Mode support in atmel-hlcdc driver for XLCDC IP along with legacy pixel mapping.DPI mode BIT is configured in LCDC_CFG5 register.
--- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +19 -3
@@ -30,10 +30,12 @@* * @base: base CRTC state * @output_mode: RGBXXX output mode +* @dpi: output DPI mode */ struct atmel_hlcdc_crtc_state {struct drm_crtc_state base;unsigned int output_mode; +bool dpi; }; static inline struct atmel_hlcdc_crtc_state *
@@ -138,6 +140,8 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) state =drm_crtc_state_to_atmel_hlcdc_crtc_state (c->state); cfg = state->output_mode <<8 ; +if (crtc->dc->desc->is_xlcdc) + cfg |= state->dpi <<11 ;if (!crtc->dc->desc->is_xlcdc && (adj->flags &DRM_MODE_FLAG_NVSYNC )) cfg |=ATMEL_HLCDC_VSPOL ;
@@ -150,7 +154,9 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c)ATMEL_HLCDC_VSPDLYS |ATMEL_HLCDC_VSPDLYE |ATMEL_HLCDC_DISPPOL |ATMEL_HLCDC_DISPDLY |ATMEL_HLCDC_VSPSU |ATMEL_HLCDC_VSPHO | -ATMEL_HLCDC_GUARDTIME_MASK |ATMEL_HLCDC_MODE_MASK , +ATMEL_HLCDC_GUARDTIME_MASK | + (crtc->dc->desc->is_xlcdc ?ATMEL_XLCDC_MODE_MASK | +ATMEL_XLCDC_DPI :ATMEL_HLCDC_MODE_MASK ), cfg);clk_disable_unprepare (crtc->dc->hlcdc->sys_clk);
@@ -348,7 +354,15 @@ static int atmel_hlcdc_crtc_select_output_mode(struct drm_crtc_state *state) hstate =drm_crtc_state_to_atmel_hlcdc_crtc_state (state); hstate->output_mode =fls (output_fmts) -1 ; - +if (crtc->dc->desc->is_xlcdc) { +/* check if MIPI DPI bit needs to be set */ +if (fls (output_fmts) >3 ) { + hstate->output_mode -=4 ; + hstate->dpi = true; + }else { + hstate->dpi = false; + } + }return 0 ; }
@@ -452,7 +466,7 @@ static struct drm_crtc_state * atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc) {struct atmel_hlcdc_crtc_state *state, *cur; - +struct atmel_hlcdc_crtc *c =drm_crtc_to_atmel_hlcdc_crtc (crtc);if (WARN_ON (!crtc->state))return NULL ;
@@ -463,6 +477,8 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc) cur =drm_crtc_state_to_atmel_hlcdc_crtc_state (crtc->state); state->output_mode = cur->output_mode; +if (c->dc->desc->is_xlcdc) + state->dpi = cur->dpi;return &state->base; }
Signature · 1 line
2.25.1
Re: [PATCH v2 7/9] drm: atmel-hlcdc: add DPI mode support for XLCDC
Quoted 29 lines · Manikandan Muralidharan
Add support for Display Pixel Interface (DPI) Compatible Mode support in atmel-hlcdc driver for XLCDC IP along with legacy pixel mapping.DPI mode BIT is configured in
LCDC_CFG5register.Signed-off-by Manikandan Muralidharan <[email protected]>[[email protected]: update DPI mode bit using is_xlcdc flag]Signed-off-by Durai Manickam KR <[email protected]>--- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +2
-0@@ -30,10 +30,12 @@* * @base: base CRTC state * @output_mode: RGBXXX output mode +* @dpi: output DPI mode */ struct atmel_hlcdc_crtc_state {struct drm_crtc_state base;unsigned int output_mode; +bool dpi; }; static inline struct atmel_hlcdc_crtc_state *
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) · line 143
Quoted 4 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +1
-0@@ -138,6 +140,8 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) state =drm_crtc_state_to_atmel_hlcdc_crtc_state (c->state); cfg = state->output_mode <<8 ; +if (crtc->dc->desc->is_xlcdc)
save the value in a local variable and use it at all places in the function.
Quoted 50 lines
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +16
-3+ cfg |= state->dpi <<11 ;if (!crtc->dc->desc->is_xlcdc && (adj->flags &DRM_MODE_FLAG_NVSYNC )) cfg |=ATMEL_HLCDC_VSPOL ;@@ -150,7 +154,9 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c)ATMEL_HLCDC_VSPDLYS |ATMEL_HLCDC_VSPDLYE |ATMEL_HLCDC_DISPPOL |ATMEL_HLCDC_DISPDLY |ATMEL_HLCDC_VSPSU |ATMEL_HLCDC_VSPHO | -ATMEL_HLCDC_GUARDTIME_MASK |ATMEL_HLCDC_MODE_MASK , +ATMEL_HLCDC_GUARDTIME_MASK | + (crtc->dc->desc->is_xlcdc ?ATMEL_XLCDC_MODE_MASK | +ATMEL_XLCDC_DPI :ATMEL_HLCDC_MODE_MASK ), cfg);clk_disable_unprepare (crtc->dc->hlcdc->sys_clk);@@ -348,7 +354,15 @@ static int atmel_hlcdc_crtc_select_output_mode(struct drm_crtc_state *state) hstate =drm_crtc_state_to_atmel_hlcdc_crtc_state (state); hstate->output_mode =fls (output_fmts) -1 ; - +if (crtc->dc->desc->is_xlcdc) { +/* check if MIPI DPI bit needs to be set */ +if (fls (output_fmts) >3 ) { + hstate->output_mode -=4 ; + hstate->dpi = true; + }else { + hstate->dpi = false; + } + }return 0 ; }@@ -452,7 +466,7 @@ static struct drm_crtc_state * atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc) {struct atmel_hlcdc_crtc_state *state, *cur; - +struct atmel_hlcdc_crtc *c =drm_crtc_to_atmel_hlcdc_crtc (crtc);if (WARN_ON (!crtc->state))return NULL ;@@ -463,6 +477,8 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc) cur =drm_crtc_state_to_atmel_hlcdc_crtc_state (crtc->state); state->output_mode = cur->output_mode; +if (c->dc->desc->is_xlcdc) + state->dpi = cur->dpi;return &state->base; }
Manikandan Muralidharan
maintainerPATCH v2 8/9 drm: atmel-hlcdc: add vertical and horizontal scaling support for XLCDC
In reply to Manikandan Muralidharanupdate the LCDC_HEOCFG30 and LCDC_HEOCFG31 registers of XLCDC IP which supports vertical and horizontal scaling with Bilinear and Bicubic co-efficients taps for Chroma and Luma componenets of the Pixel.
--- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 ++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 4 ++++ .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 20 +++++++++++++++++++ 3 files changed, 26 insertions(+)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +2 -0
@@ -536,6 +536,8 @@ static const struct atmel_hlcdc_layer_desc atmel_xlcdc_sam9x75_layers[] = { .general_config = 12, .csc = 16, .scaler_config = 23, + .vxs_config = 30, + .hxs_config = 31, }, .clut_offset = 0x1300, },
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h +4 -0
@@ -198,6 +198,8 @@* @disc_pos: discard area position register * @disc_size: discard area size register * @csc: color space conversion register +* @vxs_config: vertical scalar filter taps control register +* @hxs_config: horizontal scalar filter taps control register */ struct atmel_hlcdc_layer_cfg_layout {int xstride[ATMEL_HLCDC_LAYER_MAX_PLANES ];
@@ -217,6 +219,8 @@ struct atmel_hlcdc_layer_cfg_layout {int disc_pos;int disc_size;int csc; +int vxs_config; +int hxs_config; };/**
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +20 -0
@@ -978,6 +978,26 @@ static void xlcdc_csc_init(struct atmel_hlcdc_plane *plane,atmel_hlcdc_layer_write_cfg (&plane->layer, desc->layout.csc +6 ,0x00000007 ); + +if (desc->layout.vxs_config && desc->layout.hxs_config) { +/* +* Updating vxs.config and hxs.config fixes the +* Green Color Issue in SAM9X7 EGT Video Player App +*/ +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.vxs_config, +ATMEL_XLCDC_LAYER_VXSYCFG_ONE | +ATMEL_XLCDC_LAYER_VXSYTAP2_ENABLE | +ATMEL_XLCDC_LAYER_VXSCCFG_ONE | +ATMEL_XLCDC_LAYER_VXSCTAP2_ENABLE ); + +atmel_hlcdc_layer_write_cfg (&plane->layer, + desc->layout.hxs_config, +ATMEL_XLCDC_LAYER_HXSYCFG_ONE | +ATMEL_XLCDC_LAYER_HXSYTAP2_ENABLE | +ATMEL_XLCDC_LAYER_HXSCCFG_ONE | +ATMEL_XLCDC_LAYER_HXSCTAP2_ENABLE ); + } }static int atmel_hlcdc_plane_init_properties (struct atmel_hlcdc_plane *plane)
Signature · 1 line
2.25.1
Manikandan Muralidharan
maintainerPATCH v2 9/9 drm: atmel-hlcdc: add support for DSI output formats
In reply to Manikandan MuralidharanAdd support for the following DPI mode if the encoder type is DSI as per the XLCDC IP datasheet:
- 16BPPCFG1
- 16BPPCFG2
- 16BPPCFG3
- 18BPPCFG1
- 18BPPCFG2
- 24BPP
--- .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 117 +++++++++++++----- 1 file changed, 86 insertions(+), 31 deletions(-)
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +86 -31
@@ -269,11 +269,18 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c, } -#define ATMEL_HLCDC_RGB444_OUTPUT BIT(0) -#define ATMEL_HLCDC_RGB565_OUTPUT BIT(1) -#define ATMEL_HLCDC_RGB666_OUTPUT BIT(2) -#define ATMEL_HLCDC_RGB888_OUTPUT BIT(3) -#define ATMEL_HLCDC_OUTPUT_MODE_MASK GENMASK(3, 0) +#define ATMEL_HLCDC_RGB444_OUTPUT BIT(0) +#define ATMEL_HLCDC_RGB565_OUTPUT BIT(1) +#define ATMEL_HLCDC_RGB666_OUTPUT BIT(2) +#define ATMEL_HLCDC_RGB888_OUTPUT BIT(3) +#define ATMEL_HLCDC_DPI_RGB565C1_OUTPUT BIT(4) +#define ATMEL_HLCDC_DPI_RGB565C2_OUTPUT BIT(5) +#define ATMEL_HLCDC_DPI_RGB565C3_OUTPUT BIT(6) +#define ATMEL_HLCDC_DPI_RGB666C1_OUTPUT BIT(7) +#define ATMEL_HLCDC_DPI_RGB666C2_OUTPUT BIT(8) +#define ATMEL_HLCDC_DPI_RGB888_OUTPUT BIT(9) +#define ATMEL_HLCDC_OUTPUT_MODE_MASK GENMASK(3, 0) +#define ATMEL_XLCDC_OUTPUT_MODE_MASK GENMASK(9, 0)static int atmel_hlcdc_connector_output_mode (struct drm_connector_state *state) {
@@ -287,37 +294,83 @@ static int atmel_hlcdc_connector_output_mode(struct drm_connector_state *state)if (!encoder) encoder = connector->encoder; -switch (atmel_hlcdc_encoder_get_bus_fmt (encoder)) { -case 0 : -break ; -case MEDIA_BUS_FMT_RGB444_1X12 : -return ATMEL_HLCDC_RGB444_OUTPUT ; -case MEDIA_BUS_FMT_RGB565_1X16 : -return ATMEL_HLCDC_RGB565_OUTPUT ; -case MEDIA_BUS_FMT_RGB666_1X18 : -return ATMEL_HLCDC_RGB666_OUTPUT ; -case MEDIA_BUS_FMT_RGB888_1X24 : -return ATMEL_HLCDC_RGB888_OUTPUT ; -default : -return -EINVAL ; - } - -for (j =0 ; j < info->num_bus_formats; j++) { -switch (info->bus_formats[j]) { -case MEDIA_BUS_FMT_RGB444_1X12 : - supported_fmts |=ATMEL_HLCDC_RGB444_OUTPUT ; +if (encoder->encoder_type ==DRM_MODE_ENCODER_DSI ) { +/* +* atmel-hlcdc to support DSI formats with DSI video pipeline +* when DRM_MODE_ENCODER_DSI type is set by +* connector driver component. +*/ +switch (atmel_hlcdc_encoder_get_bus_fmt (encoder)) { +case 0 :break ;case MEDIA_BUS_FMT_RGB565_1X16 : - supported_fmts |=ATMEL_HLCDC_RGB565_OUTPUT ; -break ; +return ATMEL_HLCDC_DPI_RGB565C1_OUTPUT ;case MEDIA_BUS_FMT_RGB666_1X18 : - supported_fmts |=ATMEL_HLCDC_RGB666_OUTPUT ; -break ; +return ATMEL_HLCDC_DPI_RGB666C1_OUTPUT ; +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : +return ATMEL_HLCDC_DPI_RGB666C2_OUTPUT ;case MEDIA_BUS_FMT_RGB888_1X24 : - supported_fmts |=ATMEL_HLCDC_RGB888_OUTPUT ; -break ; +return ATMEL_HLCDC_DPI_RGB888_OUTPUT ;default : +return -EINVAL ; + } + +for (j =0 ; j < info->num_bus_formats; j++) { +switch (info->bus_formats[j]) { +case MEDIA_BUS_FMT_RGB565_1X16 : + supported_fmts |= +ATMEL_HLCDC_DPI_RGB565C1_OUTPUT ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : + supported_fmts |= +ATMEL_HLCDC_DPI_RGB666C1_OUTPUT ; +break ; +case MEDIA_BUS_FMT_RGB666_1X24_CPADHI : + supported_fmts |= +ATMEL_HLCDC_DPI_RGB666C2_OUTPUT ; +break ; +case MEDIA_BUS_FMT_RGB888_1X24 : + supported_fmts |= +ATMEL_HLCDC_DPI_RGB888_OUTPUT ; +break ; +default : +break ; + } + } + + }else { +switch (atmel_hlcdc_encoder_get_bus_fmt (encoder)) { +case 0 :break ; +case MEDIA_BUS_FMT_RGB444_1X12 : +return ATMEL_HLCDC_RGB444_OUTPUT ; +case MEDIA_BUS_FMT_RGB565_1X16 : +return ATMEL_HLCDC_RGB565_OUTPUT ; +case MEDIA_BUS_FMT_RGB666_1X18 : +return ATMEL_HLCDC_RGB666_OUTPUT ; +case MEDIA_BUS_FMT_RGB888_1X24 : +return ATMEL_HLCDC_RGB888_OUTPUT ; +default : +return -EINVAL ; + } + +for (j =0 ; j < info->num_bus_formats; j++) { +switch (info->bus_formats[j]) { +case MEDIA_BUS_FMT_RGB444_1X12 : + supported_fmts |=ATMEL_HLCDC_RGB444_OUTPUT ; +break ; +case MEDIA_BUS_FMT_RGB565_1X16 : + supported_fmts |=ATMEL_HLCDC_RGB565_OUTPUT ; +break ; +case MEDIA_BUS_FMT_RGB666_1X18 : + supported_fmts |=ATMEL_HLCDC_RGB666_OUTPUT ; +break ; +case MEDIA_BUS_FMT_RGB888_1X24 : + supported_fmts |=ATMEL_HLCDC_RGB888_OUTPUT ; +break ; +default : +break ; + } } }
@@ -326,7 +379,7 @@ static int atmel_hlcdc_connector_output_mode(struct drm_connector_state *state)static int atmel_hlcdc_crtc_select_output_mode (struct drm_crtc_state *state) { -unsigned int output_fmts =ATMEL_HLCDC_OUTPUT_MODE_MASK ; +unsigned int output_fmts;struct atmel_hlcdc_crtc_state *hstate;struct drm_connector_state *cstate;struct drm_connector *connector;
@@ -334,6 +387,8 @@ static int atmel_hlcdc_crtc_select_output_mode(struct drm_crtc_state *state)int i; crtc =drm_crtc_to_atmel_hlcdc_crtc (state->crtc); + output_fmts = crtc->dc->desc->is_xlcdc ?ATMEL_XLCDC_OUTPUT_MODE_MASK : +ATMEL_HLCDC_OUTPUT_MODE_MASK ;for_each_new_connector_in_state (state->state, connector, cstate, i) {unsigned int supported_fmts =0 ;
Signature · 1 line
2.25.1
[email protected]
maintainerQuoted 8 lines · Manikandan Muralidharan
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
This patch series aims to add support for XLCDC IP of sam9x7 SoC family to the DRM subsystem.XLCDC IP has additional registers and new configuration bits compared to the existing register set of HLCDC IP. The new compatible string "microchip,sam9x75-xlcdc" is defined for sam9x75 variant of the sam9x7 SoC family.The
is_xlcdcflag under driver data helps to differentiate the XLCDC and existing HLCDC code within the same driver.
Hi All
A Gentle reminder to review this patch series 2/9 to 9/9.
Quoted 36 lines
changes in v2:
* Change the driver compatible name from "microchip,sam9x7-xlcdc" to "microchip,sam9x75-xlcdc".
* Moveis_xlcdcflag to driver data.
* Remove unsed Macro definitions.
* Add co-developed-bys tags
* Replaceregmap_read()withregmap_read_poll_timeout()call
* Split code into two helpers for code readablitity.Durai Manickam KR (1):
drm: atmel-hlcdc: Define SAM9X7 SoC XLCDC specific registersManikandan Muralidharan (8):
dt-bindings: mfd: Add bindings for SAM9X75 LCD controller
mfd: atmel-hlcdc: Add compatible for sam9x75 XLCD controller
drm: atmel-hlcdc: add flag to differentiate XLCDC and HLCDC IP
drm: atmel-hlcdc: add LCD controller layer definition for sam9x75
drm:atmel_hlcdc: Add support for XLCDC in atmel LCD driver
drm: atmel-hlcdc: add DPI mode support for XLCDC
drm: atmel-hlcdc: add vertical and horizontal scaling support for
XLCDC
drm: atmel-hlcdc: add support for DSI output formats.../devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 171 +++++++-- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 99 +++++ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 48 +++ .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 357 +++++++++++++++--- drivers/mfd/atmel-hlcdc.c | 1 + include/linux/mfd/atmel-hlcdc.h | 10 + 7 files changed, 596 insertions(+), 91 deletions(-)--
2.25.1
Signature · 2 lines
Thanks and Regards, Manikandan M.