To avoid duplicate logic for the same
Signed-off-by: Satendra Singh Thakur satendra.t@samsung.com Cc: Madhur Verma madhur.verma@samsung.com Cc: Hemanshu Srivastava hemanshu.s@samsung.com --- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 60 ++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 33 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 1b278a2..6becdaf 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -25,6 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/of_graph.h> #include <linux/math64.h> +#include <video/videomode.h>
#include "tilcdc_drv.h" #include "tilcdc_regs.h" @@ -284,9 +285,10 @@ static void tilcdc_crtc_set_mode(struct drm_crtc *crtc) struct drm_device *dev = crtc->dev; struct tilcdc_drm_private *priv = dev->dev_private; const struct tilcdc_panel_info *info = tilcdc_crtc->info; - uint32_t reg, hbp, hfp, hsw, vbp, vfp, vsw; + uint32_t reg; struct drm_display_mode *mode = &crtc->state->adjusted_mode; struct drm_framebuffer *fb = crtc->primary->state->fb; + struct videomode vm;
if (WARN_ON(!info)) return; @@ -320,15 +322,12 @@ static void tilcdc_crtc_set_mode(struct drm_crtc *crtc) tilcdc_write(dev, LCDC_DMA_CTRL_REG, reg);
/* Configure timings: */ - hbp = mode->htotal - mode->hsync_end; - hfp = mode->hsync_start - mode->hdisplay; - hsw = mode->hsync_end - mode->hsync_start; - vbp = mode->vtotal - mode->vsync_end; - vfp = mode->vsync_start - mode->vdisplay; - vsw = mode->vsync_end - mode->vsync_start; + drm_display_mode_to_videomode(mode, &vm);
- DBG("%dx%d, hbp=%u, hfp=%u, hsw=%u, vbp=%u, vfp=%u, vsw=%u", - mode->hdisplay, mode->vdisplay, hbp, hfp, hsw, vbp, vfp, vsw); + DBG("%dx%d, vm.hback_porch=%u, vm.hfront_porch=%u, vm.hsync_len=%u," + " vm.vback_porch=%u, vm.vfront_porch=%u, vm.vsync_len=%u", + vm.hactive, vm.vactive, vm.hback_porch, vm.hfront_porch, + vm.hsync_len, vm.vback_porch, vm.vfront_porch, vm.vsync_len);
/* Set AC Bias Period and Number of Transitions per Interrupt: */ reg = tilcdc_read(dev, LCDC_RASTER_TIMING_2_REG) & ~0x000fff00; @@ -336,30 +335,30 @@ static void tilcdc_crtc_set_mode(struct drm_crtc *crtc) LCDC_AC_BIAS_TRANSITIONS_PER_INT(info->ac_bias_intrpt);
/* - * subtract one from hfp, hbp, hsw because the hardware uses - * a value of 0 as 1 + * subtract one from vm.hfront_porch, vm.hback_porch, vm.hsync_len + * because the hardware uses a value of 0 as 1 */ if (priv->rev == 2) { /* clear bits we're going to set */ reg &= ~0x78000033; - reg |= ((hfp-1) & 0x300) >> 8; - reg |= ((hbp-1) & 0x300) >> 4; - reg |= ((hsw-1) & 0x3c0) << 21; + reg |= ((vm.hfront_porch-1) & 0x300) >> 8; + reg |= ((vm.hback_porch-1) & 0x300) >> 4; + reg |= ((vm.hsync_len-1) & 0x3c0) << 21; } tilcdc_write(dev, LCDC_RASTER_TIMING_2_REG, reg);
reg = (((mode->hdisplay >> 4) - 1) << 4) | - (((hbp-1) & 0xff) << 24) | - (((hfp-1) & 0xff) << 16) | - (((hsw-1) & 0x3f) << 10); + (((vm.hback_porch-1) & 0xff) << 24) | + (((vm.hfront_porch-1) & 0xff) << 16) | + (((vm.hsync_len-1) & 0x3f) << 10); if (priv->rev == 2) reg |= (((mode->hdisplay >> 4) - 1) & 0x40) >> 3; tilcdc_write(dev, LCDC_RASTER_TIMING_0_REG, reg);
reg = ((mode->vdisplay - 1) & 0x3ff) | - ((vbp & 0xff) << 24) | - ((vfp & 0xff) << 16) | - (((vsw-1) & 0x3f) << 10); + ((vm.vback_porch & 0xff) << 24) | + ((vm.vfront_porch & 0xff) << 16) | + (((vm.vsync_len-1) & 0x3f) << 10); tilcdc_write(dev, LCDC_RASTER_TIMING_1_REG, reg);
/* @@ -753,7 +752,7 @@ int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode) { struct tilcdc_drm_private *priv = crtc->dev->dev_private; unsigned int bandwidth; - uint32_t hbp, hfp, hsw, vbp, vfp, vsw; + struct videomode vm;
/* * check to see if the width is within the range that @@ -773,39 +772,34 @@ int tilcdc_crtc_mode_valid(struct drm_crtc *crtc, struct drm_display_mode *mode) mode->hdisplay, mode->vdisplay, drm_mode_vrefresh(mode), mode->clock);
- hbp = mode->htotal - mode->hsync_end; - hfp = mode->hsync_start - mode->hdisplay; - hsw = mode->hsync_end - mode->hsync_start; - vbp = mode->vtotal - mode->vsync_end; - vfp = mode->vsync_start - mode->vdisplay; - vsw = mode->vsync_end - mode->vsync_start; + drm_display_mode_to_videomode(mode, &vm);
- if ((hbp-1) & ~0x3ff) { + if ((vm.hback_porch-1) & ~0x3ff) { DBG("Pruning mode: Horizontal Back Porch out of range"); return MODE_HBLANK_WIDE; }
- if ((hfp-1) & ~0x3ff) { + if ((vm.hfront_porch-1) & ~0x3ff) { DBG("Pruning mode: Horizontal Front Porch out of range"); return MODE_HBLANK_WIDE; }
- if ((hsw-1) & ~0x3ff) { + if ((vm.hsync_len-1) & ~0x3ff) { DBG("Pruning mode: Horizontal Sync Width out of range"); return MODE_HSYNC_WIDE; }
- if (vbp & ~0xff) { + if (vm.vback_porch & ~0xff) { DBG("Pruning mode: Vertical Back Porch out of range"); return MODE_VBLANK_WIDE; }
- if (vfp & ~0xff) { + if (vm.vfront_porch & ~0xff) { DBG("Pruning mode: Vertical Front Porch out of range"); return MODE_VBLANK_WIDE; }
- if ((vsw-1) & ~0x3f) { + if ((vm.vsync_len-1) & ~0x3f) { DBG("Pruning mode: Vertical Sync Width out of range"); return MODE_VSYNC_WIDE; }