dri-devel November 2012

dri-devel@lists.freedesktop.org

126 participants
797 discussions

[PATCH v2 RESEND] drm/pci: add missing variable initialization
by Jingoo Han 29 Nov '12

29 Nov '12

Fixed build warning as below: drivers/gpu/drm/drm_pci.c: In function 'drm_pcie_get_speed_cap_mask': drivers/gpu/drm/drm_pci.c:496:9: warning: 'lnkcap' may be used uninitialized in this function [-Wuninitialized] drivers/gpu/drm/drm_pci.c:497:10: warning: 'lnkcap2' may be used uninitialized in this function [-Wuninitialized] Signed-off-by: Jingoo Han <jg1.han(a)samsung.com> --- drivers/gpu/drm/drm_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index ba33144..754bc96 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -470,7 +470,7 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask) { struct pci_dev *root; int pos; - u32 lnkcap, lnkcap2; + u32 lnkcap = 0, lnkcap2 = 0; *mask = 0; if (!dev->pdev) -- 1.7.2.5

1 0

[PATCH] drm/ttm: do not try to preserve caching state
by j.glisse＠gmail.com 28 Nov '12

28 Nov '12

From: Jerome Glisse <jglisse(a)redhat.com> It make no sense to preserve caching state especialy when moving from vram to system. It burden the page allocator to match the vram caching (often WC) which just burn CPU cycle for no good reasons. Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- drivers/gpu/drm/ttm/ttm_bo.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index bf6e4b5..39dcc58 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -896,19 +896,12 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo, } static uint32_t ttm_bo_select_caching(struct ttm_mem_type_manager *man, - uint32_t cur_placement, uint32_t proposed_placement) { uint32_t caching = proposed_placement & TTM_PL_MASK_CACHING; uint32_t result = proposed_placement & ~TTM_PL_MASK_CACHING; - /** - * Keep current caching if possible. - */ - - if ((cur_placement & caching) != 0) - result |= (cur_placement & caching); - else if ((man->default_caching & caching) != 0) + if ((man->default_caching & caching) != 0) result |= man->default_caching; else if ((TTM_PL_FLAG_CACHED & caching) != 0) result |= TTM_PL_FLAG_CACHED; @@ -978,8 +971,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, if (!type_ok) continue; - cur_flags = ttm_bo_select_caching(man, bo->mem.placement, - cur_flags); + cur_flags = ttm_bo_select_caching(man, cur_flags); /* * Use the access and other non-mapping-related flag bits from * the memory placement flags to the current flags @@ -1023,8 +1015,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, &cur_flags)) continue; - cur_flags = ttm_bo_select_caching(man, bo->mem.placement, - cur_flags); + cur_flags = ttm_bo_select_caching(man, cur_flags); /* * Use the access and other non-mapping-related flag bits from * the memory placement flags to the current flags -- 1.7.11.7

3 4

[git pull] drm fixes
by Dave Airlie 28 Nov '12

28 Nov '12

Hi Linus, I let this go a few days longer than I normally do since you looked to be having lots of fun with various underwater things, so this is an all over set of fixes, nothing really stands out, nearly all of them fix a regression in one driver or another, or some sort of oops. its vmware/nouveua/radeon/intel/ttm scattered. Dave. The following changes since commit 77b67063bb6bce6d475e910d3b886a606d0d91f7: Linux 3.7-rc5 (2012-11-11 13:44:33 +0100) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes Akinobu Mita (1): drm/ttm: remove unneeded preempt_disable/enable Alex Deucher (3): drm/radeon: fix logic error in atombios_encoders.c drm/radeon: properly track the crtc not_enabled case evergreen_mc_stop() drm/radeon: add new SI pci id Dan Carpenter (1): vmwgfx: return an -EFAULT if copy_to_user() fails Dave Airlie (5): Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Jani Nikula (3): drm/i915/crt: fix DPMS standby and suspend mode handling drm/i915/sdvo: clean up connectors on intel_sdvo_init() failures drm/i915: do not ignore eDP bpc settings from vbt Kelly Doran (1): drm/nvc0/disp: fix thinko in vblank regression fix.. Maarten Lankhorst (2): drm/nouveau: add missing pll_calc calls drm/nouveau: use the correct fence implementation for nv50 Marcin Slusarz (3): drm/nv40: allocate ctxprog with kmalloc drm/nouveau: fix crash with noaccel=1 drm/nouveau/bios: fix DCB v1.5 parsing Paul Bolle (1): radeon: add AGPMode 1 quirk for RV250 Zhao Yakui (1): ttm: Clear the ttm page allocated from high memory zone correctly drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 11 ++++++++++ drivers/gpu/drm/i915/intel_sdvo.c | 22 +++++++++++++++++-- drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 19 ++++++++++------ .../gpu/drm/nouveau/core/engine/graph/ctxnv40.c | 12 ++++++++-- drivers/gpu/drm/nouveau/core/engine/graph/nv40.c | 4 ++- drivers/gpu/drm/nouveau/core/engine/graph/nv40.h | 2 +- drivers/gpu/drm/nouveau/core/include/core/object.h | 14 ++++++++---- .../gpu/drm/nouveau/core/include/subdev/clock.h | 3 +- drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c | 19 +++++++++++++++++ drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c | 1 + drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 +++ drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 2 + drivers/gpu/drm/radeon/radeon_agp.c | 5 +++- drivers/gpu/drm/ttm/ttm_page_alloc.c | 5 +++- drivers/gpu/drm/ttm/ttm_tt.c | 4 --- drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 2 + include/drm/drm_pciids.h | 1 + 21 files changed, 108 insertions(+), 31 deletions(-)

3 3

[PATCH v3] drm: tegra: Add maintainers entry
by Thierry Reding 28 Nov '12

28 Nov '12

Add myself as the maintainer of the NVIDIA Tegra DRM driver. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> Acked-by: Stephen Warren <swarren(a)nvidia.com> --- Changes in v3: - add linux-tegra mailing list Changes in v2: - insert entry in alphabetical order - fix reference to driver directory - fix reference to git tree MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0cfc0f1..84062c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2549,6 +2549,15 @@ S: Supported F: drivers/gpu/drm/exynos F: include/drm/exynos* +DRM DRIVERS FOR NVIDIA TEGRA +M: Thierry Reding <thierry.reding(a)avionic-design.de> +L: dri-devel(a)lists.freedesktop.org +L: linux-tegra(a)vger.kernel.org +T: git git://gitorious.org/thierryreding/linux.git +S: Maintained +F: drivers/gpu/drm/tegra/ +F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt + DSCC4 DRIVER M: Francois Romieu <romieu(a)fr.zoreil.com> L: netdev(a)vger.kernel.org -- 1.8.0.1

1 0

[PATCH v2] drm: tegra: Add maintainers entry
by Thierry Reding 28 Nov '12

28 Nov '12

Add myself as the maintainer of the NVIDIA Tegra DRM driver. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> --- Changes in v2: - insert entry in alphabetical order - fix reference to driver directory - fix reference to git tree MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0cfc0f1..b085409 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2549,6 +2549,14 @@ S: Supported F: drivers/gpu/drm/exynos F: include/drm/exynos* +DRM DRIVERS FOR NVIDIA TEGRA +M: Thierry Reding <thierry.reding(a)avionic-design.de> +L: dri-devel(a)lists.freedesktop.org +T: git git://gitorious.org/thierryreding/linux.git +S: Maintained +F: drivers/gpu/drm/tegra/ +F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt + DSCC4 DRIVER M: Francois Romieu <romieu(a)fr.zoreil.com> L: netdev(a)vger.kernel.org -- 1.8.0.1

2 2

[PATCH] drm: tegra: Add maintainers entry
by Thierry Reding 28 Nov '12

28 Nov '12

Add myself as the maintainer of the NVIDIA Tegra DRM driver. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f503405..27c89b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2504,6 +2504,14 @@ S: Supported F: drivers/gpu/drm/exynos F: include/drm/exynos* +NVIDIA TEGRA DRM DRIVER +M: Thierry Reding <thierry.reding(a)avionic-design.de> +L: dri-devel(a)lists.freedesktop.org +T: git://gitorious.org/thierryreding/linux.git +S: Maintained +F: drivers/gpu/drm/tegra +F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt + DSCC4 DRIVER M: Francois Romieu <romieu(a)fr.zoreil.com> L: netdev(a)vger.kernel.org -- 1.8.0.1

2 2

[PATCH 1/2] radeon: fix pll/ctrc mapping on dce2 and dce3 hardware v2
by j.glisse＠gmail.com 28 Nov '12

28 Nov '12

From: Jerome Glisse <jglisse(a)redhat.com> This fix black screen on resume issue that some people are experiencing. There is a bug in the atombios code regarding pll/crtc mapping. The atombios code reverse the logic for the pll and crtc mapping. v2: DCE3 or DCE2 only have 2 crtc Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- drivers/gpu/drm/radeon/atombios_crtc.c | 48 ++++++++++------------------------ 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index 3bce029..24d932f 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c @@ -1696,42 +1696,22 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) return ATOM_PPLL2; DRM_ERROR("unable to allocate a PPLL\n"); return ATOM_PPLL_INVALID; - } else if (ASIC_IS_AVIVO(rdev)) { - /* in DP mode, the DP ref clock can come from either PPLL - * depending on the asic: - * DCE3: PPLL1 or PPLL2 - */ - if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(radeon_crtc->encoder))) { - /* use the same PPLL for all DP monitors */ - pll = radeon_get_shared_dp_ppll(crtc); - if (pll != ATOM_PPLL_INVALID) - return pll; - } else { - /* use the same PPLL for all monitors with the same clock */ - pll = radeon_get_shared_nondp_ppll(crtc); - if (pll != ATOM_PPLL_INVALID) - return pll; - } - /* all other cases */ - pll_in_use = radeon_get_pll_use_mask(crtc); - /* the order shouldn't matter here, but we probably - * need this until we have atomic modeset - */ - if (rdev->flags & RADEON_IS_IGP) { - if (!(pll_in_use & (1 << ATOM_PPLL1))) - return ATOM_PPLL1; - if (!(pll_in_use & (1 << ATOM_PPLL2))) - return ATOM_PPLL2; - } else { - if (!(pll_in_use & (1 << ATOM_PPLL2))) - return ATOM_PPLL2; - if (!(pll_in_use & (1 << ATOM_PPLL1))) - return ATOM_PPLL1; - } - DRM_ERROR("unable to allocate a PPLL\n"); - return ATOM_PPLL_INVALID; } else { /* on pre-R5xx asics, the crtc to pll mapping is hardcoded */ + /* some atombios (observed in some DCE2/DCE3) code have a bug, + * the matching btw pll and crtc is done through + * PCLK_CRTC[1|2]_CNTL (0x480/0x484) but atombios code use the + * pll (1 or 2) to select which register to write. ie if using + * pll1 it will use PCLK_CRTC1_CNTL (0x480) and if using pll2 + * it will use PCLK_CRTC2_CNTL (0x484), it then use crtc id to + * choose which value to write. Which is reverse order from + * register logic. So only case that works is when pllid is + * same as crtcid or when both pll and crtc are enabled and + * both use same clock. + * + * So just return crtc id as if crtc and pll were hard linked + * together even if they aren't + */ return radeon_crtc->crtc_id; } } -- 1.7.11.7

