dri-devel November 2015

dri-devel@lists.freedesktop.org

171 participants
1176 discussions

[PATCH libdrm] radeon: Handle surface offsets exceeding 32 bits correctly
by Michel Dänzer 10 Nov '15

10 Nov '15

From: Michel Dänzer <michel.daenzer(a)amd.com> The slice_size and bo_size fields were getting truncated to 32 bits. Signed-off-by: Michel Dänzer <michel.daenzer(a)amd.com> --- radeon/radeon_surface.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c index fad4bda..5ec9745 100644 --- a/radeon/radeon_surface.c +++ b/radeon/radeon_surface.c @@ -163,7 +163,7 @@ static void surf_minify(struct … [View More]radeon_surface *surf, struct radeon_surface_level *surflevel, unsigned bpe, unsigned level, uint32_t xalign, uint32_t yalign, uint32_t zalign, - unsigned offset) + uint64_t offset) { surflevel->npix_x = mip_minify(surf->npix_x, level); surflevel->npix_y = mip_minify(surf->npix_y, level); @@ -184,7 +184,7 @@ static void surf_minify(struct radeon_surface *surf, surflevel->offset = offset; surflevel->pitch_bytes = surflevel->nblk_x * bpe * surf->nsamples; - surflevel->slice_size = surflevel->pitch_bytes * surflevel->nblk_y; + surflevel->slice_size = (uint64_t)surflevel->pitch_bytes * surflevel->nblk_y; surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size; } @@ -570,7 +570,7 @@ static void eg_surf_minify(struct radeon_surface *surf, unsigned mtilew, unsigned mtileh, unsigned mtileb, - unsigned offset) + uint64_t offset) { unsigned mtile_pr, mtile_ps; @@ -598,7 +598,7 @@ static void eg_surf_minify(struct radeon_surface *surf, surflevel->offset = offset; surflevel->pitch_bytes = surflevel->nblk_x * bpe * surf->nsamples; - surflevel->slice_size = mtile_ps * mtileb * slice_pt; + surflevel->slice_size = (uint64_t)mtile_ps * mtileb * slice_pt; surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size; } @@ -1415,7 +1415,7 @@ static void si_surf_minify(struct radeon_surface *surf, struct radeon_surface_level *surflevel, unsigned bpe, unsigned level, uint32_t xalign, uint32_t yalign, uint32_t zalign, - uint32_t slice_align, unsigned offset) + uint32_t slice_align, uint64_t offset) { if (level == 0) { surflevel->npix_x = surf->npix_x; @@ -1453,7 +1453,8 @@ static void si_surf_minify(struct radeon_surface *surf, surflevel->offset = offset; surflevel->pitch_bytes = surflevel->nblk_x * bpe * surf->nsamples; - surflevel->slice_size = ALIGN(surflevel->pitch_bytes * surflevel->nblk_y, slice_align); + surflevel->slice_size = ALIGN((uint64_t)surflevel->pitch_bytes * surflevel->nblk_y, + (uint64_t)slice_align); surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size; } @@ -1462,7 +1463,7 @@ static void si_surf_minify_2d(struct radeon_surface *surf, struct radeon_surface_level *surflevel, unsigned bpe, unsigned level, unsigned slice_pt, uint32_t xalign, uint32_t yalign, uint32_t zalign, - unsigned mtileb, unsigned offset) + unsigned mtileb, uint64_t offset) { unsigned mtile_pr, mtile_ps; @@ -1501,7 +1502,7 @@ static void si_surf_minify_2d(struct radeon_surface *surf, mtile_ps = (mtile_pr * surflevel->nblk_y) / yalign; surflevel->offset = offset; surflevel->pitch_bytes = surflevel->nblk_x * bpe * surf->nsamples; - surflevel->slice_size = mtile_ps * mtileb * slice_pt; + surflevel->slice_size = (uint64_t)mtile_ps * mtileb * slice_pt; surf->bo_size = offset + surflevel->slice_size * surflevel->nblk_z * surf->array_size; } -- 2.6.2 [View Less]

2 1

[PATCH] drm/amdgpu: Fix default page access routing
by Jay Cornwall 10 Nov '15

10 Nov '15

The VM default page (used when a VM translation fails) is allocated in system memory. The VM is misconfigured to interpret the physical address as referencing a VRAM physical page. Route default page accesses to system memory. Signed-off-by: Jay Cornwall <jay(a)jcornwall.me> Cc: <stable(a)vger.kernel.org> # v4.2+ --- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 1 + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/… [View More]

3 3

[RFC PATCH v3 0/4] drm: Cleanup probe function for component based masters.
by Liviu Dudau 10 Nov '15

10 Nov '15

Changelog: v3: Removed the call to dma_set_coherent_mask() from the generic drm_of_component_probe(). Also changes to shorten lines over 80 chars long. v2: Rebased the patchset on top of drm-next rather than Linus' latest -rc A few drivers in drivers/gpu/drm are component-enabled and use quite similar code sequences to probe for their encoder slaves at the remote end of the ports. Move the code into a "generic" function and remove it from the drivers. The end results is that drivers get a … [View More]

7 22

[Bug 106851] WARNING: CPU: 0 PID: 686 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x68/0x80() + drm:radeon_pm_late_init [radeon]] *ERROR*
by bugzilla-daemon＠bugzilla.kernel.org 10 Nov '15

10 Nov '15

https://bugzilla.kernel.org/show_bug.cgi?id=106851 lbl <lblmr(a)yopmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |PATCH_ALREADY_AVAILABLE --- Comment #8 from lbl <lblmr(a)yopmail.com> --- Fixed in kernel 4.1.13. Thanks -- You are receiving this mail because: You are … [View More]

1 0

[PATCH] drm/nouveau: fix build failures on all non ARM.
by Dave Airlie 09 Nov '15

09 Nov '15

From: Dave Airlie <airlied(a)redhat.com> gk20a is an ARM only GPU, so we can just do the correct thing on ARM but fail on other architectures. The other option was to use SWIOTLB as the define, which means phys_to_page exists, but this seems clearer. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c b/drivers/gpu/drm/… [View More]

1 0

[PATCH 1/2] drm/dp: Add definition for Display Control DPCD Registers capability size
by Yetunde Adebisi 09 Nov '15

09 Nov '15

cc: Jani Nikula <jani.nikula(a)intel.com> Signed-off-by: Yetunde Adebisi <yetundex.adebisi(a)intel.com> --- include/drm/drm_dp_helper.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 1252108..92d9a52 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -621,6 +621,7 @@ u8 drm_dp_get_adjust_request_pre_emphasis(const u8 link_status[DP_LINK_STATUS_SI #define DP_BRANCH_OUI_HEADER_SIZE 0xc #… [View More]

1 0

[PATCH 1/4] gpu: ipu-v3: drop unused dmfc field from client platform data
by Philipp Zabel 09 Nov '15

09 Nov '15

This field is never used, drop it. Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> --- include/video/imx-ipu-v3.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index 85dedca..eeba753 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h @@ -343,7 +343,6 @@ struct ipu_client_platformdata { int di; int dc; int dp; - int dmfc; int dma[2]; }; -- 2.6.1

2 4

[PATCH libdrm] intel: Allow some codenames in INTEL_DEVID_OVERRIDE
by Neil Roberts 09 Nov '15

09 Nov '15

As well as allowing a hexadecimal PCI ID number, the INTEL_DEVID_OVERRIDE environment variable can now contain one of a few short codenames. The codenames are stored in a small table to map them to a corresponding PCI ID. This makes it easier to use without having to look up the PCI IDs manually. The PCI IDs used are the same as those chosen for the -p option of run.c in shader-db but SKL has been added as well. --- intel/intel_bufmgr_gem.c | 29 ++++++++++++++++++++++++++++- 1 file changed, … [View More]

1 0

[PATCH] drm/nouveau: Fix pre-nv50 pageflip events (v2)
by Mario Kleiner 09 Nov '15

09 Nov '15

From: Daniel Vetter <daniel.vetter(a)ffwll.ch> Apparently pre-nv50 pageflip events happen before the actual vblank period. Therefore that functionality got semi-disabled in commit af4870e406126b7ac0ae7c7ce5751f25ebe60f28 Author: Mario Kleiner <mario.kleiner.de(a)gmail.com> Date: Tue May 13 00:42:08 2014 +0200 drm/nouveau/kms/nv04-nv40: fix pageflip events via special case. Unfortunately that hack got uprooted in commit cc1ef118fc099295ae6aabbacc8af94d8d8885eb Author: … [View More]Thierry Reding <treding(a)nvidia.com> Date: Wed Aug 12 17:00:31 2015 +0200 drm/irq: Make pipe unsigned and name consistent Trigering a warning when trying to sample the vblank timestamp for a non-existing pipe. There's a few ways to fix this: - Open-code the old behaviour, which just enshrines this slight breakage of the userspace ABI. - Revert Mario's commit and again inflict broken timestamps, again not pretty. - Fix this for real by delaying the pageflip TS until the next vblank interrupt, thereby making it accurate. This patch implements the third option. Since having a page flip interrupt that happens when the pageflip gets armed and not when it completes in the next vblank seems to be fairly common (older i915 hw works very similarly) create a new helper to arm vblank events for such drivers. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=106431 Cc: Thierry Reding <treding(a)nvidia.com> Cc: Mario Kleiner <mario.kleiner.de(a)gmail.com> Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Ilia Mirkin <imirkin(a)alum.mit.edu> v2 (mario): Integrate my own review comments into Daniels patch. - Fix function prototypes in drmP.h - Add missing vblank_put() for pageflip completion without pageflip event. - Initialize sequence number for queued pageflip event to avoid trouble in drm_handle_vblank_events(). - Remove dead code and spelling fix. Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> Reviewed-by: Mario Kleiner <mario.kleiner.de(a)gmail.com> --- drivers/gpu/drm/drm_irq.c | 54 ++++++++++++++++++++++++++++++- drivers/gpu/drm/nouveau/nouveau_display.c | 19 ++++++----- include/drm/drmP.h | 4 +++ 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index eba6337..819b8c1 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -972,7 +972,8 @@ static void send_vblank_event(struct drm_device *dev, struct drm_pending_vblank_event *e, unsigned long seq, struct timeval *now) { - WARN_ON_SMP(!spin_is_locked(&dev->event_lock)); + assert_spin_locked(&dev->event_lock); + e->event.sequence = seq; e->event.tv_sec = now->tv_sec; e->event.tv_usec = now->tv_usec; @@ -985,6 +986,57 @@ static void send_vblank_event(struct drm_device *dev, } /** + * drm_arm_vblank_event - arm vblank event after pageflip + * @dev: DRM device + * @pipe: CRTC index + * @e: the event to prepare to send + * + * A lot of drivers need to generate vblank events for the very next vblank + * interrupt. For example when the page flip interrupt happens when the page + * flip gets armed, but not when it actually executes within the next vblank + * period. This helper function implements exactly the required vblank arming + * behaviour. + * + * Caller must hold event lock. Caller must also hold a vblank reference for the + * event @e, which will be dropped when the next vblank arrives. + * + * This is the legacy version of drm_crtc_arm_vblank_event(). + */ +void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe, + struct drm_pending_vblank_event *e) +{ + assert_spin_locked(&dev->event_lock); + + e->pipe = pipe; + e->event.sequence = drm_vblank_count(dev, pipe); + list_add_tail(&e->base.link, &dev->vblank_event_list); +} +EXPORT_SYMBOL(drm_arm_vblank_event); + +/** + * drm_arm_vblank_event - arm vblank event after pageflip + * @crtc: the source CRTC of the vblank event + * @e: the event to send + * + * A lot of drivers need to generate vblank events for the very next vblank + * interrupt. For example when the page flip interrupt happens when the page + * flip gets armed, but not when it actually executes within the next vblank + * period. This helper function implements exactly the required vblank arming + * behaviour. + * + * Caller must hold event lock. Caller must also hold a vblank reference for the + * event @e, which will be dropped when the next vblank arrives. + * + * This is the native KMS version of drm_send_vblank_event(). + */ +void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, + struct drm_pending_vblank_event *e) +{ + drm_arm_vblank_event(crtc->dev, drm_crtc_index(crtc), e); +} +EXPORT_SYMBOL(drm_crtc_arm_vblank_event); + +/** * drm_send_vblank_event - helper to send vblank event after pageflip * @dev: DRM device * @pipe: CRTC index diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index db6bc67..64c8d93 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -829,7 +829,6 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, struct drm_device *dev = drm->dev; struct nouveau_page_flip_state *s; unsigned long flags; - int crtcid = -1; spin_lock_irqsave(&dev->event_lock, flags); @@ -841,15 +840,19 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); if (s->event) { - /* Vblank timestamps/counts are only correct on >= NV-50 */ - if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA) - crtcid = s->crtc; + if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) { + drm_arm_vblank_event(dev, s->crtc, s->event); + } else { + drm_send_vblank_event(dev, s->crtc, s->event); - drm_send_vblank_event(dev, crtcid, s->event); + /* Give up ownership of vblank for page-flipped crtc */ + drm_vblank_put(dev, s->crtc); + } + } + else { + /* Give up ownership of vblank for page-flipped crtc */ + drm_vblank_put(dev, s->crtc); } - - /* Give up ownership of vblank for page-flipped crtc */ - drm_vblank_put(dev, s->crtc); list_del(&s->head); if (ps) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 4d3b842..02a1512 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -948,6 +948,10 @@ extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe, struct drm_pending_vblank_event *e); extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc, struct drm_pending_vblank_event *e); +extern void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe, + struct drm_pending_vblank_event *e); +extern void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, + struct drm_pending_vblank_event *e); extern bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe); extern bool drm_crtc_handle_vblank(struct drm_crtc *crtc); extern int drm_vblank_get(struct drm_device *dev, unsigned int pipe); -- 1.9.1 [View Less]

