dri-devel June 2013

dri-devel@lists.freedesktop.org

132 participants
727 discussions

[PULL] drm-intel-fixes
by Daniel Vetter 11 Jun '13

11 Jun '13

Hi Dave, Just tiny regression fixes here: - Two fixes to fix sdvo hotplug which broke in the hpd storm detection work. - One fix to patch-up the sdvo lvds regression fixer from the last pull - we need to prefer the vbt mode over edid modes. IMPORTANT: The sdvo lvds fix in this -fixes pull commit c3456fb3e4712d0448592af3c5d644c9472cd3c1 Author: Daniel Vetter <daniel.vetter(a)ffwll.ch> Date: Mon Jun 10 09:47:58 2013 +0200 drm/i915: prefer VBT modes for SVDO-LVDS over EDID has a silent functional conflict with commit 990256aec2f10800595dddf4d1c3441fcd6b2616 Author: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Date: Fri May 31 12:17:07 2013 +0000 drm: Add probed modes in probe order in drm-next. Please poke me when you do a backmerge so that I can supply the fixup (we simply need to add the vbt modes before edid modes, i.e. the other way round than now). Cheers, Daniel The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10: Linux 3.10-rc5 (2013-06-08 17:41:04 -0700) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-fixes-2013-06-11 for you to fetch changes up to c3456fb3e4712d0448592af3c5d644c9472cd3c1: drm/i915: prefer VBT modes for SVDO-LVDS over EDID (2013-06-10 10:13:34 +0200) ---------------------------------------------------------------- Chris Wilson (2): drm/i915: Fix hotplug interrupt enabling for SDVOC drm/i915: Enable hotplug interrupts after querying hw capabilities. Daniel Vetter (1): drm/i915: prefer VBT modes for SVDO-LVDS over EDID drivers/gpu/drm/i915/intel_sdvo.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

1 0

[PATCH] drm/tegra: add support for runtime pm
by Mayuresh Kulkarni 11 Jun '13

11 Jun '13

