drm/tilcdc: Couple of minor feature improvements
Subsystems (3)
v3 cover drm/tilcdc: Couple of minor feature improvements
Since v2:
- "drm/tilcdc: Remove tilcdc_crtc_max_width(), use private data"
- Add reviewed-by tag
- fix:
-:106: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #106: FILE: drivers/gpu/drm/tilcdc/tilcdc_drv.c:289:
+ if (of_property_read_u32(node, "max-pixelclock",
+ &priv->max_pixelclock))
Since first version.
- "drm/tilcdc: Do not keep vblank interrupts enabled all the time"
- Add reviewed-by tags
- "drm/tilcdc: Remove tilcdc_crtc_max_width(), use private data"
- Put TILCDC_DEFAULT_MAX_WIDTH_V1 before *_V2 and
The vblank interrupts have been always on when the display is on for a very long time, so I decided that it is about time to fix it. Then the following patch is just a cleanup.
BR,
Jyri
Jyri Sarha (2):
drm/tilcdc: Do not keep vblank interrupts enabled all the time drm/tilcdc: Remove tilcdc_crtc_max_width(), use private data
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 52 ++++++++++++++++++---------- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 38 +++++++++++--------- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 ++-- 3 files changed, 59 insertions(+), 38 deletions(-)
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/2 drm/tilcdc: Do not keep vblank interrupts enabled all the time
END_OF_FRAME interrupts have been enabled all the time since the beginning of this driver. It is about time to add this feature.
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 36 +++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +33 -3
@@ -147,12 +147,9 @@ static void tilcdc_crtc_enable_irqs(struct drm_device *dev)tilcdc_set (dev,LCDC_RASTER_CTRL_REG ,LCDC_V1_SYNC_LOST_INT_ENA |LCDC_V1_FRAME_DONE_INT_ENA |LCDC_V1_UNDERFLOW_INT_ENA ); -tilcdc_set (dev,LCDC_DMA_CTRL_REG , -LCDC_V1_END_OF_FRAME_INT_ENA ); }else {tilcdc_write (dev,LCDC_INT_ENABLE_SET_REG ,LCDC_V2_UNDERFLOW_INT_ENA | -LCDC_V2_END_OF_FRAME0_INT_ENA |LCDC_FRAME_DONE |LCDC_SYNC_LOST ); } }
@@ -678,11 +675,44 @@ static int tilcdc_crtc_atomic_check(struct drm_crtc *crtc,static int tilcdc_crtc_enable_vblank (struct drm_crtc *crtc) { +struct tilcdc_crtc *tilcdc_crtc =to_tilcdc_crtc (crtc); +struct drm_device *dev = crtc->dev; +struct tilcdc_drm_private *priv = dev->dev_private; +unsigned long flags; + +spin_lock_irqsave (&tilcdc_crtc->irq_lock, flags); + +tilcdc_clear_irqstatus (dev,LCDC_END_OF_FRAME0 ); + +if (priv->rev ==1 ) +tilcdc_set (dev,LCDC_DMA_CTRL_REG , +LCDC_V1_END_OF_FRAME_INT_ENA ); +else +tilcdc_set (dev,LCDC_INT_ENABLE_SET_REG , +LCDC_V2_END_OF_FRAME0_INT_ENA ); + +spin_unlock_irqrestore (&tilcdc_crtc->irq_lock, flags); +return 0 ; }static void tilcdc_crtc_disable_vblank (struct drm_crtc *crtc) { +struct tilcdc_crtc *tilcdc_crtc =to_tilcdc_crtc (crtc); +struct drm_device *dev = crtc->dev; +struct tilcdc_drm_private *priv = dev->dev_private; +unsigned long flags; + +spin_lock_irqsave (&tilcdc_crtc->irq_lock, flags); + +if (priv->rev ==1 ) +tilcdc_clear (dev,LCDC_DMA_CTRL_REG , +LCDC_V1_END_OF_FRAME_INT_ENA ); +else +tilcdc_clear (dev,LCDC_INT_ENABLE_SET_REG , +LCDC_V2_END_OF_FRAME0_INT_ENA ); + +spin_unlock_irqrestore (&tilcdc_crtc->irq_lock, flags); }static void tilcdc_crtc_reset (struct drm_crtc *crtc)
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/2 drm/tilcdc: Remove tilcdc_crtc_max_width(), use private data
In reply to Jyri SarhaWe already have a private data member for maximum display width so let's use it and get rid of the redundant tilcdc_crtc_max_width().
The LCDC version probing is moved to before reading the device tree properties so that the version information is available when private data maximum width is initialized, if "max-width" property is not found.
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 16 +----------- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 38 +++++++++++++++------------- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 ++--- 3 files changed, 26 insertions(+), 35 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1 -15
@@ -754,20 +754,6 @@ static const struct drm_crtc_funcs tilcdc_crtc_funcs = { .disable_vblank = tilcdc_crtc_disable_vblank, }; -int tilcdc_crtc_max_width (struct drm_crtc *crtc) -{ -struct drm_device *dev = crtc->dev; -struct tilcdc_drm_private *priv = dev->dev_private; -int max_width =0 ; - -if (priv->rev ==1 ) - max_width =1024 ; -else if (priv->rev ==2 ) - max_width =2048 ; - -return max_width; -} -static enum drm_mode_status tilcdc_crtc_mode_valid (struct drm_crtc *crtc,const struct drm_display_mode *mode)
@@ -780,7 +766,7 @@ tilcdc_crtc_mode_valid(struct drm_crtc *crtc,* check to see if the width is within the range that * the LCD Controller physically supports */ -if (mode->hdisplay >tilcdc_crtc_max_width (crtc)) +if (mode->hdisplay > priv->max_width)return MODE_VIRTUAL_X ;/* width must be multiple of 16 */
drivers/gpu/drm/tilcdc/tilcdc_drv.c +21 -17
@@ -105,7 +105,7 @@ static void modeset_init(struct drm_device *dev) dev->mode_config.min_width =0 ; dev->mode_config.min_height =0 ; - dev->mode_config.max_width =tilcdc_crtc_max_width (priv->crtc); + dev->mode_config.max_width = priv->max_width; dev->mode_config.max_height =2048 ; dev->mode_config.funcs = &mode_config_funcs; }
@@ -218,22 +218,6 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) goto init_failed; } -if (of_property_read_u32 (node,"max-bandwidth" , &priv->max_bandwidth)) - priv->max_bandwidth =TILCDC_DEFAULT_MAX_BANDWIDTH ; - -DBG ("Maximum Bandwidth Value %d" , priv->max_bandwidth); - -if (of_property_read_u32 (node,"max-width" , &priv->max_width)) - priv->max_width =TILCDC_DEFAULT_MAX_WIDTH ; - -DBG ("Maximum Horizontal Pixel Width Value %dpixels" , priv->max_width); - -if (of_property_read_u32 (node,"max-pixelclock" , - &priv->max_pixelclock)) - priv->max_pixelclock =TILCDC_DEFAULT_MAX_PIXELCLOCK ; - -DBG ("Maximum Pixel Clock Value %dKHz" , priv->max_pixelclock); -pm_runtime_enable (dev);/* Determine LCD IP Version */
@@ -287,6 +271,26 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) } } +if (of_property_read_u32 (node,"max-bandwidth" , &priv->max_bandwidth)) + priv->max_bandwidth =TILCDC_DEFAULT_MAX_BANDWIDTH ; + +DBG ("Maximum Bandwidth Value %d" , priv->max_bandwidth); + +if (of_property_read_u32 (node,"max-width" , &priv->max_width)) { +if (priv->rev ==1 ) + priv->max_width =TILCDC_DEFAULT_MAX_WIDTH_V1 ; +else + priv->max_width =TILCDC_DEFAULT_MAX_WIDTH_V2 ; + } + +DBG ("Maximum Horizontal Pixel Width Value %dpixels" , priv->max_width); + +if (of_property_read_u32 (node,"max-pixelclock" , + &priv->max_pixelclock)) + priv->max_pixelclock =TILCDC_DEFAULT_MAX_PIXELCLOCK ; + +DBG ("Maximum Pixel Clock Value %dKHz" , priv->max_pixelclock); + ret =tilcdc_crtc_create (ddev);if (ret <0 ) {dev_err (dev,"failed to create crtc\n" );
drivers/gpu/drm/tilcdc/tilcdc_drv.h +4 -3
@@ -28,8 +28,10 @@ struct drm_plane;/* Defaulting to pixel clock defined on AM335x */ #define TILCDC_DEFAULT_MAX_PIXELCLOCK 126000 -/* Defaulting to max width as defined on AM335x */ -#define TILCDC_DEFAULT_MAX_WIDTH 2048 +/* Maximum display width for LCDC V1 */ +#define TILCDC_DEFAULT_MAX_WIDTH_V1 1024 +/* ... and for LCDC V2 found on AM335x: */ +#define TILCDC_DEFAULT_MAX_WIDTH_V2 2048/* * This may need some tweaking, but want to allow at least 1280x1024@60 * with optimized DDR & EMIF settings tweaked 1920x1080@24 appears to
@@ -158,7 +160,6 @@ void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc, const struct tilcdc_panel_info *info);void tilcdc_crtc_set_simulate_vesa_sync (struct drm_crtc *crtc,bool simulate_vesa_sync); -int tilcdc_crtc_max_width (struct drm_crtc *crtc);void tilcdc_crtc_shutdown (struct drm_crtc *crtc); int tilcdc_crtc_update_fb(struct drm_crtc *crtc, struct drm_framebuffer *fb,
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 2/2] drm/tilcdc: Remove tilcdc_crtc_max_width(), use private data
Hi Jyri,
Thank you for the patch.
Quoted 10 lines · Jyri Sarha
We already have a private data member for maximum display width so let's use it and get rid of the redundant
tilcdc_crtc_max_width().The LCDC version probing is moved to before reading the device tree properties so that the version information is available when private data maximum width is initialized, if "max-width" property is not found.
Signed-off-by Jyri Sarha <[email protected]>Reviewed-by Tomi Valkeinen <[email protected]>
Quoted 128 lines
--- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 16 +----------- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 38 +++++++++++++++------------- drivers/gpu/drm/tilcdc/tilcdc_drv.h | 7 ++--- 3 files changed, 26 insertions(+), 35 deletions(-)drivers/gpu/drm/tilcdc/tilcdc_crtc.c +1
-15@@ -754,20 +754,6 @@ static const struct drm_crtc_funcs tilcdc_crtc_funcs = { .disable_vblank = tilcdc_crtc_disable_vblank, }; -int tilcdc_crtc_max_width (struct drm_crtc *crtc) -{ -struct drm_device *dev = crtc->dev; -struct tilcdc_drm_private *priv = dev->dev_private; -int max_width =0 ; - -if (priv->rev ==1 ) - max_width =1024 ; -else if (priv->rev ==2 ) - max_width =2048 ; - -return max_width; -} -static enum drm_mode_status tilcdc_crtc_mode_valid (struct drm_crtc *crtc,const struct drm_display_mode *mode)@@ -780,7 +766,7 @@ tilcdc_crtc_mode_valid(struct drm_crtc *crtc,* check to see if the width is within the range that * the LCD Controller physically supports */ -if (mode->hdisplay >tilcdc_crtc_max_width (crtc)) +if (mode->hdisplay > priv->max_width)return MODE_VIRTUAL_X ;/* width must be multiple of 16 */ drivers/gpu/drm/tilcdc/tilcdc_drv.c +21
-17@@ -105,7 +105,7 @@ static void modeset_init(struct drm_device *dev) dev->mode_config.min_width =0 ; dev->mode_config.min_height =0 ; - dev->mode_config.max_width =tilcdc_crtc_max_width (priv->crtc); + dev->mode_config.max_width = priv->max_width; dev->mode_config.max_height =2048 ; dev->mode_config.funcs = &mode_config_funcs; }@@ -218,22 +218,6 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) goto init_failed; } -if (of_property_read_u32 (node,"max-bandwidth" , &priv->max_bandwidth)) - priv->max_bandwidth =TILCDC_DEFAULT_MAX_BANDWIDTH ; - -DBG ("Maximum Bandwidth Value %d" , priv->max_bandwidth); - -if (of_property_read_u32 (node,"max-width" , &priv->max_width)) - priv->max_width =TILCDC_DEFAULT_MAX_WIDTH ; - -DBG ("Maximum Horizontal Pixel Width Value %dpixels" , priv->max_width); - -if (of_property_read_u32 (node,"max-pixelclock" , - &priv->max_pixelclock)) - priv->max_pixelclock =TILCDC_DEFAULT_MAX_PIXELCLOCK ; - -DBG ("Maximum Pixel Clock Value %dKHz" , priv->max_pixelclock); -pm_runtime_enable (dev);/* Determine LCD IP Version */ @@ -287,6 +271,26 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) } } +if (of_property_read_u32 (node,"max-bandwidth" , &priv->max_bandwidth)) + priv->max_bandwidth =TILCDC_DEFAULT_MAX_BANDWIDTH ; + +DBG ("Maximum Bandwidth Value %d" , priv->max_bandwidth); + +if (of_property_read_u32 (node,"max-width" , &priv->max_width)) { +if (priv->rev ==1 ) + priv->max_width =TILCDC_DEFAULT_MAX_WIDTH_V1 ; +else + priv->max_width =TILCDC_DEFAULT_MAX_WIDTH_V2 ; + } + +DBG ("Maximum Horizontal Pixel Width Value %dpixels" , priv->max_width); + +if (of_property_read_u32 (node,"max-pixelclock" , + &priv->max_pixelclock)) + priv->max_pixelclock =TILCDC_DEFAULT_MAX_PIXELCLOCK ; + +DBG ("Maximum Pixel Clock Value %dKHz" , priv->max_pixelclock); + ret =tilcdc_crtc_create (ddev);if (ret <0 ) {dev_err (dev,"failed to create crtc\n" );drivers/gpu/drm/tilcdc/tilcdc_drv.h +4
-3@@ -28,8 +28,10 @@ struct drm_plane;/* Defaulting to pixel clock defined on AM335x */ #define TILCDC_DEFAULT_MAX_PIXELCLOCK 126000 -/* Defaulting to max width as defined on AM335x */ -#define TILCDC_DEFAULT_MAX_WIDTH 2048 +/* Maximum display width for LCDC V1 */ +#define TILCDC_DEFAULT_MAX_WIDTH_V1 1024 +/* ... and for LCDC V2 found on AM335x: */ +#define TILCDC_DEFAULT_MAX_WIDTH_V2 2048/* * This may need some tweaking, but want to allow at least 1280x1024@60 * with optimized DDR & EMIF settings tweaked 1920x1080@24 appears to @@ -158,7 +160,6 @@ void tilcdc_crtc_set_panel_info(struct drm_crtc *crtc, const struct tilcdc_panel_info *info);void tilcdc_crtc_set_simulate_vesa_sync (struct drm_crtc *crtc,bool simulate_vesa_sync); -int tilcdc_crtc_max_width (struct drm_crtc *crtc);void tilcdc_crtc_shutdown (struct drm_crtc *crtc); int tilcdc_crtc_update_fb(struct drm_crtc *crtc, struct drm_framebuffer *fb,
Signature · 7 lines
Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel