dri-devel May 2018

dri-devel@lists.freedesktop.org

268 participants
1833 discussions

[PATCH V2 5/5] backlight: qcom-wled: Add auto string detection logic
by Kiran Gunda 03 May '18

03 May '18

The auto string detection algorithm checks if the current WLED sink configuration is valid. It tries enabling every sink and checks if the OVP fault is observed. Based on this information it detects and enables the valid sink configuration. Auto calibration will be triggered when the OVP fault interrupts are seen frequently thereby it tries to fix the sink configuration. Signed-off-by: Kiran Gunda <kgunda(a)codeaurora.org> --- drivers/video/backlight/qcom-wled.c | 302 ++++++++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index 80ae084..bacdf3f 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -33,11 +33,14 @@ #define WLED4_CTRL_REG_SC_FAULT_BIT BIT(2) #define WLED3_CTRL_REG_INT_RT_STS 0x10 +#define WLED3_CTRL_REG_OVP_FAULT_STATUS BIT(1) #define WLED3_CTRL_REG_MOD_EN 0x46 #define WLED3_CTRL_REG_MOD_EN_MASK BIT(7) #define WLED3_CTRL_REG_MOD_EN_BIT BIT(7) +#define WLED3_CTRL_REG_FEEDBACK_CONTROL 0x48 + #define WLED3_CTRL_REG_FREQ 0x4c #define WLED3_CTRL_REG_FREQ_MASK GENMASK(3, 0) @@ -152,6 +155,7 @@ struct wled_config { bool ext_gen; bool cabc; bool external_pfet; + bool auto_detection_enabled; }; struct wled { @@ -160,8 +164,10 @@ struct wled { struct regmap *regmap; struct mutex lock; /* Lock to avoid race from ISR */ ktime_t last_short_event; + ktime_t start_ovp_fault_time; u16 ctrl_addr; u16 sink_addr; + u16 auto_detection_ovp_count; u32 brightness; u32 max_brightness; u32 short_count; @@ -170,6 +176,7 @@ struct wled { int ovp_irq; bool force_mod_disable; bool ovp_irq_disabled; + bool auto_detection_done; struct wled_config cfg; struct delayed_work ovp_work; @@ -386,6 +393,292 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled) return IRQ_HANDLED; } +#define AUTO_DETECT_BRIGHTNESS 200 +static int wled_auto_string_detection(struct wled *wled) +{ + int rc = 0, i; + u32 sink_config = 0, int_sts; + u8 sink_test = 0, sink_valid = 0, val; + + if (wled->auto_detection_done) + return 0; + + /* read configured sink configuration */ + rc = regmap_read(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_CURR_SINK, &sink_config); + if (rc < 0) { + pr_err("Failed to read SINK configuration rc=%d\n", rc); + goto failed_detect; + } + + /* disable the module before starting detection */ + rc = regmap_update_bits(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, 0); + if (rc < 0) { + pr_err("Failed to disable WLED module rc=%d\n", rc); + goto failed_detect; + } + + /* set low brightness across all sinks */ + rc = wled4_set_brightness(wled, AUTO_DETECT_BRIGHTNESS); + if (rc < 0) { + pr_err("Failed to set brightness for auto detection rc=%d\n", + rc); + goto failed_detect; + } + + if (wled->cfg.cabc) { + for (i = 0; i < wled->cfg.num_strings; i++) { + rc = regmap_update_bits(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_STR_CABC(i), + WLED4_SINK_REG_STR_CABC_MASK, + 0); + if (rc < 0) + goto failed_detect; + } + } + + /* disable all sinks */ + rc = regmap_write(wled->regmap, + wled->sink_addr + WLED4_SINK_REG_CURR_SINK, 0); + if (rc < 0) { + pr_err("Failed to disable all sinks rc=%d\n", rc); + goto failed_detect; + } + + /* iterate through the strings one by one */ + for (i = 0; i < wled->cfg.num_strings; i++) { + sink_test = BIT((WLED4_SINK_REG_CURR_SINK_SHFT + i)); + + /* Enable feedback control */ + rc = regmap_write(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_FEEDBACK_CONTROL, i + 1); + if (rc < 0) { + pr_err("Failed to enable feedback for SINK %d rc = %d\n", + i + 1, rc); + goto failed_detect; + } + + /* enable the sink */ + rc = regmap_write(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_CURR_SINK, sink_test); + if (rc < 0) { + pr_err("Failed to configure SINK %d rc=%d\n", i + 1, + rc); + goto failed_detect; + } + + /* Enable the module */ + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, + WLED3_CTRL_REG_MOD_EN_MASK); + if (rc < 0) { + pr_err("Failed to enable WLED module rc=%d\n", rc); + goto failed_detect; + } + + usleep_range(WLED_SOFT_START_DLY_US, + WLED_SOFT_START_DLY_US + 1000); + + rc = regmap_read(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_INT_RT_STS, &int_sts); + if (rc < 0) { + pr_err("Error in reading WLED3_CTRL_INT_RT_STS rc=%d\n", + rc); + goto failed_detect; + } + + if (int_sts & WLED3_CTRL_REG_OVP_FAULT_STATUS) + pr_debug("WLED OVP fault detected with SINK %d\n", + i + 1); + else + sink_valid |= sink_test; + + /* Disable the module */ + rc = regmap_update_bits(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, 0); + if (rc < 0) { + pr_err("Failed to disable WLED module rc=%d\n", rc); + goto failed_detect; + } + } + + if (sink_valid == sink_config) { + pr_debug("WLED auto-detection complete, default sink-config=%x OK!\n", + sink_config); + } else { + pr_warn("Invalid WLED default sink config=%x changing it to=%x\n", + sink_config, sink_valid); + sink_config = sink_valid; + } + + if (!sink_config) { + pr_err("No valid WLED sinks found\n"); + wled->force_mod_disable = true; + goto failed_detect; + } + + /* write the new sink configuration */ + rc = regmap_write(wled->regmap, + wled->sink_addr + WLED4_SINK_REG_CURR_SINK, + sink_config); + if (rc < 0) { + pr_err("Failed to reconfigure the default sink rc=%d\n", rc); + goto failed_detect; + } + + /* Enable valid sinks */ + for (i = 0; i < wled->cfg.num_strings; i++) { + if (wled->cfg.cabc) { + rc = regmap_update_bits(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_STR_CABC(i), + WLED4_SINK_REG_STR_CABC_MASK, + WLED4_SINK_REG_STR_CABC_MASK); + if (rc < 0) + goto failed_detect; + } + + if (sink_config & BIT(WLED4_SINK_REG_CURR_SINK_SHFT + i)) + val = WLED4_SINK_REG_STR_MOD_MASK; + else + val = 0x0; /* disable modulator_en for unused sink */ + + rc = regmap_write(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_STR_MOD_EN(i), val); + if (rc < 0) { + pr_err("Failed to configure MODULATOR_EN rc=%d\n", rc); + goto failed_detect; + } + } + + /* restore the feedback setting */ + rc = regmap_write(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_FEEDBACK_CONTROL, 0); + if (rc < 0) { + pr_err("Failed to restore feedback setting rc=%d\n", rc); + goto failed_detect; + } + + /* restore brightness */ + rc = wled4_set_brightness(wled, wled->brightness); + if (rc < 0) { + pr_err("Failed to set brightness after auto detection rc=%d\n", + rc); + goto failed_detect; + } + + rc = regmap_update_bits(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, + WLED3_CTRL_REG_MOD_EN_MASK); + if (rc < 0) { + pr_err("Failed to enable WLED module rc=%d\n", rc); + goto failed_detect; + } + + wled->auto_detection_done = true; + +failed_detect: + return rc; +} + +#define WLED_AUTO_DETECT_OVP_COUNT 5 +#define WLED_AUTO_DETECT_CNT_DLY_US HZ /* 1 second */ +static bool wled_auto_detection_required(struct wled *wled) +{ + s64 elapsed_time_us; + + if (*wled->version == WLED_PM8941) + return false; + /* + * Check if the OVP fault was an occasional one + * or if it's firing continuously, the latter qualifies + * for an auto-detection check. + */ + if (!wled->auto_detection_ovp_count) { + wled->start_ovp_fault_time = ktime_get(); + wled->auto_detection_ovp_count++; + } else { + elapsed_time_us = ktime_us_delta(ktime_get(), + wled->start_ovp_fault_time); + if (elapsed_time_us > WLED_AUTO_DETECT_CNT_DLY_US) + wled->auto_detection_ovp_count = 0; + else + wled->auto_detection_ovp_count++; + + if (wled->auto_detection_ovp_count >= + WLED_AUTO_DETECT_OVP_COUNT) { + wled->auto_detection_ovp_count = 0; + return true; + } + } + + return false; +} + +static int wled_auto_detection_at_init(struct wled *wled) +{ + int rc; + u32 fault_status = 0, rt_status = 0; + + if (*wled->version == WLED_PM8941) + return 0; + + if (!wled->cfg.auto_detection_enabled) + return 0; + + rc = regmap_read(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, + &rt_status); + if (rc < 0) { + pr_err("Failed to read RT status rc=%d\n", rc); + return rc; + } + + rc = regmap_read(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_FAULT_STATUS, + &fault_status); + if (rc < 0) { + pr_err("Failed to read fault status rc=%d\n", rc); + return rc; + } + + if ((rt_status & WLED3_CTRL_REG_OVP_FAULT_STATUS) || + (fault_status & WLED3_CTRL_REG_OVP_FAULT_BIT)) { + mutex_lock(&wled->lock); + rc = wled_auto_string_detection(wled); + if (!rc) + wled->auto_detection_done = true; + mutex_unlock(&wled->lock); + } + + return rc; +} + +static void handle_ovp_fault(struct wled *wled) +{ + if (!wled->cfg.auto_detection_enabled) + return; + + mutex_lock(&wled->lock); + if (wled->ovp_irq > 0 && !wled->ovp_irq_disabled) { + disable_irq_nosync(wled->ovp_irq); + wled->ovp_irq_disabled = true; + } + + if (wled_auto_detection_required(wled)) + wled_auto_string_detection(wled); + + if (wled->ovp_irq > 0 && wled->ovp_irq_disabled) { + enable_irq(wled->ovp_irq); + wled->ovp_irq_disabled = false; + } + mutex_unlock(&wled->lock); +} + static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) { struct wled *wled = _wled; @@ -413,6 +706,9 @@ static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= %x\n", int_sts, fault_sts); + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) + handle_ovp_fault(wled); + return IRQ_HANDLED; } @@ -575,6 +871,10 @@ static int wled4_setup(struct wled *wled) return rc; } + rc = wled_auto_detection_at_init(wled); + if (rc < 0) + return rc; + if (wled->cfg.external_pfet) { /* Unlock the secure register access */ rc = regmap_write(wled->regmap, wled->ctrl_addr + @@ -602,6 +902,7 @@ static int wled4_setup(struct wled *wled) .enabled_strings = 0xf, .cabc = false, .external_pfet = true, + .auto_detection_enabled = false, }; static const u32 wled3_boost_i_limit_values[] = { @@ -785,6 +1086,7 @@ static int wled_configure(struct wled *wled) { "qcom,ext-gen", &cfg->ext_gen, }, { "qcom,cabc", &cfg->cabc, }, { "qcom,external-pfet", &cfg->external_pfet, }, + { "qcom,auto-string-detection", &cfg->auto_detection_enabled, }, }; prop_addr = of_get_address(dev->of_node, 0, NULL, NULL); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