- as of now host1x and gr2d module's clocks are enabled in their driver's .probe and never disabled - this commit adds support for runtime pm in host1x and gr2d drivers - during boot-up clocks are enabled in .probe and disabled on its exit - when new work is submitted, clocks are enabled in submit and disabled when submit completes - parent->child relation between host1x and gr2d ensures that host1x clock is also enabled before enabling gr2d clock and it is turned off after gr2d clock is turned off Signed-off-by: Mayuresh Kulkarni <mkulkarni(a)nvidia.com> --- drivers/gpu/host1x/channel.c | 5 ++++ drivers/gpu/host1x/dev.c | 58 ++++++++++++++++++++++++++++++++++++++---- drivers/gpu/host1x/drm/gr2d.c | 59 ++++++++++++++++++++++++++++++++++++++----- drivers/gpu/host1x/intr.c | 9 +++++-- 4 files changed, 118 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/host1x/channel.c b/drivers/gpu/host1x/channel.c index 83ea51b..b71caec 100644 --- a/drivers/gpu/host1x/channel.c +++ b/drivers/gpu/host1x/channel.c @@ -18,6 +18,7 @@ #include <linux/slab.h> #include <linux/module.h> +#include <linux/pm_runtime.h> #include "channel.h" #include "dev.h" @@ -41,6 +42,10 @@ int host1x_job_submit(struct host1x_job *job) { struct host1x *host = dev_get_drvdata(job->channel->dev->parent); + /* enable clocks + * they will be disabled in action_submit_complete */ + pm_runtime_get_sync(job->channel->dev); + return host1x_hw_channel_submit(host, job); } diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index 28e28a2..93d9d72 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -23,6 +23,7 @@ #include <linux/of_device.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/pm_runtime.h> #define CREATE_TRACE_POINTS #include <trace/events/host1x.h> @@ -143,11 +144,11 @@ static int host1x_probe(struct platform_device *pdev) return err; } - err = clk_prepare_enable(host->clk); - if (err < 0) { - dev_err(&pdev->dev, "failed to enable clock\n"); - return err; - } + /* enable runtime pm */ + pm_runtime_enable(&pdev->dev); + + /* enable clocks */ + pm_runtime_get_sync(&pdev->dev); err = host1x_syncpt_init(host); if (err) { @@ -165,6 +166,9 @@ static int host1x_probe(struct platform_device *pdev) host1x_drm_alloc(pdev); + /* disable clocks */ + pm_runtime_put(&pdev->dev); + return 0; fail_deinit_syncpt: @@ -183,6 +187,47 @@ static int __exit host1x_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_RUNTIME +static int host1x_runtime_suspend(struct device *dev) +{ + struct host1x *host; + + host = dev_get_drvdata(dev); + if (IS_ERR_OR_NULL(host)) + return -EINVAL; + + clk_disable_unprepare(host->clk); + + return 0; +} + +static int host1x_runtime_resume(struct device *dev) +{ + int err = 0; + struct host1x *host; + + host = dev_get_drvdata(dev); + if (IS_ERR_OR_NULL(host)) + return -EINVAL; + + err = clk_prepare_enable(host->clk); + if (err < 0) + dev_err(dev, "failed to enable clock\n"); + + return err; +} +#endif /* CONFIG_PM_RUNTIME */ + +#ifdef CONFIG_PM +static const struct dev_pm_ops host1x_pm_ops = { +#ifdef CONFIG_PM_RUNTIME + .runtime_suspend = host1x_runtime_suspend, + .runtime_resume = host1x_runtime_resume, +#endif +}; + +#endif /* CONFIG_PM */ + static struct platform_driver tegra_host1x_driver = { .probe = host1x_probe, .remove = __exit_p(host1x_remove), @@ -190,6 +235,9 @@ static struct platform_driver tegra_host1x_driver = { .owner = THIS_MODULE, .name = "tegra-host1x", .of_match_table = host1x_of_match, +#ifdef CONFIG_PM + .pm = &host1x_pm_ops, +#endif }, }; diff --git a/drivers/gpu/host1x/drm/gr2d.c b/drivers/gpu/host1x/drm/gr2d.c index 6a45ae0..172a654 100644 --- a/drivers/gpu/host1x/drm/gr2d.c +++ b/drivers/gpu/host1x/drm/gr2d.c @@ -22,6 +22,7 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/clk.h> +#include <linux/pm_runtime.h> #include "channel.h" #include "drm.h" @@ -271,11 +272,13 @@ static int gr2d_probe(struct platform_device *pdev) return PTR_ERR(gr2d->clk); } - err = clk_prepare_enable(gr2d->clk); - if (err) { - dev_err(dev, "cannot turn on clock\n"); - return err; - } + platform_set_drvdata(pdev, gr2d); + + /* enable runtime pm */ + pm_runtime_enable(&pdev->dev); + + /* enable clocks */ + pm_runtime_get_sync(&pdev->dev); gr2d->channel = host1x_channel_request(dev); if (!gr2d->channel) @@ -301,7 +304,8 @@ static int gr2d_probe(struct platform_device *pdev) gr2d_init_addr_reg_map(dev, gr2d); - platform_set_drvdata(pdev, gr2d); + /* disable clocks */ + pm_runtime_put(&pdev->dev); return 0; } @@ -328,6 +332,46 @@ static int __exit gr2d_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_RUNTIME +static int gr2d_runtime_suspend(struct device *dev) +{ + struct gr2d *gr2d; + + gr2d = dev_get_drvdata(dev); + if (IS_ERR_OR_NULL(gr2d)) + return -EINVAL; + + clk_disable_unprepare(gr2d->clk); + + return 0; +} + +static int gr2d_runtime_resume(struct device *dev) +{ + int err = 0; + struct gr2d *gr2d; + + gr2d = dev_get_drvdata(dev); + if (IS_ERR_OR_NULL(gr2d)) + return -EINVAL; + + err = clk_prepare_enable(gr2d->clk); + if (err < 0) + dev_err(dev, "failed to enable clock\n"); + + return err; +} +#endif /* CONFIG_PM_RUNTIME */ + +#ifdef CONFIG_PM +static const struct dev_pm_ops gr2d_pm_ops = { +#ifdef CONFIG_PM_RUNTIME + .runtime_suspend = gr2d_runtime_suspend, + .runtime_resume = gr2d_runtime_resume, +#endif +}; +#endif /* CONFIG_PM */ + struct platform_driver tegra_gr2d_driver = { .probe = gr2d_probe, .remove = __exit_p(gr2d_remove), @@ -335,5 +379,8 @@ struct platform_driver tegra_gr2d_driver = { .owner = THIS_MODULE, .name = "gr2d", .of_match_table = gr2d_match, +#ifdef CONFIG_PM + .pm = &gr2d_pm_ops, +#endif } }; diff --git a/drivers/gpu/host1x/intr.c b/drivers/gpu/host1x/intr.c index 2491bf8..c23fb64 100644 --- a/drivers/gpu/host1x/intr.c +++ b/drivers/gpu/host1x/intr.c @@ -20,6 +20,7 @@ #include <linux/interrupt.h> #include <linux/slab.h> #include <linux/irq.h> +#include <linux/pm_runtime.h> #include <trace/events/host1x.h> #include "channel.h" @@ -109,14 +110,18 @@ static void reset_threshold_interrupt(struct host1x *host, static void action_submit_complete(struct host1x_waitlist *waiter) { + int completed = waiter->count; struct host1x_channel *channel = waiter->data; + /* disable clocks for all the submits that got completed in this lot */ + while (completed--) + pm_runtime_put(channel->dev); + host1x_cdma_update(&channel->cdma); - /* Add nr_completed to trace */ + /* Add nr_completed to trace */ trace_host1x_channel_submit_complete(dev_name(channel->dev), waiter->count, waiter->thresh); - } static void action_wakeup(struct host1x_waitlist *waiter) -- 1.8.1.5

3 6

[RPC 0/21] DRM: Add VIA DRM driver
by James Simmons 10 Jun '13

10 Jun '13

Hello Here is the first run at inspection of the VIA openchrome dri driver. Now that the Xorg driver has been out over a year with KMS support most people should be able to use this feature. The driver is totaly complete but we wanted to merge it so people with newer hardware that has HDMI/DVI-D support can be able to run X windows. Your xorg driver does not implement HDMI/DVI in UMS mode and we don't have the resources to do this work. Basic TTM/GEM is supported but currently you can't run any acceleration with the command queue. Over the next 6 months this should be implemented. Thank you.

4 3

[PATCH RFC] drm/i2c: tda998x: fix sync generation and calculation
by Sebastian Hesselbarth 10 Jun '13

10 Jun '13

This fixes the wrong sync generation and sync calculation. It has only been tested for progressive modes. Sync timings for a bunch of modes have also been verified with an oscilloscope near-end (TDA998x input) and far-end (DVI receiver output). Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com> --- Note: This patch is based on rmk's Armada DRM driver plus some DT support fixes, so offsets may vary on your side. Anyway, please 3-way apply and test wherever possible. Cc: David Airlie <airlied(a)linux.ie> Cc: Russell King - ARM Linux <linux(a)arm.linux.org.uk> Cc: Darren Etheridge <darren.etheridge(a)gmail.com> Cc: linux-arm-kernel(a)lists.infradead.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-kernel(a)vger.kernel.org --- drivers/gpu/drm/i2c/tda998x_drv.c | 168 ++++++++++++++++++++++--------------- 1 files changed, 102 insertions(+), 66 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 819dcba..1564830 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -141,8 +141,12 @@ struct tda998x_priv { #define REG_VS_LINE_END_1_LSB REG(0x00, 0xae) /* write */ #define REG_VS_PIX_END_1_MSB REG(0x00, 0xaf) /* write */ #define REG_VS_PIX_END_1_LSB REG(0x00, 0xb0) /* write */ +#define REG_VS_LINE_STRT_2_MSB REG(0x00, 0xb1) /* write */ +#define REG_VS_LINE_STRT_2_LSB REG(0x00, 0xb2) /* write */ #define REG_VS_PIX_STRT_2_MSB REG(0x00, 0xb3) /* write */ #define REG_VS_PIX_STRT_2_LSB REG(0x00, 0xb4) /* write */ +#define REG_VS_LINE_END_2_MSB REG(0x00, 0xb5) /* write */ +#define REG_VS_LINE_END_2_LSB REG(0x00, 0xb6) /* write */ #define REG_VS_PIX_END_2_MSB REG(0x00, 0xb7) /* write */ #define REG_VS_PIX_END_2_LSB REG(0x00, 0xb8) /* write */ #define REG_HS_PIX_START_MSB REG(0x00, 0xb9) /* write */ @@ -153,21 +157,29 @@ struct tda998x_priv { #define REG_VWIN_START_1_LSB REG(0x00, 0xbe) /* write */ #define REG_VWIN_END_1_MSB REG(0x00, 0xbf) /* write */ #define REG_VWIN_END_1_LSB REG(0x00, 0xc0) /* write */ +#define REG_VWIN_START_2_MSB REG(0x00, 0xc1) /* write */ +#define REG_VWIN_START_2_LSB REG(0x00, 0xc2) /* write */ +#define REG_VWIN_END_2_MSB REG(0x00, 0xc3) /* write */ +#define REG_VWIN_END_2_LSB REG(0x00, 0xc4) /* write */ #define REG_DE_START_MSB REG(0x00, 0xc5) /* write */ #define REG_DE_START_LSB REG(0x00, 0xc6) /* write */ #define REG_DE_STOP_MSB REG(0x00, 0xc7) /* write */ #define REG_DE_STOP_LSB REG(0x00, 0xc8) /* write */ #define REG_TBG_CNTRL_0 REG(0x00, 0xca) /* write */ +# define TBG_CNTRL_0_TOP_TGL (1 << 0) +# define TBG_CNTRL_0_TOP_SEL (1 << 1) +# define TBG_CNTRL_0_DE_EXT (1 << 2) +# define TBG_CNTRL_0_TOP_EXT (1 << 3) # define TBG_CNTRL_0_FRAME_DIS (1 << 5) # define TBG_CNTRL_0_SYNC_MTHD (1 << 6) # define TBG_CNTRL_0_SYNC_ONCE (1 << 7) #define REG_TBG_CNTRL_1 REG(0x00, 0xcb) /* write */ -# define TBG_CNTRL_1_VH_TGL_0 (1 << 0) -# define TBG_CNTRL_1_VH_TGL_1 (1 << 1) -# define TBG_CNTRL_1_VH_TGL_2 (1 << 2) -# define TBG_CNTRL_1_VHX_EXT_DE (1 << 3) -# define TBG_CNTRL_1_VHX_EXT_HS (1 << 4) -# define TBG_CNTRL_1_VHX_EXT_VS (1 << 5) +# define TBG_CNTRL_1_H_TGL (1 << 0) +# define TBG_CNTRL_1_V_TGL (1 << 1) +# define TBG_CNTRL_1_TGL_EN (1 << 2) +# define TBG_CNTRL_1_X_EXT (1 << 3) +# define TBG_CNTRL_1_H_EXT (1 << 4) +# define TBG_CNTRL_1_V_EXT (1 << 5) # define TBG_CNTRL_1_DWIN_DIS (1 << 6) #define REG_ENABLE_SPACE REG(0x00, 0xd6) /* write */ #define REG_HVF_CNTRL_0 REG(0x00, 0xe4) /* write */ @@ -740,43 +752,57 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, struct drm_display_mode *adjusted_mode) { struct tda998x_priv *priv = to_tda998x_priv(encoder); - uint16_t hs_start, hs_end, line_start, line_end; - uint16_t vwin_start, vwin_end, de_start, de_end; - uint16_t ref_pix, ref_line, pix_start2; + uint16_t ref_pix, ref_line, n_pix, n_line; + uint16_t hs_pix_s, hs_pix_e; + uint16_t vs1_pix_s, vs1_pix_e, vs1_line_s, vs1_line_e; + uint16_t vs2_pix_s, vs2_pix_e, vs2_line_s, vs2_line_e; + uint16_t vwin1_line_s, vwin1_line_e; + uint16_t vwin2_line_s, vwin2_line_e; + uint16_t de_pix_s, de_pix_e; uint8_t reg, div, rep; - hs_start = mode->hsync_start - mode->hdisplay; - hs_end = mode->hsync_end - mode->hdisplay; - line_start = 1; - line_end = 1 + mode->vsync_end - mode->vsync_start; - vwin_start = mode->vtotal - mode->vsync_start; - vwin_end = vwin_start + mode->vdisplay; - de_start = mode->htotal - mode->hdisplay; - de_end = mode->htotal; - - pix_start2 = 0; - if (mode->flags & DRM_MODE_FLAG_INTERLACE) - pix_start2 = (mode->htotal / 2) + hs_start; - - /* TODO how is this value calculated? It is 2 for all common - * formats in the tables in out of tree nxp driver (assuming - * I've properly deciphered their byzantine table system) + /* + * Internally TDA998x is using ITU-R BT.656 style sync but + * we get VESA style sync. TDA998x is using a reference pixel + * relative to ITU to sync to the input frame and for output + * sync generation. + * + * Now there is some issues to take care of: + * - TDA998x register values must be > 0 to be enabled + * - REFLINE needs an additional offset of +1 + * - REFPIX needs an addtional offset of +1 for UYUV and +3 for RGB + * + * So we add +1 to all horizontal and vertical register values, + * plus an additional +3 for REFPIX as we are using RGB input only. */ - ref_line = 2; - - /* this might changes for other color formats from the CRTC: */ - ref_pix = 3 + hs_start; + n_pix = mode->htotal; + n_line = mode->vtotal; + ref_pix = 4 + mode->hsync_start; + ref_line = 2 + mode->vsync_start; + de_pix_s = 1; + de_pix_e = de_pix_s + mode->hdisplay; + hs_pix_s = 1 + mode->hsync_start; + hs_pix_e = 1 + mode->hsync_end; + vwin1_line_s = 1; + vwin1_line_e = vwin1_line_s + mode->vdisplay; + vs1_pix_s = vs1_pix_e = hs_pix_s; + vs1_line_s = 1 + mode->vsync_start; + vs1_line_e = 1 + mode->vsync_end; + + vwin2_line_s = vwin2_line_e = 0; + vs2_pix_s = vs2_pix_e = 0; + vs2_line_s = vs2_line_e = 0; + if (mode->flags & DRM_MODE_FLAG_INTERLACE) { + vwin1_line_e = vwin1_line_s + (mode->vdisplay/2); + vwin2_line_s = vwin1_line_s + (mode->vtotal/2); + vwin2_line_e = vwin2_line_s + (mode->vdisplay/2); + vs2_pix_s = vs2_pix_e = hs_pix_s + (mode->htotal/2); + vs2_line_s = vs1_line_s + (mode->vtotal/2); + vs2_line_e = vs2_line_s + (mode->vsync_end - mode->vsync_start); + } div = 148500 / mode->clock; - DBG("clock=%d, div=%u", mode->clock, div); - DBG("hs_start=%u, hs_end=%u, line_start=%u, line_end=%u", - hs_start, hs_end, line_start, line_end); - DBG("vwin_start=%u, vwin_end=%u, de_start=%u, de_end=%u", - vwin_start, vwin_end, de_start, de_end); - DBG("ref_line=%u, ref_pix=%u, pix_start2=%u", - ref_line, ref_pix, pix_start2); - /* mute the audio FIFO: */ reg_set(encoder, REG_AIP_CNTRL_0, AIP_CNTRL_0_RST_FIFO); @@ -807,9 +833,6 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, reg_write(encoder, REG_PLL_SERIAL_2, PLL_SERIAL_2_SRL_NOSC(div) | PLL_SERIAL_2_SRL_PR(rep)); - reg_write16(encoder, REG_VS_PIX_STRT_2_MSB, pix_start2); - reg_write16(encoder, REG_VS_PIX_END_2_MSB, pix_start2); - /* set color matrix bypass flag: */ reg_set(encoder, REG_MAT_CONTRL, MAT_CONTRL_MAT_BP); @@ -818,46 +841,59 @@ tda998x_encoder_mode_set(struct drm_encoder *encoder, reg_clear(encoder, REG_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_MTHD); + /* + * Sync on rising HSYNC/VSYNC + */ reg_write(encoder, REG_VIP_CNTRL_3, 0); reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_SYNC_HS); + + /* + * TDA19988 requires high-active sync at input stage, + * so invert low-active sync provided by master encoder here + */ + if (mode->flags & DRM_MODE_FLAG_NHSYNC) + reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_H_TGL); if (mode->flags & DRM_MODE_FLAG_NVSYNC) reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_V_TGL); + /* + * Always generate sync polarity relative to input sync and + * revert input stage toggled sync at output stage + */ + reg = TBG_CNTRL_1_TGL_EN; if (mode->flags & DRM_MODE_FLAG_NHSYNC) - reg_set(encoder, REG_VIP_CNTRL_3, VIP_CNTRL_3_H_TGL); + reg |= TBG_CNTRL_1_H_TGL; + if (mode->flags & DRM_MODE_FLAG_NVSYNC) + reg |= TBG_CNTRL_1_V_TGL; + reg_write(encoder, REG_TBG_CNTRL_1, reg); reg_write(encoder, REG_VIDFORMAT, 0x00); - reg_write16(encoder, REG_NPIX_MSB, mode->htotal); - reg_write16(encoder, REG_NLINE_MSB, mode->vtotal); - reg_write16(encoder, REG_VS_LINE_STRT_1_MSB, line_start); - reg_write16(encoder, REG_VS_LINE_END_1_MSB, line_end); - reg_write16(encoder, REG_VS_PIX_STRT_1_MSB, hs_start); - reg_write16(encoder, REG_VS_PIX_END_1_MSB, hs_start); - reg_write16(encoder, REG_HS_PIX_START_MSB, hs_start); - reg_write16(encoder, REG_HS_PIX_STOP_MSB, hs_end); - reg_write16(encoder, REG_VWIN_START_1_MSB, vwin_start); - reg_write16(encoder, REG_VWIN_END_1_MSB, vwin_end); - reg_write16(encoder, REG_DE_START_MSB, de_start); - reg_write16(encoder, REG_DE_STOP_MSB, de_end); + reg_write16(encoder, REG_REFPIX_MSB, ref_pix); + reg_write16(encoder, REG_REFLINE_MSB, ref_line); + reg_write16(encoder, REG_NPIX_MSB, n_pix); + reg_write16(encoder, REG_NLINE_MSB, n_line); + reg_write16(encoder, REG_VS_LINE_STRT_1_MSB, vs1_line_s); + reg_write16(encoder, REG_VS_PIX_STRT_1_MSB, vs1_pix_s); + reg_write16(encoder, REG_VS_LINE_END_1_MSB, vs1_line_e); + reg_write16(encoder, REG_VS_PIX_END_1_MSB, vs1_pix_e); + reg_write16(encoder, REG_VS_LINE_STRT_2_MSB, vs2_line_s); + reg_write16(encoder, REG_VS_PIX_STRT_2_MSB, vs2_pix_s); + reg_write16(encoder, REG_VS_LINE_END_2_MSB, vs2_line_e); + reg_write16(encoder, REG_VS_PIX_END_2_MSB, vs2_pix_e); + reg_write16(encoder, REG_HS_PIX_START_MSB, hs_pix_s); + reg_write16(encoder, REG_HS_PIX_STOP_MSB, hs_pix_e); + reg_write16(encoder, REG_VWIN_START_1_MSB, vwin1_line_s); + reg_write16(encoder, REG_VWIN_END_1_MSB, vwin1_line_e); + reg_write16(encoder, REG_VWIN_START_2_MSB, vwin2_line_s); + reg_write16(encoder, REG_VWIN_END_2_MSB, vwin2_line_e); + reg_write16(encoder, REG_DE_START_MSB, de_pix_s); + reg_write16(encoder, REG_DE_STOP_MSB, de_pix_e); if (priv->rev == TDA19988) { /* let incoming pixels fill the active space (if any) */ reg_write(encoder, REG_ENABLE_SPACE, 0x01); } - reg_write16(encoder, REG_REFPIX_MSB, ref_pix); - reg_write16(encoder, REG_REFLINE_MSB, ref_line); - - reg = TBG_CNTRL_1_DWIN_DIS | /* HDCP off */ - TBG_CNTRL_1_VH_TGL_2; - /* - * It is questionable whether this is correct - the nxp driver - * does not set VH_TGL_2 and the below for all display modes. - */ - if (mode->flags & (DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC)) - reg |= TBG_CNTRL_1_VH_TGL_0; - reg_set(encoder, REG_TBG_CNTRL_1, reg); - /* must be last register set: */ reg_clear(encoder, REG_TBG_CNTRL_0, TBG_CNTRL_0_SYNC_ONCE); -- 1.7.2.5

1 2

[PULL] GEM CMA DMA-BUF
by Laurent Pinchart 10 Jun '13

10 Jun '13

Hi Dave, Here's a small pull request for v3.11 that contains the GEM CMA DMA-BUF support patches. The content is identical to "[PATCH v3 0/5] GEM CMA DMA-BUF support" with acks picked up from the list. The following changes since commit 328a4719b6a0930721b5f8d5c69993d3b6e3913f: drm_modes: videomode: add doubleclk flag (2013-06-03 18:42:35 +1000) are available in the git repository at: git://linuxtv.org/pinchartl/fbdev.git drm/next for you to fetch changes up to 71d7282a0f1abb488e5be4d154893579624bc683: drm: GEM CMA: Add DRM PRIME support (2013-06-08 09:14:05 +0200) ---------------------------------------------------------------- Laurent Pinchart (5): drm/gem: Split drm_gem_mmap() into object search and object mapping drm/omap: Use drm_gem_mmap_obj() to implement dma-buf mmap drm: GEM CMA: Split object creation into object alloc and DMA memory alloc drm: GEM CMA: Split object mapping into GEM mapping and CMA mapping drm: GEM CMA: Add DRM PRIME support drivers/gpu/drm/drm_gem.c | 83 +++++--- drivers/gpu/drm/drm_gem_cma_helper.c | 404 ++++++++++++++++++++++++++--- drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 32 +-- include/drm/drmP.h | 2 + include/drm/drm_gem_cma_helper.h | 9 + 5 files changed, 434 insertions(+), 96 deletions(-) -- Regards, Laurent Pinchart

