dri-devel March 2014

dri-devel@lists.freedesktop.org

144 participants
926 discussions

[Q] tilcdc and FBIO_WAITFORVSYNC
by Robert Kuhn 13 Mar '14

13 Mar '14

Hi, I am using a Beaglebone black with a HDMI monitor. As far as I see the beaglebone uses the tilcdc driver for framebuffer (I am using the linux-dev-3.13.6-bone7 kernel). When I am correct this driver does not implement the FBIO_WAITFORVSYNC ioctl. Is there any other way to get the vsync in userspace or in a kernel module? Sorry for my poor english and thanks for every answer - Robert

2 2

[PATCH 1/2] drm/exynos: hdmi: consider APB PHY
by Inki Dae 13 Mar '14

13 Mar '14

This patch returns error in case of using APB PHY. Exynos5420 SoC and maybe later would use APB PHY instead of I2C PHY so such case should be considered. Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index e6ce363..b695398 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -63,6 +63,11 @@ enum hdmi_type { HDMI_TYPE14, }; +struct hdmi_driver_data { + unsigned int type; + unsigned int is_apb_phy:1; +}; + struct hdmi_resources { struct clk *hdmi; struct clk *sclk_hdmi; @@ -197,6 +202,14 @@ struct hdmiphy_config { u8 conf[32]; }; +struct hdmi_driver_data exynos4212_hdmi_driver_data = { + .type = HDMI_TYPE14, +}; + +struct hdmi_driver_data exynos5_hdmi_driver_data = { + .type = HDMI_TYPE14, +}; + /* list of phy config settings */ static const struct hdmiphy_config hdmiphy_v13_configs[] = { { @@ -1959,10 +1972,10 @@ err_data: static struct of_device_id hdmi_match_types[] = { { .compatible = "samsung,exynos5-hdmi", - .data = (void *)HDMI_TYPE14, + .data = &exynos5_hdmi_driver_data, }, { .compatible = "samsung,exynos4212-hdmi", - .data = (void *)HDMI_TYPE14, + .data = &exynos4212_hdmi_driver_data, }, { /* end node */ } @@ -1976,6 +1989,7 @@ static int hdmi_probe(struct platform_device *pdev) struct resource *res; const struct of_device_id *match; struct device_node *ddc_node, *phy_node; + struct hdmi_driver_data *drv_data; int ret; if (!dev->of_node) @@ -1996,7 +2010,9 @@ static int hdmi_probe(struct platform_device *pdev) match = of_match_node(hdmi_match_types, dev->of_node); if (!match) return -ENODEV; - hdata->type = (enum hdmi_type)match->data; + + drv_data = (struct hdmi_driver_data *)match->data; + hdata->type = drv_data->type; hdata->hpd_gpio = pdata->hpd_gpio; hdata->dev = dev; @@ -2030,6 +2046,10 @@ static int hdmi_probe(struct platform_device *pdev) return -ENODEV; } + /* Not support APB PHY yet. */ + if (drv_data->is_apb_phy) + return -EPERM; + /* hdmiphy i2c driver */ phy_node = of_parse_phandle(dev->of_node, "phy", 0); if (!phy_node) { -- 1.7.9.5

1 1

[PULL] vmwgfx-fixes-3.14
by Thomas Hellstrom 13 Mar '14

13 Mar '14

Dave, A single fix for the new device code. The following changes since commit 45db98e54242f3ae94bdcfbfe754e743252eb168: Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2014-03-07 09:27:22 +1000) are available in the git repository at: git://people.freedesktop.org/~thomash/linux tags/vmwgfx-fixes-3.14-2014-03-13 for you to fetch changes up to 4b0c82529b92cda4723cf1d09e1e2ee9b9ae96f1: drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode (2014-03-13 07:51:32 +0100) ---------------------------------------------------------------- Pull request of 2014-03-13 ---------------------------------------------------------------- Thomas Hellstrom (1): drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

1 0

[PATCH] drm/exynos: set the active aspect ratio as per mode
by Shirish S 13 Mar '14

13 Mar '14

now that the drm_display_mode also provides aspect ratio for all resolutions, this patch adds its usage to set the active aspect ratio of AVI info frame packets as per CEA-861-D standard's Table 9. This is also needed to abide by the 7-27 compliance test of HDMI. Signed-off-by: Shirish S <s.shirish(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index c021ddc..8aca52a 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -53,8 +53,6 @@ /* AVI header and aspect ratio */ #define HDMI_AVI_VERSION 0x02 #define HDMI_AVI_LENGTH 0x0D -#define AVI_PIC_ASPECT_RATIO_16_9 (2 << 4) -#define AVI_SAME_AS_PIC_ASPECT_RATIO 8 /* AUI header info */ #define HDMI_AUI_VERSION 0x01 @@ -65,6 +63,12 @@ enum hdmi_type { HDMI_TYPE14, }; +enum active_aspect_ratio { + AVI_SAME_AS_PIC_ASPECT_RATIO = 8, + AVI_4_3_Center_RATIO, + AVI_16_9_Center_RATIO, +}; + struct hdmi_resources { struct clk *hdmi; struct clk *sclk_hdmi; @@ -162,6 +166,7 @@ struct hdmi_v14_conf { struct hdmi_conf_regs { int pixel_clock; int cea_video_id; + enum hdmi_picture_aspect aspect_ratio; union { struct hdmi_v13_conf v13_conf; struct hdmi_v14_conf v14_conf; @@ -668,7 +673,6 @@ static void hdmi_reg_infoframe(struct hdmi_context *hdata, { u32 hdr_sum; u8 chksum; - u32 aspect_ratio; u32 mod; u32 vic; @@ -697,10 +701,25 @@ static void hdmi_reg_infoframe(struct hdmi_context *hdata, AVI_ACTIVE_FORMAT_VALID | AVI_UNDERSCANNED_DISPLAY_VALID); - aspect_ratio = AVI_PIC_ASPECT_RATIO_16_9; - - hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), aspect_ratio | + /* + * Set the aspect ratio as per the mode, mentioned in + * Table 9 AVI InfoFrame Data Byte 2 of CEA-861-D Standard + */ + switch (hdata->mode_conf.aspect_ratio) { + case HDMI_PICTURE_ASPECT_4_3: + hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), aspect_ratio | + AVI_4_3_Center_RATIO); + break; + case HDMI_PICTURE_ASPECT_16_9: + hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), aspect_ratio | + AVI_16_9_Center_RATIO); + break; + case HDMI_PICTURE_ASPECT_NONE: + default: + hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(2), aspect_ratio | AVI_SAME_AS_PIC_ASPECT_RATIO); + break; + } vic = hdata->mode_conf.cea_video_id; hdmi_reg_writeb(hdata, HDMI_AVI_BYTE(4), vic); @@ -1421,6 +1440,7 @@ static void hdmi_v13_mode_set(struct hdmi_context *hdata, hdata->mode_conf.cea_video_id = drm_match_cea_mode((struct drm_display_mode *)m); hdata->mode_conf.pixel_clock = m->clock * 1000; + hdata->mode_conf.aspect_ratio = m->picture_aspect_ratio; hdmi_set_reg(core->h_blank, 2, m->htotal - m->hdisplay); hdmi_set_reg(core->h_v_line, 3, (m->htotal << 12) | m->vtotal); @@ -1517,6 +1537,7 @@ static void hdmi_v14_mode_set(struct hdmi_context *hdata, hdata->mode_conf.cea_video_id = drm_match_cea_mode((struct drm_display_mode *)m); hdata->mode_conf.pixel_clock = m->clock * 1000; + hdata->mode_conf.aspect_ratio = m->picture_aspect_ratio; hdmi_set_reg(core->h_blank, 2, m->htotal - m->hdisplay); hdmi_set_reg(core->v_line, 2, m->vtotal); -- 1.7.10.4

3 2

[PATCH] drm/exynos: add phy settings for RB resolutions
by Shirish S 13 Mar '14

13 Mar '14

below is list of pixel clocks and resoluitons this patch adds: 71000000 - 1280x800@60Hz RB 73250000 - 800x600@120Hz RB 88750000 - 1440x900@60Hz RB 115500000 - 1024x768@120Hz RB 119000000 - 1680x1050@60Hz RB without these pixel clocks' support the mentioned resolutions fail to be detected in exynos5250. Signed-off-by: Shirish S <s.shirish(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_hdmi.c | 45 ++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index c021ddc..650ce48 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -303,6 +303,24 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = { }, }, { + .pixel_clock = 71000000, + .conf = { + 0x01, 0x91, 0x1E, 0x15, 0x40, 0x3C, 0xCE, 0x08, + 0x04, 0x20, 0xB2, 0xD8, 0x45, 0xA0, 0xAC, 0x80, + 0x06, 0x80, 0x11, 0x04, 0x02, 0x22, 0x44, 0x86, + 0x54, 0xAD, 0x24, 0x01, 0x00, 0x00, 0x01, 0x80, + }, + }, + { + .pixel_clock = 73250000, + .conf = { + 0x01, 0xD1, 0x1F, 0x15, 0x40, 0x18, 0xE9, 0x08, + 0x02, 0xA0, 0xB7, 0xD8, 0x45, 0xA0, 0xAC, 0x80, + 0x06, 0x80, 0x11, 0x04, 0x02, 0x22, 0x44, 0x86, + 0x54, 0xA8, 0x24, 0x01, 0x00, 0x00, 0x01, 0x80, + }, + }, + { .pixel_clock = 74176000, .conf = { 0x01, 0xd1, 0x3e, 0x35, 0x40, 0x5b, 0xde, 0x08, @@ -330,6 +348,15 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = { }, }, { + .pixel_clock = 88750000, + .conf = { + 0x01, 0x91, 0x25, 0x17, 0x40, 0x30, 0xFE, 0x08, + 0x06, 0x20, 0xDE, 0xD8, 0x45, 0xA0, 0xAC, 0x80, + 0x06, 0x80, 0x11, 0x04, 0x02, 0x22, 0x44, 0x86, + 0x54, 0x8A, 0x24, 0x01, 0x00, 0x00, 0x01, 0x80, + }, + }, + { .pixel_clock = 106500000, .conf = { 0x01, 0xd1, 0x2c, 0x12, 0x40, 0x0c, 0x09, 0x08, @@ -348,6 +375,24 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = { }, }, { + .pixel_clock = 115500000, + .conf = { + 0x01, 0xD1, 0x30, 0x1A, 0x40, 0x40, 0x10, 0x04, + 0x04, 0xA0, 0x21, 0xD9, 0x45, 0xA0, 0xAC, 0x80, + 0x06, 0x80, 0x11, 0x04, 0x02, 0x22, 0x44, 0x86, + 0x54, 0xAA, 0x25, 0x03, 0x00, 0x00, 0x01, 0x80, + }, + }, + { + .pixel_clock = 119000000, + .conf = { + 0x01, 0x91, 0x32, 0x14, 0x40, 0x60, 0xD8, 0x08, + 0x06, 0x20, 0x2A, 0xD9, 0x45, 0xA0, 0xAC, 0x80, + 0x06, 0x80, 0x11, 0x04, 0x02, 0x22, 0x44, 0x86, + 0x54, 0x9D, 0x25, 0x03, 0x00, 0x00, 0x01, 0x80, + }, + }, + { .pixel_clock = 146250000, .conf = { 0x01, 0xd1, 0x3d, 0x15, 0x40, 0x18, 0xfd, 0x08, -- 1.7.10.4

3 2

[PATCH 1/3] nouveau: cleanup error handling during nouveau_device_wrap
by Emil Velikov 13 Mar '14

13 Mar '14

In theory it's possible for any of the nouveau_getparam calls to fail whist the last one being successful. Thus at least one of the following (hard requirements) drmVersion, chipset and vram/gart memory size will be filled with garbage and sent to the userspace drivers. Signed-off-by: Emil Velikov <emil.l.velikov(a)gmail.com> --- nouveau/nouveau.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/nouveau/nouveau.c b/nouveau/nouveau.c index ee7893b..d6013db 100644 --- a/nouveau/nouveau.c +++ b/nouveau/nouveau.c @@ -88,27 +88,32 @@ nouveau_device_wrap(int fd, int close, struct nouveau_device **pdev) nvdev->base.fd = fd; ver = drmGetVersion(fd); - if (ver) dev->drm_version = (ver->version_major << 24) | - (ver->version_minor << 8) | - ver->version_patchlevel; + if (!ver) { + ret = -errno; + goto error; + } + + dev->drm_version = (ver->version_major << 24) | + (ver->version_minor << 8) | + ver->version_patchlevel; drmFreeVersion(ver); if ( dev->drm_version != 0x00000010 && (dev->drm_version < 0x01000000 || dev->drm_version >= 0x02000000)) { - nouveau_device_del(&dev); - return -EINVAL; + ret = -EINVAL; + goto error; } ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_CHIPSET_ID, &chipset); - if (ret == 0) + if (ret) + goto error; ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_FB_SIZE, &vram); - if (ret == 0) + if (ret) + goto error; ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_AGP_SIZE, &gart); - if (ret) { - nouveau_device_del(&dev); - return ret; - } + if (ret) + goto error; ret = nouveau_getparam(dev, NOUVEAU_GETPARAM_HAS_BO_USAGE, &bousage); if (ret == 0) @@ -139,6 +144,9 @@ nouveau_device_wrap(int fd, int close, struct nouveau_device **pdev) *pdev = &nvdev->base; return 0; +error: + nouveau_device_del(&dev); + return -ret; } int -- 1.9.0

3 10

[pull] radeon fixes 3.14
by Alex Deucher 12 Mar '14

12 Mar '14

Hi Dave, A few more radeon fixes. The following changes since commit 45db98e54242f3ae94bdcfbfe754e743252eb168: Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2014-03-07 09:27:22 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-3.14 for you to fetch changes up to 07ae78c9798b79bad3d3adf983c94ba23fde54d4: drm/radeon/cik: stop the sdma engines in the enable() function (2014-03-12 15:53:25 -0400) ---------------------------------------------------------------- Alex Deucher (3): drm/radeon: fix runpm disabling on non-PX harder drm/radeon/cik: properly set sdma ring status on disable drm/radeon/cik: stop the sdma engines in the enable() function drivers/gpu/drm/radeon/cik_sdma.c | 14 +++++++------- drivers/gpu/drm/radeon/radeon_kms.c | 10 +++++++++- 2 files changed, 16 insertions(+), 8 deletions(-)

1 1

[PATCH] drm/radeon/cik: properly set compute ring status on disable
by Alex Deucher 12 Mar '14

12 Mar '14

When we disable the rings, set the status properly. If not other code pathes may try and use the rings which are not functional at this point. Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/cik.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index e22be84..bbb1784 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -4134,8 +4134,11 @@ static void cik_cp_compute_enable(struct radeon_device *rdev, bool enable) { if (enable) WREG32(CP_MEC_CNTL, 0); - else + else { WREG32(CP_MEC_CNTL, (MEC_ME1_HALT | MEC_ME2_HALT)); + rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX].ready = false; + rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX].ready = false; + } udelay(50); } -- 1.8.3.1

1 0

[PATCH 1/2] drm/radeon/cik: properly set sdma ring status on disable
by Alex Deucher 12 Mar '14

12 Mar '14

When we disable the rings, set the status properly. If not other code pathes may try and use the rings which are not functional at this point. Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/cik_sdma.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/radeon/cik_sdma.c b/drivers/gpu/drm/radeon/cik_sdma.c index 1ecb3f1..5d7a5fa 100644 --- a/drivers/gpu/drm/radeon/cik_sdma.c +++ b/drivers/gpu/drm/radeon/cik_sdma.c @@ -264,6 +264,8 @@ static void cik_sdma_gfx_stop(struct radeon_device *rdev) WREG32(SDMA0_GFX_RB_CNTL + reg_offset, rb_cntl); WREG32(SDMA0_GFX_IB_CNTL + reg_offset, 0); } + rdev->ring[R600_RING_TYPE_DMA_INDEX].ready = false; + rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready = false; } /** -- 1.8.3.1

1 1

[PULL] ttm-fixes-3.14 v2
by Thomas Hellstrom 12 Mar '14

12 Mar '14

Dave, Rob's fix for oops on invalidate_caches() and a fix for a performance regression. /Thomas The following changes since commit 45db98e54242f3ae94bdcfbfe754e743252eb168: Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2014-03-07 09:27:22 +1000) are available in the git repository at: git://people.freedesktop.org/~thomash/linux tags/ttm-fixes-3.14-2014-03-12 for you to fetch changes up to 9ef7506f7eff3fc42724269f62e30164c141661f: drm/ttm: don't oops if no invalidate_caches() (2014-03-12 19:53:51 +0100) ---------------------------------------------------------------- Second pull request of 2014-03-12. The first one was requested to be canceled. ---------------------------------------------------------------- Rob Clark (1): drm/ttm: don't oops if no invalidate_caches() Thomas Hellstrom (1): drm/ttm: Work around performance regression with VM_PFNMAP drivers/gpu/drm/ttm/ttm_bo.c | 8 +++++--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +++++++----- 2 files changed, 12 insertions(+), 8 deletions(-)

1 0

← Newer
1
...
79
80
81
82
83
84
85
...
93
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2014