dri-devel August 2012

dri-devel@lists.freedesktop.org

145 participants
811 discussions

[git pull] more drm fixes
by Dave Airlie 16 Aug '12

16 Aug '12

Just some intel and nouveau ones this time, intel has more edp panel fixes for macbooks and nouveau has a suspend/resume regression fix in there. Dave. The following changes since commit 7bac6b46607f2f44075cb45dd5b0b4d2e7c80695: Merge branch 'drm-fixes-3.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2012-08-14 09:25:01 +1000) are available in the git repository at: git://people.freedesktop.org/~airlied/linux.git drm-fixes for you to fetch changes up to 2e26c73a1e410448fbd2c0fbd34f06d98eaf8e48: Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2012-08-15 20:31:22 +1000) ---------------------------------------------------------------- Ben Skeggs (2): drm/nve0/fifo: add support for the flip completion swmthd drm/nouveau/aux: mask off higher bits of auxch index in i2c table entry Chris Wilson (1): drm/i915: Apply post-sync write for pipe control invalidates Christoph Bumiller (1): drm/nvd0/disp: mask off high 16 bit of negative cursor x-coordinate Daniel Vetter (2): drm/i915: ignore eDP bpc settings from vbt drm/i915: reorder edp disabling to fix ivb MacBook Air Dave Airlie (2): Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Merge branch 'drm-nouveau-fixes' of git://git.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes Henrik Rydberg (1): drm/nouveau: disable copy engine on NVAF Jani Nikula (1): drm/i915: ensure i2c adapter is all set before adding it Maarten Lankhorst (1): nouveau: fixup scanout enable in nvc0_pm Maxim Levitsky (1): drm/nv86/fifo: suspend fix Takashi Iwai (1): drm/i915: Fix blank panel at reopening lid drivers/gpu/drm/i915/intel_display.c | 11 --------- drivers/gpu/drm/i915/intel_dp.c | 14 +++++------ drivers/gpu/drm/i915/intel_i2c.c | 7 +++--- drivers/gpu/drm/i915/intel_panel.c | 13 +++++++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 41 +++++++++++++++++-------------- drivers/gpu/drm/nouveau/nouveau_i2c.c | 2 +- drivers/gpu/drm/nouveau/nouveau_state.c | 1 - drivers/gpu/drm/nouveau/nv84_fifo.c | 9 +++++++ drivers/gpu/drm/nouveau/nvc0_pm.c | 2 +- drivers/gpu/drm/nouveau/nvd0_display.c | 2 +- drivers/gpu/drm/nouveau/nve0_fifo.c | 37 +++++++++++++++++++++++++--- 11 files changed, 88 insertions(+), 51 deletions(-)

1 0

[PATCH V5 13/18] drm: Define SAREA_MAX for Loongson (PageSize = 16KB).
by Huacai Chen 16 Aug '12

16 Aug '12

Signed-off-by: Huacai Chen <chenhc(a)lemote.com> Signed-off-by: Hongliang Tao <taohl(a)lemote.com> Signed-off-by: Hua Yan <yanh(a)lemote.com> Cc: dri-devel(a)lists.freedesktop.org --- include/drm/drm_sarea.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/drm/drm_sarea.h b/include/drm/drm_sarea.h index ee5389d..1d1a858 100644 --- a/include/drm/drm_sarea.h +++ b/include/drm/drm_sarea.h @@ -37,6 +37,8 @@ /* SAREA area needs to be at least a page */ #if defined(__alpha__) #define SAREA_MAX 0x2000U +#elif defined(__mips__) +#define SAREA_MAX 0x4000U #elif defined(__ia64__) #define SAREA_MAX 0x10000U /* 64kB */ #else -- 1.7.7.3

3 4

[PATCH] drm/i915: implement dma buf begin_cpu_access (v2)
by Dave Airlie 16 Aug '12

16 Aug '12