2 1

[PATCH 0/2] drm/exynos: clean up logs for next tree
by Seung-Woo Kim 10 Jun '13

10 Jun '13

This patch set removes tracking logs and function name duplications. This is for the next tree and based on exynos-drm-next branch. YoungJun Cho (2): drm/exynos: Remove tracking log functions drm/exynos: Clean up logs for DRM_ERROR / DRM_DEBUG_KMS drivers/gpu/drm/exynos/exynos_drm_buf.c | 7 - drivers/gpu/drm/exynos/exynos_drm_connector.c | 17 -- drivers/gpu/drm/exynos/exynos_drm_core.c | 12 -- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 29 ---- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 6 - drivers/gpu/drm/exynos/exynos_drm_drv.c | 20 --- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 28 +---- drivers/gpu/drm/exynos/exynos_drm_fb.c | 10 -- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 8 - drivers/gpu/drm/exynos/exynos_drm_fimc.c | 129 +++++++---------- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 46 +------ drivers/gpu/drm/exynos/exynos_drm_gem.c | 23 --- drivers/gpu/drm/exynos/exynos_drm_gsc.c | 102 +++++-------- drivers/gpu/drm/exynos/exynos_drm_hdmi.c | 42 ----- drivers/gpu/drm/exynos/exynos_drm_ipp.c | 201 ++++++++---------------- drivers/gpu/drm/exynos/exynos_drm_plane.c | 16 -- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 53 +++----- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 40 +----- drivers/gpu/drm/exynos/exynos_hdmi.c | 42 +----- drivers/gpu/drm/exynos/exynos_mixer.c | 32 +---- 20 files changed, 193 insertions(+), 670 deletions(-) -- 1.7.4.1