2 2

Re: [PATCH] drm: Add aux plane verification in addFB2
by Kannan, Vandana 09 Nov '15

09 Nov '15

On 11/5/2015 10:50 PM, Vandana Kannan wrote: > From: Daniel Vetter <daniel.vetter(a)ffwll.ch> > > For render compression, userspace passes aux stride and offset values as an > additional entry in the fb structure. This should not be treated as garbage > and discarded as data belonging to no plane. > This patch introduces a check related to AUX plane to support the > scenario of render compression. > > v2: Based on a discussion with Siva > Moving num_planes … [View More]check below the increment. > > Changing the author to Daniel instead of suggested-by, since the core logic is > his. > > Signed-off-by: Daniel Vetter <daniel(a)ffwll.ch> > Signed-off-by: Vandana Kannan <vandana.kannan(a)intel.com> > Cc: Sivakumar Thulasimani <sivakumar.thulasimani(a)intel.com> > --- > drivers/gpu/drm/drm_crtc.c | 19 ++++++++++++++++++- > drivers/gpu/drm/drm_ioctl.c | 3 +++ > include/drm/drm_crtc.h | 3 +++ > include/uapi/drm/drm.h | 1 + > include/uapi/drm/drm_mode.h | 1 + > 5 files changed, 26 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 24c5434..0d1030b 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -3204,6 +3204,16 @@ static int framebuffer_check(const struct drm_mode_fb_cmd2 *r) > } > } > > + if (r->flags & DRM_MODE_FB_AUX_PLANE) { > + num_planes++; > + > + if (num_planes == 4) { > + DRM_DEBUG_KMS("Number of planes cannot exceed 3" > + "(including aux plane)\n"); > + return -EINVAL; > + } > + } > + > for (i = num_planes; i < 4; i++) { > if (r->modifier[i]) { > DRM_DEBUG_KMS("non-zero modifier for unused plane %d\n", i); > @@ -3242,7 +3252,8 @@ internal_framebuffer_create(struct drm_device *dev, > struct drm_framebuffer *fb; > int ret; > > - if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS)) { > + if (r->flags & ~(DRM_MODE_FB_INTERLACED | DRM_MODE_FB_MODIFIERS | > + DRM_MODE_FB_AUX_PLANE)) { > DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags); > return ERR_PTR(-EINVAL); > } > @@ -3264,6 +3275,12 @@ internal_framebuffer_create(struct drm_device *dev, > return ERR_PTR(-EINVAL); > } > > + if (r->flags & DRM_MODE_FB_AUX_PLANE && > + !dev->mode_config.allow_aux_plane) { > + DRM_DEBUG_KMS("driver does not support render compression\n"); > + return ERR_PTR(-EINVAL); > + } > + > ret = framebuffer_check(r); > if (ret) > return ERR_PTR(ret); > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > index 8ce2a0c..ee00782 100644 > --- a/drivers/gpu/drm/drm_ioctl.c > +++ b/drivers/gpu/drm/drm_ioctl.c > @@ -312,6 +312,9 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ > case DRM_CAP_ADDFB2_MODIFIERS: > req->value = dev->mode_config.allow_fb_modifiers; > break; > + case DRM_CAP_RENDER_COMPRESSION: > + req->value = dev->mode_config.allow_aux_plane; > + break; > default: > return -EINVAL; > } > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 3f0c690..a5a9da2 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -1152,6 +1152,9 @@ struct drm_mode_config { > /* whether the driver supports fb modifiers */ > bool allow_fb_modifiers; > > + /* whether the driver supports render compression */ > + bool allow_aux_plane; > + > /* cursor size */ > uint32_t cursor_width, cursor_height; > }; > diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h > index 3801584..0834bf7 100644 > --- a/include/uapi/drm/drm.h > +++ b/include/uapi/drm/drm.h > @@ -631,6 +631,7 @@ struct drm_gem_open { > #define DRM_CAP_CURSOR_WIDTH 0x8 > #define DRM_CAP_CURSOR_HEIGHT 0x9 > #define DRM_CAP_ADDFB2_MODIFIERS 0x10 > +#define DRM_CAP_RENDER_COMPRESSION 0x11 > > /** DRM_IOCTL_GET_CAP ioctl argument type */ > struct drm_get_cap { > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h > index 6c11ca4..de59ace 100644 > --- a/include/uapi/drm/drm_mode.h > +++ b/include/uapi/drm/drm_mode.h > @@ -354,6 +354,7 @@ struct drm_mode_fb_cmd { > > #define DRM_MODE_FB_INTERLACED (1<<0) /* for interlaced framebuffers */ > #define DRM_MODE_FB_MODIFIERS (1<<1) /* enables ->modifer[] */ > +#define DRM_MODE_FB_AUX_PLANE (1<<2) /* for compressed buffer */ > > struct drm_mode_fb_cmd2 { > __u32 fb_id; > [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2015