1 0

[git pull] vmwgfx-fixes-4.17
by Thomas Hellstrom 03 May '18

03 May '18

Hi, Dave, Two fixes for now, one for a long standing problem uncovered by a commit in the 4.17 merge window, one for a regression introduced by a previous bugfix, Cc'd stable. The following changes since commit bb1278e891662616ccf4584523318d5f7ddb3a7c: Merge tag 'drm-misc-fixes-2018-04-25' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2018-04-26 11:09:56 +1000) are available in the Git repository at: git://people.freedesktop.org/~thomash/linux vmwgfx-fixes-4.17 for you to fetch changes up to 13f149d47392782baafd96d54d4e65f3b5ca342f: drm/vmwgfx: Fix a buffer object leak (2018-04-26 09:59:30 +0200) ---------------------------------------------------------------- Thomas Hellstrom (2): drm/vmwgfx: Clean up fbdev modeset locking drm/vmwgfx: Fix a buffer object leak drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 31 ++++++++++--------------------- drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 14 +++++++++++--- 2 files changed, 21 insertions(+), 24 deletions(-)

1 0

Re: [PATCH] drm/kms/mode: added a new helper for calculating videomode from crtc's display mode
by Jani Nikula 03 May '18

03 May '18

On Thu, 03 May 2018, Satendra Singh Thakur <satendra.t(a)samsung.com> wrote: > 1. > -Added a new helper drm_display_mode_crtc_to_videomode > -This helper calculates mode parameters like > horizontal front_porch, back_porch, sync length > vertical front_porch, back_porch, sync length > using crtc_* fields of struct drm_display_mode > -It uses following fields of crtc mode > horizontal sync start/end, active and total length > vertical sync start/end, active and total length > 2. > -Most of the driver use user-supplied mode for calculating videomode > -However, few drivers use HW (crtc) mode for calculating videomode > -This helper will be useful for such drivers > 3. > -Currently following drivers will be using this new helper > -arm hdlcd > -atmel hlcdc > -exynos 5433 decon > -exynos7 decon > -exynos fimd > 4. > -This patch removes related duplicate code from above mentioned drivers > > Signed-off-by: Satendra Singh Thakur <satendra.t(a)samsung.com> > Cc: Madhur Verma <madhur.verma(a)samsung.com> > Cc: Hemanshu Srivastava <hemanshu.s(a)samsung.com> > --- > drivers/gpu/drm/arm/hdlcd_crtc.c | 8 +------- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 7 +------ > drivers/gpu/drm/drm_modes.c | 20 ++++++++++++++++++++ > drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 22 ++++++++++------------ > drivers/gpu/drm/exynos/exynos7_drm_decon.c | 23 ++++++++++------------- > drivers/gpu/drm/exynos/exynos_drm_fimd.c | 22 +++++++++------------- > include/drm/drm_modes.h | 2 ++ > 7 files changed, 53 insertions(+), 51 deletions(-) > > diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c > index cf5cbd6..d20e471 100644 > --- a/drivers/gpu/drm/arm/hdlcd_crtc.c > +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c > @@ -130,13 +130,7 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) > struct videomode vm; > unsigned int polarities, err; > > - vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; > - vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; > - vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; > - vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; > - vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; > - vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; > - > + drm_display_mode_crtc_to_videomode(m, &vm); > polarities = HDLCD_POLARITY_DATAEN | HDLCD_POLARITY_DATA; > > if (m->flags & DRM_MODE_FLAG_PHSYNC) > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index d732810..bafcef6 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -81,12 +81,7 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c) > unsigned int cfg; > int div; > > - vm.vfront_porch = adj->crtc_vsync_start - adj->crtc_vdisplay; > - vm.vback_porch = adj->crtc_vtotal - adj->crtc_vsync_end; > - vm.vsync_len = adj->crtc_vsync_end - adj->crtc_vsync_start; > - vm.hfront_porch = adj->crtc_hsync_start - adj->crtc_hdisplay; > - vm.hback_porch = adj->crtc_htotal - adj->crtc_hsync_end; > - vm.hsync_len = adj->crtc_hsync_end - adj->crtc_hsync_start; > + drm_display_mode_crtc_to_videomode(adj, &vm); > > regmap_write(regmap, ATMEL_HLCDC_CFG(1), > (vm.hsync_len - 1) | ((vm.vsync_len - 1) << 16)); > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index e82b61e..a406749 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -654,6 +654,26 @@ void drm_display_mode_to_videomode(const struct drm_display_mode *dmode, > vm->flags |= DISPLAY_FLAGS_DOUBLECLK; > } > EXPORT_SYMBOL_GPL(drm_display_mode_to_videomode); > +/** > + * drm_display_mode_crtc_to_videomode - fill in @vm using crtc fields of@dmode, "of@dmode" needs a space, superfluous comma at the end. > + * @dmode: drm_display_mode structure to use as source > + * @vm: videomode structure to use as destination > + * > + * Fills out @vm using the crtc display mode specified in @dmode. > + */ > +void drm_display_mode_crtc_to_videomode(const struct drm_display_mode *dmode, > + struct videomode *vm) > +{ > + vm->hfront_porch = dmode->crtc_hsync_start - dmode->crtc_hdisplay; > + vm->hsync_len = dmode->crtc_hsync_end - dmode->crtc_hsync_start; > + vm->hback_porch = dmode->crtc_htotal - dmode->crtc_hsync_end; > + > + vm->vfront_porch = dmode->crtc_vsync_start - dmode->crtc_vdisplay; > + vm->vsync_len = dmode->crtc_vsync_end - dmode->crtc_vsync_start; > + vm->vback_porch = dmode->crtc_vtotal - dmode->crtc_vsync_end; IMO this should fill in or at least clear all fields of videomode, in many call sites they'll contain stack garbage. > + Superfluous newline. > +} > +EXPORT_SYMBOL_GPL(drm_display_mode_crtc_to_videomode); > > /** > * drm_bus_flags_from_videomode - extract information about pixelclk and > diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c > index 1c330f2..1ba73a8 100644 > --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c > +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c > @@ -20,6 +20,7 @@ > #include <linux/of_gpio.h> > #include <linux/pm_runtime.h> > #include <linux/regmap.h> > +#include <video/videomode.h> > > #include "exynos_drm_drv.h" > #include "exynos_drm_crtc.h" > @@ -225,26 +226,23 @@ static void decon_commit(struct exynos_drm_crtc *crtc) > writel(val, ctx->addr + DECON_VIDTCON2); > > if (!crtc->i80_mode) { > - int vbp = m->crtc_vtotal - m->crtc_vsync_end; > - int vfp = m->crtc_vsync_start - m->crtc_vdisplay; > + struct videomode vm; > > + drm_display_mode_crtc_to_videomode(m, &vm); > if (interlaced) > - vbp = vbp / 2 - 1; > - val = VIDTCON00_VBPD_F(vbp - 1) | VIDTCON00_VFPD_F(vfp - 1); > + vm.vback_porch = (vm.vback_porch >> 1) - 1; > + val = VIDTCON00_VBPD_F(vm.vback_porch - 1) | > + VIDTCON00_VFPD_F(vm.vfront_porch - 1); > writel(val, ctx->addr + DECON_VIDTCON00); > > - val = VIDTCON01_VSPW_F( > - m->crtc_vsync_end - m->crtc_vsync_start - 1); > + val = VIDTCON01_VSPW_F(vm.vsync_len - 1); > writel(val, ctx->addr + DECON_VIDTCON01); > > - val = VIDTCON10_HBPD_F( > - m->crtc_htotal - m->crtc_hsync_end - 1) | > - VIDTCON10_HFPD_F( > - m->crtc_hsync_start - m->crtc_hdisplay - 1); > + val = VIDTCON10_HBPD_F(vm.hback_porch - 1) | > + VIDTCON10_HFPD_F(vm.hfront_porch - 1); > writel(val, ctx->addr + DECON_VIDTCON10); > > - val = VIDTCON11_HSPW_F( > - m->crtc_hsync_end - m->crtc_hsync_start - 1); > + val = VIDTCON11_HSPW_F(vm.hsync_len - 1); > writel(val, ctx->addr + DECON_VIDTCON11); > } > > diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c > index 3931d5e..148daae 100644 > --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c > +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c > @@ -25,6 +25,7 @@ > > #include <video/of_display_timing.h> > #include <video/of_videomode.h> > +#include <video/videomode.h> > > #include "exynos_drm_crtc.h" > #include "exynos_drm_plane.h" > @@ -168,28 +169,24 @@ static void decon_commit(struct exynos_drm_crtc *crtc) > return; > > if (!ctx->i80_if) { > - int vsync_len, vbpd, vfpd, hsync_len, hbpd, hfpd; > + struct videomode vm; > + > + drm_display_mode_crtc_to_videomode(mode, &vm); > /* setup vertical timing values. */ > - vsync_len = mode->crtc_vsync_end - mode->crtc_vsync_start; > - vbpd = mode->crtc_vtotal - mode->crtc_vsync_end; > - vfpd = mode->crtc_vsync_start - mode->crtc_vdisplay; > > - val = VIDTCON0_VBPD(vbpd - 1) | VIDTCON0_VFPD(vfpd - 1); > + val = VIDTCON0_VBPD(vm.vback_porch - 1) | > + VIDTCON0_VFPD(vm.vfront_porch - 1); > writel(val, ctx->regs + VIDTCON0); > > - val = VIDTCON1_VSPW(vsync_len - 1); > + val = VIDTCON1_VSPW(vm.vsync_len - 1); > writel(val, ctx->regs + VIDTCON1); > > /* setup horizontal timing values. */ > - hsync_len = mode->crtc_hsync_end - mode->crtc_hsync_start; > - hbpd = mode->crtc_htotal - mode->crtc_hsync_end; > - hfpd = mode->crtc_hsync_start - mode->crtc_hdisplay; > - > - /* setup horizontal timing values. */ > - val = VIDTCON2_HBPD(hbpd - 1) | VIDTCON2_HFPD(hfpd - 1); > + val = VIDTCON2_HBPD(vm.hback_porch - 1) | > + VIDTCON2_HFPD(vm.hfront_porch - 1); > writel(val, ctx->regs + VIDTCON2); > > - val = VIDTCON3_HSPW(hsync_len - 1); > + val = VIDTCON3_HSPW(vm.hsync_len - 1); > writel(val, ctx->regs + VIDTCON3); > } > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > index d42ae2b..b3ab89d 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c > @@ -25,6 +25,7 @@ > > #include <video/of_display_timing.h> > #include <video/of_videomode.h> > +#include <video/videomode.h> > #include <video/samsung_fimd.h> > #include <drm/exynos_drm.h> > > @@ -463,7 +464,7 @@ static void fimd_commit(struct exynos_drm_crtc *crtc) > return; > } > } else { > - int vsync_len, vbpd, vfpd, hsync_len, hbpd, hfpd; > + struct videomode vm; > u32 vidcon1; > > /* setup polarity values */ > @@ -474,24 +475,19 @@ static void fimd_commit(struct exynos_drm_crtc *crtc) > vidcon1 |= VIDCON1_INV_HSYNC; > writel(vidcon1, ctx->regs + driver_data->timing_base + VIDCON1); > > + drm_display_mode_crtc_to_videomode(mode, &vm); > /* setup vertical timing values. */ > - vsync_len = mode->crtc_vsync_end - mode->crtc_vsync_start; > - vbpd = mode->crtc_vtotal - mode->crtc_vsync_end; > - vfpd = mode->crtc_vsync_start - mode->crtc_vdisplay; > > - val = VIDTCON0_VBPD(vbpd - 1) | > - VIDTCON0_VFPD(vfpd - 1) | > - VIDTCON0_VSPW(vsync_len - 1); > + val = VIDTCON0_VBPD(vm.vback_porch - 1) | > + VIDTCON0_VFPD(vm.vfront_porch - 1) | > + VIDTCON0_VSPW(vm.vsync_len - 1); > writel(val, ctx->regs + driver_data->timing_base + VIDTCON0); > > /* setup horizontal timing values. */ > - hsync_len = mode->crtc_hsync_end - mode->crtc_hsync_start; > - hbpd = mode->crtc_htotal - mode->crtc_hsync_end; > - hfpd = mode->crtc_hsync_start - mode->crtc_hdisplay; > > - val = VIDTCON1_HBPD(hbpd - 1) | > - VIDTCON1_HFPD(hfpd - 1) | > - VIDTCON1_HSPW(hsync_len - 1); > + val = VIDTCON1_HBPD(vm.hback_porch - 1) | > + VIDTCON1_HFPD(vm.hfront_porch - 1) | > + VIDTCON1_HSPW(vm.hsync_len - 1); > writel(val, ctx->regs + driver_data->timing_base + VIDTCON1); > } > > diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h > index 0d310be..9ac764b 100644 > --- a/include/drm/drm_modes.h > +++ b/include/drm/drm_modes.h > @@ -473,6 +473,8 @@ void drm_display_mode_from_videomode(const struct videomode *vm, > struct drm_display_mode *dmode); > void drm_display_mode_to_videomode(const struct drm_display_mode *dmode, > struct videomode *vm); > +void drm_display_mode_crtc_to_videomode(const struct drm_display_mode *dmode, > + struct videomode *vm); > void drm_bus_flags_from_videomode(const struct videomode *vm, u32 *bus_flags); > int of_get_drm_display_mode(struct device_node *np, > struct drm_display_mode *dmode, u32 *bus_flags, -- Jani Nikula, Intel Open Source Technology Center

1 0

[Bug 106355] Strange artifacts when using Chromium with hardware acceleration
by bugzilla-daemon＠freedesktop.org 03 May '18

03 May '18

https://bugs.freedesktop.org/show_bug.cgi?id=106355 --- Comment #4 from Norbert Klar <klarnorbert(a)gmail.com> --- Care to tell me what's going on? 'Cause if it's duplicate of that bug, then it wasn't fixed since then. -- You are receiving this mail because: You are the assignee for the bug.

1 0

[PATCH] drm/virtio: add define for second capset to the virgl code.
by Dave Airlie 03 May '18

03 May '18

From: Dave Airlie <airlied(a)redhat.com> Although the kernel doesn't use this, qemu imports these headers and it's best to keep them consistent. This define is also something userspace may want to use. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- include/uapi/linux/virtio_gpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h index 4b04ead26cd9..f43c3c6171ff 100644 --- a/include/uapi/linux/virtio_gpu.h +++ b/include/uapi/linux/virtio_gpu.h @@ -260,6 +260,7 @@ struct virtio_gpu_cmd_submit { }; #define VIRTIO_GPU_CAPSET_VIRGL 1 +#define VIRTIO_GPU_CAPSET_VIRGL2 2 /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */ struct virtio_gpu_get_capset_info { -- 2.14.3

1 0

[PATCH 3/3] drm_hwcomposer: Add platform backend for minigbm
by Alistair Strachan 03 May '18

03 May '18

This adds support for the chromiumos (not AOSP) version of minigbm. Like hisi, the gralloc handle is not the same as the common libdrm handle (just yet), so we do need a separate backend. Tested with a pending change to the 'cuttlefish' android virtual device in AOSP with its custom gralloc switched to minigbm. Cc: John Stultz <john.stultz(a)linaro.org> Cc: Rob Herring <rob.herring(a)linaro.org> Cc: Sean Paul <seanpaul(a)google.com> Cc: Greg Hartman <ghartman(a)google.com> Signed-off-by: Alistair Strachan <astrachan(a)google.com> --- Android.mk | 8 +-- platformminigbm.cpp | 122 ++++++++++++++++++++++++++++++++++++++++++++ platformminigbm.h | 46 +++++++++++++++++ 3 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 platformminigbm.cpp create mode 100644 platformminigbm.h diff --git a/Android.mk b/Android.mk index 747bf27..549fc7c 100644 --- a/Android.mk +++ b/Android.mk @@ -101,14 +101,16 @@ ifeq ($(TARGET_PRODUCT),hikey960) LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER LOCAL_SRC_FILES += platformhisi.cpp LOCAL_C_INCLUDES += device/linaro/hikey/gralloc960/ -else -ifeq ($(TARGET_PRODUCT),hikey) +else ifeq ($(TARGET_PRODUCT),hikey) LOCAL_CPPFLAGS += -DUSE_HISI_IMPORTER LOCAL_SRC_FILES += platformhisi.cpp LOCAL_C_INCLUDES += device/linaro/hikey/gralloc/ +else ifeq ($(strip $(BOARD_DRM_HWCOMPOSER_BUFFER_IMPORTER)),minigbm) +LOCAL_SRC_FILES += platformminigbm.cpp +LOCAL_C_INCLUDES += external/minigbm/cros_gralloc/ else LOCAL_CPPFLAGS += -DUSE_DRM_GENERIC_IMPORTER -endif +LOCAL_C_INCLUDES += external/drm_gralloc endif LOCAL_MODULE := hwcomposer.drm diff --git a/platformminigbm.cpp b/platformminigbm.cpp new file mode 100644 index 0000000..80e2c0f --- /dev/null +++ b/platformminigbm.cpp @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "hwc-platform-drm-minigbm" + +#include "drmresources.h" +#include "platform.h" +#include "platformminigbm.h" + +#include <drm/drm_fourcc.h> +#include <xf86drm.h> +#include <xf86drmMode.h> + +#include <log/log.h> +#include <hardware/gralloc.h> + +#include "cros_gralloc_handle.h" + +namespace android { + +Importer *Importer::CreateInstance(DrmResources *drm) { + DrmMinigbmImporter *importer = new DrmMinigbmImporter(drm); + if (!importer) + return NULL; + + int ret = importer->Init(); + if (ret) { + ALOGE("Failed to initialize the minigbm importer %d", ret); + delete importer; + return NULL; + } + return importer; +} + +DrmMinigbmImporter::DrmMinigbmImporter(DrmResources *drm) : DrmGenericImporter(drm), drm_(drm) { +} + +DrmMinigbmImporter::~DrmMinigbmImporter() { +} + +int DrmMinigbmImporter::Init() { + int ret = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, + (const hw_module_t **)&gralloc_); + if (ret) { + ALOGE("Failed to open gralloc module %d", ret); + return ret; + } + + if (strcasecmp(gralloc_->common.author, "Chrome OS")) + ALOGW("Using non-minigbm gralloc module: %s/%s\n", gralloc_->common.name, + gralloc_->common.author); + + return 0; +} + +EGLImageKHR DrmMinigbmImporter::ImportImage(EGLDisplay egl_display, buffer_handle_t handle) { + cros_gralloc_handle *gr_handle = (cros_gralloc_handle *)handle; + if (!gr_handle) + return NULL; + EGLint attr[] = { + EGL_WIDTH, (EGLint)gr_handle->width, + EGL_HEIGHT, (EGLint)gr_handle->height, + EGL_LINUX_DRM_FOURCC_EXT, (EGLint)gr_handle->format, + EGL_DMA_BUF_PLANE0_FD_EXT, gr_handle->fds[0], + EGL_DMA_BUF_PLANE0_PITCH_EXT, (EGLint)gr_handle->strides[0], + EGL_DMA_BUF_PLANE0_OFFSET_EXT, (EGLint)gr_handle->offsets[0], + EGL_NONE, + }; + return eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, NULL, attr); +} + +int DrmMinigbmImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) { + cros_gralloc_handle *gr_handle = (cros_gralloc_handle *)handle; + if (!gr_handle) + return -EINVAL; + + uint32_t gem_handle; + int ret = drmPrimeFDToHandle(drm_->fd(), gr_handle->fds[0], &gem_handle); + if (ret) { + ALOGE("failed to import prime fd %d ret=%d", gr_handle->fds[0], ret); + return ret; + } + + memset(bo, 0, sizeof(hwc_drm_bo_t)); + bo->width = gr_handle->width; + bo->height = gr_handle->height; + bo->format = gr_handle->format; + bo->usage = gr_handle->usage; + bo->pitches[0] = gr_handle->strides[0]; + bo->offsets[0] = gr_handle->offsets[0]; + bo->gem_handles[0] = gem_handle; + + ret = drmModeAddFB2(drm_->fd(), bo->width, bo->height, bo->format, + bo->gem_handles, bo->pitches, bo->offsets, &bo->fb_id, 0); + if (ret) { + ALOGE("could not create drm fb %d", ret); + return ret; + } + + return ret; +} + +std::unique_ptr<Planner> Planner::CreateInstance(DrmResources *) { + std::unique_ptr<Planner> planner(new Planner); + planner->AddStage<PlanStageGreedy>(); + return planner; +} + +} diff --git a/platformminigbm.h b/platformminigbm.h new file mode 100644 index 0000000..ded4c07 --- /dev/null +++ b/platformminigbm.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ANDROID_PLATFORM_DRM_MINIGBM_H_ +#define ANDROID_PLATFORM_DRM_MINIGBM_H_ + +#include "drmresources.h" +#include "platform.h" +#include "platformdrmgeneric.h" + +#include <hardware/gralloc.h> + +namespace android { + +class DrmMinigbmImporter : public DrmGenericImporter { + public: + DrmMinigbmImporter(DrmResources *drm); + ~DrmMinigbmImporter() override; + + int Init(); + + EGLImageKHR ImportImage(EGLDisplay egl_display, buffer_handle_t handle) override; + int ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) override; + + private: + DrmResources *drm_; + + const gralloc_module_t *gralloc_; +}; + +} + +#endif -- 2.17.0.441.gb46fe60e1d-goog

2 3

[PATCH 1/3] drm_hwcomposer: Drop obsolete drm_gralloc include path
by Alistair Strachan 03 May '18

03 May '18

In commit d12274d, "drm_hwcomposer: Rework platformdrmgeneric.cpp to use libdrm's gralloc handle", the use of drm_gralloc was removed. Cc: John Stultz <john.stultz(a)linaro.org> Cc: Rob Herring <rob.herring(a)linaro.org> Cc: Sean Paul <seanpaul(a)google.com> Cc: Robert Foss <robert.foss(a)collabora.com> Cc: Stefan Schake <stschake(a)gmail.com> Signed-off-by: Alistair Strachan <astrachan(a)google.com> --- Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.mk b/Android.mk index a60d112..573c5aa 100644 --- a/Android.mk +++ b/Android.mk @@ -48,7 +48,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := libdrmhwc_utils LOCAL_C_INCLUDES := \ - external/drm_gralloc \ system/core/libsync LOCAL_SRC_FILES := \ -- 2.17.0.441.gb46fe60e1d-goog

2 1

[PATCH] drm_hwcomposer: Mark tests as vendor, fix build
by Alistair Strachan 03 May '18

03 May '18

After commit 94bb596, the tests for drm_hwcomposer no longer build, because the build system detects that they are linking other vendor modules (but installing themselves elsewhere). This change also adds the libhardware include path explicitly, as the implicit include of hardware/libhardware/include is going away. Cc: John Stultz <john.stultz(a)linaro.org> Cc: Rob Herring <rob.herring(a)linaro.org> Cc: Sumit Semwal <sumit.semwal(a)linaro.org> Cc: Sean Paul <seanpaul(a)google.com> Cc: Robert Foss <robert.foss(a)collabora.com> Signed-off-by: Alistair Strachan <astrachan(a)google.com> --- tests/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Android.mk b/tests/Android.mk index 3b9e0a2..c6a0afa 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -7,6 +7,8 @@ LOCAL_SRC_FILES := \ worker_test.cpp LOCAL_MODULE := hwc-drm-tests +LOCAL_VENDOR_MODULE := true +LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_STATIC_LIBRARIES := libdrmhwc_utils LOCAL_SHARED_LIBRARIES := hwcomposer.drm LOCAL_C_INCLUDES := external/drm_hwcomposer -- 2.17.0.441.gb46fe60e1d-goog

2 1

Re: [PATCH] drm_hwcomposer: Remove NVIDIA importer header
by John Stultz 03 May '18

03 May '18

On Wed, May 2, 2018 at 4:53 PM, Alistair Strachan <astrachan(a)google.com> wrote: > Commit 0f7487f "drm_hwcomposer: remove NVIDIA importer" removed most of > the implementation, but not the platformnv.h header file. Remove this > header now. > > Cc: John Stultz <john.stultz(a)linaro.org> > Cc: Rob Herring <rob.herring(a)linaro.org> > Cc: Thierry Reding <treding(a)nvidia.com> > Cc: Robert Foss <robert.foss(a)collabora.com> > Signed-off-by: Alistair Strachan <astrachan(a)google.com> Acked-by: John Stultz <john.stultz(a)linaro.org>

1 0

[PATCH] drivers: dma-buf: Change %p to %pK in debug messages
by Daniel Rosenberg 03 May '18

03 May '18

The format specifier %p can leak kernel addresses while not valuing the kptr_restrict system settings. Use %pK instead of %p, which also evaluates whether kptr_restrict is set. Signed-off-by: Divya Ponnusamy <pdivya(a)codeaurora.org> Signed-off-by: Daniel Rosenberg <drosen(a)google.com> Cc: stable <stable(a)vger.kernel.org> --- drivers/dma-buf/sync_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma-buf/sync_debug.c b/drivers/dma-buf/sync_debug.c index c4c8ecb24aa9..d8d340542a79 100644 --- a/drivers/dma-buf/sync_debug.c +++ b/drivers/dma-buf/sync_debug.c @@ -133,7 +133,7 @@ static void sync_print_sync_file(struct seq_file *s, char buf[128]; int i; - seq_printf(s, "[%p] %s: %s\n", sync_file, + seq_printf(s, "[%pK] %s: %s\n", sync_file, sync_file_get_name(sync_file, buf, sizeof(buf)), sync_status_str(dma_fence_get_status(sync_file->fence))); -- 2.17.0.441.gb46fe60e1d-goog

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2018