2 3

[PATCH 0/4] drm/exynos: fimd: Add support for S3C6400/S3C6410
by Tomasz Figa 10 Jun '13

10 Jun '13

Much of the code in Exynos DRM subsystem is generic enough to use it for older (non-Exynos) Samsung SoCs as well, after minor modifications. This series starts adding support for previous SoCs to Exynos DRM by introducing S3C64xx support to exynos_drm_fimd driver. Adding support for remaining SoCs between S3C64xx and Exynos4 (S5PC100, S5P64x0 and S5PV210) should be rather straightforward, but at the moment I can test only on S3C6410, so I limited my changes only to this SoC. On Tiny6410 (Mini6410-compatible) board based on Samsung S3C6410 SoC, using my to-be-resubmitted patches for Device Tree support: Tested-by: Tomasz Figa <tomasz.figa(a)gmail.com> Tomasz Figa (4): drm/exynos: fimd: Hold pointer to driver data in context struct drm/exynos: fimd: Add support for FIMD versions without SHADOWCON register drm/exynos: fimd: Add support for FIMD variants with clock selection drm/exynos: fimd: Add support for S3C64xx SoCs drivers/gpu/drm/exynos/exynos_drm_fimd.c | 90 ++++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 22 deletions(-) -- 1.8.2.1

3 8

[vt_console_print/cirrus_dirty_update] WARNING: at kernel/mutex.c:858 mutex_trylock()
by Fengguang Wu 10 Jun '13

10 Jun '13