3 3

[PATCH 1/4] drm/doc: Helpers are not a Midlayer!
by Daniel Vetter 28 Nov '12

28 Nov '12

I'm devoting all my wrath to that fight, so don't misname it ;-) v2: Make it clear that this section talks about kms helpers. Acked-by: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- Documentation/DocBook/drm.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index b030052..270bc12 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl @@ -1621,10 +1621,10 @@ void intel_crt_init(struct drm_device *dev) </sect2> </sect1> -  +  <sect1> - <title>Mid-layer Helper Functions</title> + <title>Mode Setting Helper Functions</title> <para> The CRTC, encoder and connector functions provided by the drivers implement the DRM API. They're called by the DRM core and ioctl handlers -- 1.7.11.7

5 7

[PATCH] drm/radeon: track global bo name and always return the same
by j.glisse＠gmail.com 28 Nov '12

28 Nov '12

From: Jerome Glisse <jglisse(a)redhat.com> To avoid kernel rejecting cs if we return different global name for same bo keep track of global name and always return the same. Seems to fix issue with suspend/resume failing and repeatly printing following message : [drm:radeon_cs_ioctl] *ERROR* Failed to parse relocation -35! There might still be way for a rogue program to trigger this issue. Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- radeon/radeon_bo_gem.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c index 265f177..fca0aaf 100644 --- a/radeon/radeon_bo_gem.c +++ b/radeon/radeon_bo_gem.c @@ -47,11 +47,11 @@ #include "radeon_bo_gem.h" #include <fcntl.h> struct radeon_bo_gem { - struct radeon_bo_int base; - uint32_t name; - int map_count; - atomic_t reloc_in_cs; - void *priv_ptr; + struct radeon_bo_int base; + uint32_t name; + int map_count; + atomic_t reloc_in_cs; + void *priv_ptr; }; struct bo_manager_gem { @@ -320,15 +320,21 @@ void *radeon_gem_get_reloc_in_cs(struct radeon_bo *bo) int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name) { + struct radeon_bo_gem *bo_gem = (struct radeon_bo_gem*)bo; struct radeon_bo_int *boi = (struct radeon_bo_int *)bo; struct drm_gem_flink flink; int r; + if (bo_gem->name) { + *name = bo_gem->name; + return 0; + } flink.handle = bo->handle; r = drmIoctl(boi->bom->fd, DRM_IOCTL_GEM_FLINK, &flink); if (r) { return r; } + bo_gem->name = flink.name; *name = flink.name; return 0; } -- 1.7.11.7

2 1

[pull] radeon drm-fixes-3.7
by alexdeucher＠gmail.com 27 Nov '12

27 Nov '12

From: Alex Deucher <alexander.deucher(a)amd.com> Hi Dave, One last fix for 3.7 from Jerome. This fixes a display regression which results in blank displays in some cases. The following changes since commit 452f19201f35d20a1a6c9009acbcfa6799163c6a: Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2012-11-22 13:21:57 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-3.7 Jerome Glisse (1): radeon: fix pll/ctrc mapping on dce2 and dce3 hardware drivers/gpu/drm/radeon/atombios_crtc.c | 48 +++++++++---------------------- 1 files changed, 14 insertions(+), 34 deletions(-)

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2012