From: Dave Airlie <airlied(a)redhat.com> In order for udl vmap to work properly, we need to push the object into the CPU domain before we start copying the data to the USB device. This along with the udl change avoids userspace explicit mapping to be used. v2: add a flag for userspace to query to know if Intel kernel driver can deal with the vmap flushing properly. In theory udl would need a flag also, but I intend to push the patches very close to each other and other drivers should do the right thing from the start. I've added a test to my intel-gpu-tools prime branch, however testing this is a bit messy since the only way to get udl to vmap is to rendering something. I've tested this with real code as well to make sure it works. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/i915/i915_dma.c | 3 +++ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 17 +++++++++++++++++ include/drm/i915_drm.h | 1 + 3 files changed, 21 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 36822b9..1a0e112 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1006,6 +1006,9 @@ static int i915_getparam(struct drm_device *dev, void *data, case I915_PARAM_HAS_ALIASING_PPGTT: value = dev_priv->mm.aliasing_ppgtt ? 1 : 0; break; + case I915_PARAM_HAS_PRIME_VMAP_FLUSH: + value = 1; + break; default: DRM_DEBUG_DRIVER("Unknown parameter %d\n", param->param); diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index cf6bdec..ee51c63 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -147,6 +147,22 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct * return -EINVAL; } +static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, size_t start, size_t length, enum dma_data_direction direction) +{ + struct drm_i915_gem_object *obj = dma_buf->priv; + struct drm_device *dev = obj->base.dev; + int ret; + bool write = (direction == DMA_BIDIRECTIONAL || direction == DMA_TO_DEVICE); + + ret = i915_mutex_lock_interruptible(dev); + if (ret) + return ret; + + ret = i915_gem_object_set_to_cpu_domain(obj, write); + mutex_unlock(&dev->struct_mutex); + return ret; +} + static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf, @@ -158,6 +174,7 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .mmap = i915_gem_dmabuf_mmap, .vmap = i915_gem_dmabuf_vmap, .vunmap = i915_gem_dmabuf_vunmap, + .begin_cpu_access = i915_gem_begin_cpu_access, }; struct dma_buf *i915_gem_prime_export(struct drm_device *dev, diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index f3f8224..8df848b 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h @@ -298,6 +298,7 @@ typedef struct drm_i915_irq_wait { #define I915_PARAM_HAS_GEN7_SOL_RESET 16 #define I915_PARAM_HAS_LLC 17 #define I915_PARAM_HAS_ALIASING_PPGTT 18 +#define I915_PARAM_HAS_PRIME_VMAP_FLUSH 19 typedef struct drm_i915_getparam { int param; -- 1.7.10.2

1 0

[PATCH 1/5] drm/radeon/dce4+: don't use radeon_crtc for vblank callback
by alexdeucher＠gmail.com 15 Aug '12

15 Aug '12

From: Alex Deucher <alexander.deucher(a)amd.com> This might be called before we've allocated the radeon_crtcs Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/radeon/evergreen.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index e93b80a..0c79d9e 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -37,6 +37,16 @@ #define EVERGREEN_PFP_UCODE_SIZE 1120 #define EVERGREEN_PM4_UCODE_SIZE 1376 +static const u32 crtc_offsets[6] = +{ + EVERGREEN_CRTC0_REGISTER_OFFSET, + EVERGREEN_CRTC1_REGISTER_OFFSET, + EVERGREEN_CRTC2_REGISTER_OFFSET, + EVERGREEN_CRTC3_REGISTER_OFFSET, + EVERGREEN_CRTC4_REGISTER_OFFSET, + EVERGREEN_CRTC5_REGISTER_OFFSET +}; + static void evergreen_gpu_init(struct radeon_device *rdev); void evergreen_fini(struct radeon_device *rdev); void evergreen_pcie_gen2_enable(struct radeon_device *rdev); @@ -109,17 +119,19 @@ void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev) */ void dce4_wait_for_vblank(struct radeon_device *rdev, int crtc) { - struct radeon_crtc *radeon_crtc = rdev->mode_info.crtcs[crtc]; int i; - if (RREG32(EVERGREEN_CRTC_CONTROL + radeon_crtc->crtc_offset) & EVERGREEN_CRTC_MASTER_EN) { + if (crtc >= rdev->num_crtc) + return; + + if (RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[crtc]) & EVERGREEN_CRTC_MASTER_EN) { for (i = 0; i < rdev->usec_timeout; i++) { - if (!(RREG32(EVERGREEN_CRTC_STATUS + radeon_crtc->crtc_offset) & EVERGREEN_CRTC_V_BLANK)) + if (!(RREG32(EVERGREEN_CRTC_STATUS + crtc_offsets[crtc]) & EVERGREEN_CRTC_V_BLANK)) break; udelay(1); } for (i = 0; i < rdev->usec_timeout; i++) { - if (RREG32(EVERGREEN_CRTC_STATUS + radeon_crtc->crtc_offset) & EVERGREEN_CRTC_V_BLANK) + if (RREG32(EVERGREEN_CRTC_STATUS + crtc_offsets[crtc]) & EVERGREEN_CRTC_V_BLANK) break; udelay(1); } -- 1.7.7.5

2 6

[Bug 29022] [REGRESSION? 2.6.38-rc4] nouveau NV50/NVA8 screen freeze
by bugzilla-daemon＠bugzilla.kernel.org 15 Aug '12

15 Aug '12

https://bugzilla.kernel.org/show_bug.cgi?id=29022 Alan <alan(a)lxorguk.ukuu.org.uk> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |alan(a)lxorguk.ukuu.org.uk Resolution| |OBSOLETE --- Comment #20 from Alan <alan(a)lxorguk.ukuu.org.uk> 2012-08-15 22:15:55 --- If this bug is still seen with 3.2/3.4+ kernels please re-open -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 0

[Bug 43207] New: radeon driver on HD6570 shows pixel noise
by bugzilla-daemon＠bugzilla.kernel.org 15 Aug '12

15 Aug '12

https://bugzilla.kernel.org/show_bug.cgi?id=43207 Summary: radeon driver on HD6570 shows pixel noise Product: Drivers Version: 2.5 Kernel Version: 3.* Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) AssignedTo: drivers_video-dri(a)kernel-bugs.osdl.org ReportedBy: ccvs(a)mail.ru Regression: No Videocard HD6570. when I call "modprobe radeon", I see pixel noise on the screen and, if try more, it's possible to see some characters from framebuffer console. dmesg shows, that firmware loads right without firmware module loads, but it's useless, besause X driver needs KMS, which is disabled without firmware -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 11

[Bug 26294] [Regression] Resolution for external monitor not set correctly
by bugzilla-daemon＠freedesktop.org 15 Aug '12

15 Aug '12

https://bugs.freedesktop.org/show_bug.cgi?id=26294 Paul Menzel <paulepanter(a)users.sourceforge.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|UNCONFIRMED |ASSIGNED AssignedTo|zhenyu.z.wang(a)intel.com |dri-devel(a)lists.freedesktop | |.org QAContact|xorg-team(a)lists.x.org | Ever Confirmed|0 |1 Product|xorg |DRI Version|7.5 (2009.10) |DRI CVS Component|Driver/intel |General --- Comment #24 from Paul Menzel <paulepanter(a)users.sourceforge.net> 2012-08-15 14:49:35 UTC --- (Due to KMS(?)) this is a DRI issue and not a Xorg issue. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

[PATCH] drm/fb-helper: don't clobber output routing in setup_crtcs
by Daniel Vetter 15 Aug '12

15 Aug '12

Yet again the too close relationship between the fb helper and the crtc helper code strikes. This time around the fb helper resets all encoder->crtc pointers to NULL before starting to set up it's own mode. Which is total bullocks, because this will clobber the existing output routing, which the new drm/i915 code depends upon to be absolutely correct. The crtc helper itself doesn't really care about that, since it disables unused encoders in a rather roundabout way anyway. Two places call drm_setup_crts: - For the initial fb config. I've auditted all current drivers, and they all allocate their encoders with kzalloc. So there's no need to clear encoder->crtc once more. - When processing hotplug events while showing the fb console. This one is a bit more tricky, but both the crtc helper code and the new drm/i915 modeset code disable encoders if their crtc is changed and that encoder isn't part of the new config. Also, both disable any disconnected outputs, too. Which only leaves encoders that are on, connected, but for some odd reason the fb helper code doesn't want to use. That would be a bug in the fb configuration selector, since it tries to light up as many outputs as possible. v2: Kill the now unused encoders variable. Signed-Off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- Hi Dave, This patch here is blocking the modeset-rework series, and I'd like to merge that as soon as possible. You've merged the other two prep patches already for 3.6, but this one here popped up later on in testing. Can you please merge this into drm-next for 3.7 so that I can backmerge it, or smash your maintainer-ack onto it for merging through the intel tree? Thanks, Daniel --- drivers/gpu/drm/drm_fb_helper.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f546d1e..4ecc869 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1230,7 +1230,6 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper) struct drm_device *dev = fb_helper->dev; struct drm_fb_helper_crtc **crtcs; struct drm_display_mode **modes; - struct drm_encoder *encoder; struct drm_mode_set *modeset; bool *enabled; int width, height; @@ -1241,11 +1240,6 @@ static void drm_setup_crtcs(struct drm_fb_helper *fb_helper) width = dev->mode_config.max_width; height = dev->mode_config.max_height; - /* clean out all the encoder/crtc combos */ - list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { - encoder->crtc = NULL; - } - crtcs = kcalloc(dev->mode_config.num_connector, sizeof(struct drm_fb_helper_crtc *), GFP_KERNEL); modes = kcalloc(dev->mode_config.num_connector, -- 1.7.11.2

2 1

[Bug 38452] New: ETQW: Renders garbage in some places
by bugzilla-daemon＠freedesktop.org 15 Aug '12

15 Aug '12

https://bugs.freedesktop.org/show_bug.cgi?id=38452 Summary: ETQW: Renders garbage in some places Product: Mesa Version: git Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: sa(a)whiz.se Created an attachment (id=48141) --> (https://bugs.freedesktop.org/attachment.cgi?id=48141) screenshot of bug As mentioned in bug 35434 there is a glitch in the game ETQW where the screen just renders garbage. It doesn't seem to be related to any settings in the game and is only reproducible on some places in some of the maps. The best description to reproduce the bug is the one given in bug 35434: "I know now exactly where this is reproductible. For example, in "area 22" map, start with Strogg (soldier), you will land on the right of the Strogg base, then just turn left (looking to the Cyclope), and there is artefact (or now freeze&shake). I noted that watching the Cyclope on this map always results in this behavior." I have also provided an apitrace which makes it easy to reproduce the problem: http://dl.dropbox.com/u/28577999/etqw.trace.7z (51M) System environment: -- system architecture: 32-bit -- Linux distribution: Debian unstable -- GPU: REDWOOD -- Model: XFX Radeon HD 5670 1GB -- Display connector: DVI -- xf86-video-ati: 6.14.2 -- xserver: 1.10.2 -- mesa: 2fe39b46e73aea37152777fe11d489e0b1bc3f92 -- drm: 2.4.25 -- kernel: 2.6.39.1 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 10

[PATCH] gma500: remove an unreachable return statement
by Jani Nikula 15 Aug '12

15 Aug '12

Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> --- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c index a453d94..d35f93b 100644 --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c @@ -1292,7 +1292,6 @@ psb_intel_sdvo_get_analog_edid(struct drm_connector *connector) return drm_get_edid(connector, &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter); - return NULL; } static enum drm_connector_status -- 1.7.4.1

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2012