Greetings, I got the below dmesg and the first bad commit is commit 3d71c6ed43d838e593538176a9a59debe228cfb0 Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Tue Apr 2 12:33:01 2013 +0200 drm/ttm: convert to the reservation api Now that the code is compatible in semantics, flip the switch. Use ww_mutex instead of the homegrown implementation. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> [ 13.044298] printing local APIC contents on CPU#0/0: [ 13.044313] ------------[ cut here ]------------ [ 13.044367] WARNING: at /c/kernel-tests/src/tip/kernel/mutex.c:858 mutex_trylock+0x87/0x220() [ 13.044378] DEBUG_LOCKS_WARN_ON(in_interrupt()) [ 13.044378] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.10.0-rc4-00296-ga2963dd #20 [ 13.044379] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007 [ 13.044390] 0000000000000009 ffff88000de039f8 ffffffff81fc86d5 ffff88000de03a38 [ 13.044395] ffffffff810d511b ffff880000000018 ffff88000f33c690 0000000000000001 [ 13.044398] 00000000000003f0 ffff88000f4677c8 0000000000000000 ffff88000de03a98 [ 13.044400] Call Trace: [ 13.044412] <IRQ> [<ffffffff81fc86d5>] dump_stack+0x19/0x1b [ 13.044441] [<ffffffff810d511b>] warn_slowpath_common+0x6b/0x90 [ 13.044445] [<ffffffff810d51a6>] warn_slowpath_fmt+0x46/0x50 [ 13.044448] [<ffffffff81fd34d7>] mutex_trylock+0x87/0x220 [ 13.044482] [<ffffffff8186484d>] cirrus_dirty_update+0x1cd/0x330 [ 13.044486] [<ffffffff818649e8>] cirrus_imageblit+0x38/0x50 [ 13.044506] [<ffffffff8165782e>] soft_cursor+0x22e/0x240 [ 13.044510] [<ffffffff81656c31>] bit_cursor+0x581/0x5b0 [ 13.044525] [<ffffffff815de9f4>] ? vsnprintf+0x124/0x670 [ 13.044529] [<ffffffff81651333>] ? get_color.isra.16+0x43/0x130 [ 13.044532] [<ffffffff81653fca>] fbcon_cursor+0x18a/0x1d0 [ 13.044535] [<ffffffff816566b0>] ? update_attr.isra.2+0xa0/0xa0 [ 13.044556] [<ffffffff81754b82>] hide_cursor+0x32/0xa0 [ 13.044565] [<ffffffff81755bd3>] vt_console_print+0x103/0x3b0 [ 13.044569] [<ffffffff810d58ac>] ? print_time+0x9c/0xb0 [ 13.044576] [<ffffffff810d5960>] ? print_prefix+0xa0/0xc0 [ 13.044580] [<ffffffff810d63f6>] call_console_drivers.constprop.6+0x146/0x1f0 [ 13.044593] [<ffffffff815f9b38>] ? do_raw_spin_unlock+0xc8/0x100 [ 13.044597] [<ffffffff810d6f27>] console_unlock+0x2f7/0x460 [ 13.044600] [<ffffffff810d787a>] vprintk_emit+0x59a/0x5e0 [ 13.044615] [<ffffffff81fb676c>] printk+0x4d/0x4f [ 13.044650] [<ffffffff82ba5511>] print_local_APIC+0x28/0x41c [ 13.044672] [<ffffffff8114db55>] generic_smp_call_function_single_interrupt+0x145/0x2b0 [ 13.044688] [<ffffffff8106f9e7>] smp_call_function_single_interrupt+0x27/0x40 [ 13.044697] [<ffffffff81fd8f72>] call_function_single_interrupt+0x72/0x80 [ 13.044707] <EOI> [<ffffffff81078166>] ? native_safe_halt+0x6/0x10 [ 13.044717] [<ffffffff811425cd>] ? trace_hardirqs_on+0xd/0x10 [ 13.044738] [<ffffffff8104f669>] default_idle+0x59/0x120 [ 13.044742] [<ffffffff810501e8>] arch_cpu_idle+0x18/0x40 [ 13.044754] [<ffffffff811320c5>] cpu_startup_entry+0x235/0x410 [ 13.044763] [<ffffffff81f9e781>] rest_init+0xd1/0xe0 [ 13.044766] [<ffffffff81f9e6b5>] ? rest_init+0x5/0xe0 [ 13.044778] [<ffffffff82b93ec2>] start_kernel+0x425/0x493 [ 13.044781] [<ffffffff82b93810>] ? repair_env_string+0x5e/0x5e [ 13.044786] [<ffffffff82b93595>] x86_64_start_reservations+0x2a/0x2c [ 13.044789] [<ffffffff82b93688>] x86_64_start_kernel+0xf1/0x100 [ 13.044799] ---[ end trace 113ad28772af4058 ]--- git bisect start a2963dd6085970cbf5e09ab67fd57b2cb396f3b9 v3.9 -- git bisect good 73287a43cc79ca06629a88d1a199cd283f42456a # 10 2013-06-05 22:52:59 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next git bisect good 2e378f3eebd28feefbb1f9953834a5a19482f053 # 10 2013-06-05 23:11:57 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 git bisect good a1f0bcccffe508b36f8eb0bd39771d4bedc683a8 # 10 2013-06-05 23:23:44 Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze git bisect good 72dd4e7980bf584fa11db4f00e38d5cf956a8856 # 10 2013-06-06 00:45:04 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm git bisect good 279838960484fa22d903086eea743a6b6700647d # 10 2013-06-06 00:55:21 powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges git bisect good a1f2cc73c762868435ae6ec9126bb2240337c61c # 10 2013-06-06 01:20:30 drm/i915: add I915_PARAM_HAS_VEBOX to i915_getparam git bisect good 6cf3c736200e3924d8ce6b37e5006a4598b9236d # 10 2013-06-06 02:33:37 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs git bisect good 0e32fde96bb9c1fa8fa477e52c1d6ae2f4995cea # 10 2013-06-06 04:09:34 Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes git bisect good d7fe0cc0f2e0b302b247caa4306915a06218e0be # 10 2013-06-06 04:18:24 drm/i915: Fix DSPCLK_GATE_D for VLV git bisect good f0e07e4668afdea1755a1e28a9649261afe980b3 # 10 2013-06-06 04:28:12 drm/nouveau: make flipping lockdep safe git bisect good 979c3c0bdb21017cc6e00d20349f0ee0347dd5a7 # 10 2013-06-06 05:36:07 Merge remote-tracking branch 'drm-exynos/exynos-drm-next' into devel-cairo-x86_64-201306051657 git bisect bad 37fbcd59bdc8c309bc98957ff51021bbdff45606 # 0 2013-06-06 05:41:47 drm/mgag200: inline reservations git bisect bad 1e9e9d11aa358123dd721dba5075e23c03b49957 # 0 2013-06-06 05:51:10 drm/ast: inline reservations git bisect bad 3d71c6ed43d838e593538176a9a59debe228cfb0 # 0 2013-06-06 05:57:39 drm/ttm: convert to the reservation api git bisect good f0e07e4668afdea1755a1e28a9649261afe980b3 # 30 2013-06-06 07:16:11 drm/nouveau: make flipping lockdep safe git bisect bad a2963dd6085970cbf5e09ab67fd57b2cb396f3b9 # 0 2013-06-06 07:16:15 Merge remote-tracking branch 'mlankhorst/for-airlied' into devel-cairo-x86_64-201306051657 git bisect good f8f126f22a32f2f2b3b61bd5b8a3d51a2cac09ec # 30 2013-06-06 07:19:56 Add linux-next specific files for 20130605 Thanks, Fengguang

3 6

[PATCH] drm/cirrus: do not attempt to acquire a reservation while in an interrupt handler
by Maarten Lankhorst 10 Jun '13

10 Jun '13

Mutexes should not be acquired in interrupt context. While the trylock fastpath is arguably safe on all implementations, the slowpath unlock path definitely isn't. This fixes the following lockdep splat: [ 13.044313] ------------[ cut here ]------------ [ 13.044367] WARNING: at /c/kernel-tests/src/tip/kernel/mutex.c:858 mutex_trylock+0x87/0x220() [ 13.044378] DEBUG_LOCKS_WARN_ON(in_interrupt()) [ 13.044378] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.10.0-rc4-00296-ga2963dd #20 [ 13.044379] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007 [ 13.044390] 0000000000000009 ffff88000de039f8 ffffffff81fc86d5 ffff88000de03a38 [ 13.044395] ffffffff810d511b ffff880000000018 ffff88000f33c690 0000000000000001 [ 13.044398] 00000000000003f0 ffff88000f4677c8 0000000000000000 ffff88000de03a98 [ 13.044400] Call Trace: [ 13.044412] <IRQ> [<ffffffff81fc86d5>] dump_stack+0x19/0x1b [ 13.044441] [<ffffffff810d511b>] warn_slowpath_common+0x6b/0x90 [ 13.044445] [<ffffffff810d51a6>] warn_slowpath_fmt+0x46/0x50 [ 13.044448] [<ffffffff81fd34d7>] mutex_trylock+0x87/0x220 [ 13.044482] [<ffffffff8186484d>] cirrus_dirty_update+0x1cd/0x330 [ 13.044486] [<ffffffff818649e8>] cirrus_imageblit+0x38/0x50 [ 13.044506] [<ffffffff8165782e>] soft_cursor+0x22e/0x240 [ 13.044510] [<ffffffff81656c31>] bit_cursor+0x581/0x5b0 [ 13.044525] [<ffffffff815de9f4>] ? vsnprintf+0x124/0x670 [ 13.044529] [<ffffffff81651333>] ? get_color.isra.16+0x43/0x130 [ 13.044532] [<ffffffff81653fca>] fbcon_cursor+0x18a/0x1d0 [ 13.044535] [<ffffffff816566b0>] ? update_attr.isra.2+0xa0/0xa0 [ 13.044556] [<ffffffff81754b82>] hide_cursor+0x32/0xa0 [ 13.044565] [<ffffffff81755bd3>] vt_console_print+0x103/0x3b0 [ 13.044569] [<ffffffff810d58ac>] ? print_time+0x9c/0xb0 [ 13.044576] [<ffffffff810d5960>] ? print_prefix+0xa0/0xc0 [ 13.044580] [<ffffffff810d63f6>] call_console_drivers.constprop.6+0x146/0x1f0 [ 13.044593] [<ffffffff815f9b38>] ? do_raw_spin_unlock+0xc8/0x100 [ 13.044597] [<ffffffff810d6f27>] console_unlock+0x2f7/0x460 [ 13.044600] [<ffffffff810d787a>] vprintk_emit+0x59a/0x5e0 [ 13.044615] [<ffffffff81fb676c>] printk+0x4d/0x4f [ 13.044650] [<ffffffff82ba5511>] print_local_APIC+0x28/0x41c [ 13.044672] [<ffffffff8114db55>] generic_smp_call_function_single_interrupt+0x145/0x2b0 [ 13.044688] [<ffffffff8106f9e7>] smp_call_function_single_interrupt+0x27/0x40 [ 13.044697] [<ffffffff81fd8f72>] call_function_single_interrupt+0x72/0x80 [ 13.044707] <EOI> [<ffffffff81078166>] ? native_safe_halt+0x6/0x10 [ 13.044717] [<ffffffff811425cd>] ? trace_hardirqs_on+0xd/0x10 [ 13.044738] [<ffffffff8104f669>] default_idle+0x59/0x120 [ 13.044742] [<ffffffff810501e8>] arch_cpu_idle+0x18/0x40 [ 13.044754] [<ffffffff811320c5>] cpu_startup_entry+0x235/0x410 [ 13.044763] [<ffffffff81f9e781>] rest_init+0xd1/0xe0 [ 13.044766] [<ffffffff81f9e6b5>] ? rest_init+0x5/0xe0 [ 13.044778] [<ffffffff82b93ec2>] start_kernel+0x425/0x493 [ 13.044781] [<ffffffff82b93810>] ? repair_env_string+0x5e/0x5e [ 13.044786] [<ffffffff82b93595>] x86_64_start_reservations+0x2a/0x2c [ 13.044789] [<ffffffff82b93688>] x86_64_start_kernel+0xf1/0x100 [ 13.044799] ---[ end trace 113ad28772af4058 ]--- Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c index 3541b56..b27e956 100644 --- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c @@ -25,7 +25,7 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev, struct cirrus_bo *bo; int src_offset, dst_offset; int bpp = (afbdev->gfb.base.bits_per_pixel + 7)/8; - int ret; + int ret = -EBUSY; bool unmap = false; bool store_for_later = false; int x2, y2; @@ -39,7 +39,8 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev, * then the BO is being moved and we should * store up the damage until later. */ - ret = cirrus_bo_reserve(bo, true); + if (!in_interrupt()) + ret = cirrus_bo_reserve(bo, true); if (ret) { if (ret != -EBUSY) return;

1 0

[RFC][PATCH 0/2] dma-buf: add importer private data for reimporting
by Seung-Woo Kim 10 Jun '13

10 Jun '13

importer private data in dma-buf attachment can be used by importer to reimport same dma-buf. Seung-Woo Kim (2): dma-buf: add importer private data to attachment drm/prime: find gem object from the reimported dma-buf drivers/base/dma-buf.c | 31 ++++++++++++++++++++++++++++ drivers/gpu/drm/drm_prime.c | 19 ++++++++++++---- drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 1 + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 1 + drivers/gpu/drm/udl/udl_gem.c | 1 + include/linux/dma-buf.h | 4 +++ 6 files changed, 52 insertions(+), 5 deletions(-) -- 1.7.4.1

6 15

← Newer
1
...
64
65
66
67
68
69
70
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2013