dri-devel May 2015

dri-devel@lists.freedesktop.org

191 participants
1132 discussions

[Bug 60553] New: [trine2] wrong colors when executed fullscreen
by bugzilla-daemon＠freedesktop.org 14 May '15

14 May '15

https://bugs.freedesktop.org/show_bug.cgi?id=60553 Priority: medium Bug ID: 60553 Assignee: dri-devel(a)lists.freedesktop.org Summary: [trine2] wrong colors when executed fullscreen Severity: normal Classification: Unclassified OS: All Reporter: lordheavym(a)gmail.com Hardware: Other Status: NEW Version: git Component: Drivers/Gallium/r600 Product: Mesa Created attachment 74499 --> https://bugs.freedesktop.org/attachment.cgi?id=74499&action=edit Trine2 screen with wrong colors * mesa from git * xf86-video-ati-7.0.0 * radeon HD6870 Trine2 game colors are wrong when running fullscreen, not windowed. Here is the start of an apitrace output (it fail with an error): [lordh@archMain Trine 2]$ apitrace dump trine2_linux_32bit.trace 6 glXChooseVisual(dpy = 0xcfdcfb8, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_LEVEL, GLX_GREEN_SIZE, GLX_LEVEL, GLX_BLUE_SIZE, GLX_BUFFER_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, GLX_ACCUM_BLUE_SIZE, 0}) = &{visual = 0xcfe8b28, visualid = 557, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8} 7 glXCreateContext(dpy = 0xcfdcfb8, vis = &{visual = 0xcfe8b28, visualid = 557, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0xcfd3240 8 glXMakeCurrent(dpy = 0xcfdcfb8, drawable = 98566146, ctx = 0xcfd3240) = True 14 glXMakeCurrent(dpy = 0xcfdcfb8, drawable = 0, ctx = NULL) = True 15 glXDestroyContext(dpy = 0xcfdcfb8, ctx = 0xcfd3240) 16 glXChooseVisual(dpy = 0xcfdcfb8, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_LEVEL, GLX_GREEN_SIZE, GLX_LEVEL, GLX_BLUE_SIZE, GLX_BUFFER_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, GLX_ACCUM_BLUE_SIZE, 0}) = &{visual = 0xcfe8b28, visualid = 557, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8} 17 glXCreateContext(dpy = 0xcfdcfb8, vis = &{visual = 0xcfe8b28, visualid = 557, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0xd025658 18 glXMakeCurrent(dpy = 0xcfdcfb8, drawable = 98566149, ctx = 0xd025658) = True 21 glXMakeCurrent(dpy = 0xcfdcfb8, drawable = 0, ctx = NULL) = True 22 glXDestroyContext(dpy = 0xcfdcfb8, ctx = 0xd025658) 29 glXChooseVisual(dpy = 0xcfdcfb8, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, 0}) = &{visual = 0xcfe8be8, visualid = 563, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8} 30 glXCreateContext(dpy = 0xcfdcfb8, vis = &{visual = 0xcfe8be8, visualid = 563, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8}, shareList = NULL, direct = True) = 0xd000248 31 glXMakeCurrent(dpy = 0xcfdcfb8, drawable = 98566152, ctx = 0xd000248) = True 37 glXMakeCurrent(dpy = 0xcfdcfb8, drawable = 0, ctx = NULL) = True 38 glXDestroyContext(dpy = 0xcfdcfb8, ctx = 0xd000248) 39 glXChooseVisual(dpy = 0xcfdcfb8, screen = 0, attribList = {GLX_RGBA, GLX_RED_SIZE, GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_RED_SIZE, GLX_BLUE_SIZE, GLX_RED_SIZE, GLX_DOUBLEBUFFER, GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, GLX_RED_SIZE, 0}) = &{visual = 0xcfe8be8, visualid = 563, screen = 0, depth = 24, c_class = 4, red_mask = 16711680, green_mask = 65280, blue_mask = 255, colormap_size = 256, bits_per_rgb = 8} error: unknown event 4 -- You are receiving this mail because: You are the assignee for the bug.

1 13

[PATCH] drm: adv7511: Fix crash in IRQ handler when no encoder is associated
by Laurent Pinchart 14 May '15

14 May '15

The ADV7511 is probed before its slave encoder init function associates it with an encoder. This creates a time window during which hot plug detection interrupts can occur with an encoder, resulting in a crash in the IRQ handler. Fix this by ignoring hot plug detection IRQs when no encoder is associated yet. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> --- drivers/gpu/drm/i2c/adv7511.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c index b728523e194f..2aaa3c88999e 100644 --- a/drivers/gpu/drm/i2c/adv7511.c +++ b/drivers/gpu/drm/i2c/adv7511.c @@ -438,7 +438,7 @@ static int adv7511_irq_process(struct adv7511 *adv7511) regmap_write(adv7511->regmap, ADV7511_REG_INT(0), irq0); regmap_write(adv7511->regmap, ADV7511_REG_INT(1), irq1); - if (irq0 & ADV7511_INT0_HDP) + if (irq0 & ADV7511_INT0_HDP && adv7511->encoder) drm_helper_hpd_irq_event(adv7511->encoder->dev); if (irq0 & ADV7511_INT0_EDID_READY || irq1 & ADV7511_INT1_DDC_ERROR) { -- Regards, Laurent Pinchart

2 1

[PATCH 1/2] drm: rcar-du: Print the error value when DRM/KMS init fails
by Laurent Pinchart 14 May '15

14 May '15

This helps debugging probe failures. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index da1216a73969..780ca11512ba 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -190,7 +190,7 @@ static int rcar_du_load(struct drm_device *dev, unsigned long flags) /* DRM/KMS objects */ ret = rcar_du_modeset_init(rcdu); if (ret < 0) { - dev_err(&pdev->dev, "failed to initialize DRM/KMS\n"); + dev_err(&pdev->dev, "failed to initialize DRM/KMS (%d)\n", ret); goto done; } -- Regards, Laurent Pinchart

1 1

[PATCH RFC v9.5 09/20] drm/dsi: Add a helper to get bits per pixel of MIPI DSI pixel format
by Liu Ying 14 May '15

14 May '15

Signed-off-by: Liu Ying <Ying.Liu(a)freescale.com> --- v9->v9.5: * Add kernel-doc for the new helper function to address Daniel Vetter's comment. v8->v9: * Rebase onto the imx-drm/next branch of Philipp Zabel's open git repository. v7->v8: * None. v6->v7: * None. v5->v6: * Address the over 80 characters in one line warning reported by the checkpatch.pl script. v4->v5: * None. v3->v4: * None. v2->v3: * None. v1->v2: * Thierry Reding suggested that the mipi_dsi_pixel_format_to_bpp() function could be placed at the common DRM MIPI DSI driver. This patch is newly added. include/drm/drm_mipi_dsi.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index f1d8d0d..cabc910 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -163,6 +163,28 @@ static inline struct mipi_dsi_device *to_mipi_dsi_device(struct device *dev) return container_of(dev, struct mipi_dsi_device, dev); } +/** + * mipi_dsi_pixel_format_to_bpp() - get bits per pixel for a mipi dsi + * pixel format + * @fmt: mipi dsi pixel format + * + * Return: The bits per pixel value for the mipi dsi pixel format on success or + * a negative error code on failure. + */ +static inline int mipi_dsi_pixel_format_to_bpp(enum mipi_dsi_pixel_format fmt) +{ + switch (fmt) { + case MIPI_DSI_FMT_RGB888: + case MIPI_DSI_FMT_RGB666: + return 24; + case MIPI_DSI_FMT_RGB666_PACKED: + return 18; + case MIPI_DSI_FMT_RGB565: + return 16; + } + return -EINVAL; +} + struct mipi_dsi_device *of_find_mipi_dsi_device_by_node(struct device_node *np); int mipi_dsi_attach(struct mipi_dsi_device *dsi); int mipi_dsi_detach(struct mipi_dsi_device *dsi); -- 2.1.0

4 3

[PATCH] drm/exynos: dp: Lower level of EDID read success message
by Krzysztof Kozlowski 14 May '15

14 May '15

Don't pollute the dmesg with EDID read success message as an error. Printing as debug should be fine. Signed-off-by: Krzysztof Kozlowski <k.kozlowski(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_dp_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c index 441ef06b8894..30feb7d06624 100644 --- a/drivers/gpu/drm/exynos/exynos_dp_core.c +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c @@ -195,7 +195,7 @@ static int exynos_dp_read_edid(struct exynos_dp_device *dp) } } - dev_err(dp->dev, "EDID Read success!\n"); + dev_dbg(dp->dev, "EDID Read success!\n"); return 0; } -- 1.9.1

1 0

[PATCH v4 0/9] drm/exynos: add async G2D execution to libdrm
by Tobias Jakobi 13 May '15

13 May '15

Hello, this series exposes async execution of G2D command buffers to userspace. Also includes is a small performance analysis test, which can also be used to stress test the engine. The async operation is of course also tested. Please review and let me know what I can improve. v3: Rewrote handling of vendor-specific events. The series is now based on [1]. Also added two small fixes (error handling, break statement). v4: Minor modification to the vendor-event handling code (drop opaque ptr). Series is based on this version [2] of the patch. Another two small fixes (buffer pixelformat, g2d_fini) added. The pixelformat issue surfaced after the recent changes to the Exynos mixer code. Also fixed a thread bug in the event test (application should always exit properly now). With best wishes, Tobias [1] https://patchwork.kernel.org/patch/6262541/ [2] https://patchwork.kernel.org/patch/6391301/ Tobias Jakobi (9): exynos: Introduce exynos_handle_event() tests/exynos: add fimg2d performance analysis exynos/fimg2d: add g2d_config_event exynos: fimg2d: add g2d_exec2 tests/exynos: add fimg2d event test exynos: fimg2d: fix return codes tests/exynos: replace return by break tests/exynos: use XRGB8888 for framebuffer exynos/fimg2d: simplify g2d_fini() exynos/exynos-symbol-check | 3 + exynos/exynos_drm.c | 28 ++++ exynos/exynos_drm.h | 12 ++ exynos/exynos_drmif.h | 26 +++ exynos/exynos_fimg2d.c | 65 +++++--- exynos/exynos_fimg2d.h | 8 + tests/exynos/Makefile.am | 26 ++- tests/exynos/exynos_fimg2d_event.c | 326 +++++++++++++++++++++++++++++++++++++ tests/exynos/exynos_fimg2d_perf.c | 320 ++++++++++++++++++++++++++++++++++++ tests/exynos/exynos_fimg2d_test.c | 4 +- 10 files changed, 793 insertions(+), 25 deletions(-) create mode 100644 tests/exynos/exynos_fimg2d_event.c create mode 100644 tests/exynos/exynos_fimg2d_perf.c -- 2.0.5

1 9

[PATCH] drm/radeon: don't do mst probing is MST isn't enabled.
by Dave Airlie 13 May '15

13 May '15

From: Dave Airlie <airlied(a)redhat.com> This causes an oops as we haven't initialised the mst layer. Reported-by: Dave Jones <<davej(a)codemonkey.org.uk> Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/radeon/radeon_dp_mst.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c index 1017338..2b98ed3 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c @@ -666,6 +666,9 @@ radeon_dp_mst_probe(struct radeon_connector *radeon_connector) int ret; u8 msg[1]; + if (!radeon_mst) + return 0; + if (dig_connector->dpcd[DP_DPCD_REV] < 0x12) return 0; -- 2.1.0

2 1

[PULL] drm-intel-fixes
by Jani Nikula 13 May '15

13 May '15

Hi Dave, one i915 gpu hang fix on resume. BR, Jani. The following changes since commit 030bbdbf4c833bc69f502eae58498bc5572db736: Linux 4.1-rc3 (2015-05-10 15:12:29 -0700) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/drm-intel-fixes-2015-05-13 for you to fetch changes up to 364aece01a2dd748fc36a1e8bf52ef639b0857bd: drm/i915: Avoid GPU hang when coming out of s3 or s4 (2015-05-11 16:27:08 +0300) ---------------------------------------------------------------- Peter Antoine (1): drm/i915: Avoid GPU hang when coming out of s3 or s4 drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- Jani Nikula, Intel Open Source Technology Center

1 0

Re: [PATCH v2 2/2] drm: Make Legacy Context access functions optional.
by Daniel Vetter 13 May '15

13 May '15

On Wed, May 13, 2015 at 07:54:48AM +0100, Peter Antoine wrote: > As these functions are only used by one driver and there are security holes > in these functions. Make the functions optional. > > These changes are based on the two patches: > commit c21eb21cb50d58e7cbdcb8b9e7ff68b85cfa5095 > Author: Dave Airlie <airlied(a)redhat.com> > > And the commit that the above patch reverts: > commit 7c510133d93dd6f15ca040733ba7b2891ed61fd1 > Author: Daniel Vetter <daniel.vetter(a)ffwll.ch> > > This should now turn off the context feature. > > Issue: VIZ-5485 > Signed-off-by: Peter Antoine <peter.antoine(a)intel.com> Please cc drm core patches to dri-devel. Review below. -Daniel > --- > drivers/gpu/drm/drm_context.c | 36 ++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/drm_drv.c | 12 +++++++----- > 2 files changed, 43 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c > index 9b23525..574be2a 100644 > --- a/drivers/gpu/drm/drm_context.c > +++ b/drivers/gpu/drm/drm_context.c > @@ -53,6 +53,9 @@ struct drm_ctx_list { > */ > void drm_legacy_ctxbitmap_free(struct drm_device * dev, int ctx_handle) > { > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; This doesn't compile too well. Also like with the previous patch, drivers without DRIVER_MODESET still need these ioctls. > + > mutex_lock(&dev->struct_mutex); > idr_remove(&dev->ctx_idr, ctx_handle); > mutex_unlock(&dev->struct_mutex); > @@ -87,6 +90,9 @@ static int drm_legacy_ctxbitmap_next(struct drm_device * dev) > */ > int drm_legacy_ctxbitmap_init(struct drm_device * dev) > { > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; This is redundant with the check you've added around the caller. Looking at other places wrapping callers of _legacy_ functions with these checks is the more common pattern in drm. > + > idr_init(&dev->ctx_idr); > return 0; > } > @@ -101,6 +107,9 @@ int drm_legacy_ctxbitmap_init(struct drm_device * dev) > */ > void drm_legacy_ctxbitmap_cleanup(struct drm_device * dev) > { > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; Same issue with compiling. And probably better to move the check out into callers. > + > mutex_lock(&dev->struct_mutex); > idr_destroy(&dev->ctx_idr); > mutex_unlock(&dev->struct_mutex); > @@ -119,6 +128,9 @@ void drm_legacy_ctxbitmap_flush(struct drm_device *dev, struct drm_file *file) > { > struct drm_ctx_list *pos, *tmp; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; Same as above. > + > mutex_lock(&dev->ctxlist_mutex); > > list_for_each_entry_safe(pos, tmp, &dev->ctxlist, head) { > @@ -161,6 +173,9 @@ int drm_legacy_getsareactx(struct drm_device *dev, void *data, > struct drm_local_map *map; > struct drm_map_list *_entry; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > mutex_lock(&dev->struct_mutex); > > map = idr_find(&dev->ctx_idr, request->ctx_id); > @@ -205,6 +220,9 @@ int drm_legacy_setsareactx(struct drm_device *dev, void *data, > struct drm_local_map *map = NULL; > struct drm_map_list *r_list = NULL; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > mutex_lock(&dev->struct_mutex); > list_for_each_entry(r_list, &dev->maplist, head) { > if (r_list->map > @@ -305,6 +323,9 @@ int drm_legacy_resctx(struct drm_device *dev, void *data, > struct drm_ctx ctx; > int i; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > if (res->count >= DRM_RESERVED_CONTEXTS) { > memset(&ctx, 0, sizeof(ctx)); > for (i = 0; i < DRM_RESERVED_CONTEXTS; i++) { > @@ -335,6 +356,9 @@ int drm_legacy_addctx(struct drm_device *dev, void *data, > struct drm_ctx_list *ctx_entry; > struct drm_ctx *ctx = data; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > ctx->handle = drm_legacy_ctxbitmap_next(dev); > if (ctx->handle == DRM_KERNEL_CONTEXT) { > /* Skip kernel's context and get a new one. */ > @@ -378,6 +402,9 @@ int drm_legacy_getctx(struct drm_device *dev, void *data, > { > struct drm_ctx *ctx = data; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > /* This is 0, because we don't handle any context flags */ > ctx->flags = 0; > > @@ -400,6 +427,9 @@ int drm_legacy_switchctx(struct drm_device *dev, void *data, > { > struct drm_ctx *ctx = data; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > DRM_DEBUG("%d\n", ctx->handle); > return drm_context_switch(dev, dev->last_context, ctx->handle); > } > @@ -420,6 +450,9 @@ int drm_legacy_newctx(struct drm_device *dev, void *data, > { > struct drm_ctx *ctx = data; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > DRM_DEBUG("%d\n", ctx->handle); > drm_context_switch_complete(dev, file_priv, ctx->handle); > > @@ -442,6 +475,9 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data, > { > struct drm_ctx *ctx = data; > > + if (!drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) > + return -EINVAL; > + > DRM_DEBUG("%d\n", ctx->handle); > if (ctx->handle != DRM_KERNEL_CONTEXT) { > if (dev->driver->context_dtor) > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index 3b3c4f5..1de2df8 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -584,11 +584,13 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver, > if (drm_ht_create(&dev->map_hash, 12)) > goto err_minors; > > - ret = drm_legacy_ctxbitmap_init(dev); > - if (ret) { > - DRM_ERROR("Cannot allocate memory for context bitmap.\n"); > - goto err_ht; > - } > + if (drm_core_check_feature(dev, DRIVER_KMS_LEGACY_CONTEXT)) Coding style requires {} since it's multi-line. And confusing since the if (ret) gets always executed. > + ret = drm_legacy_ctxbitmap_init(dev); > + if (ret) { > + DRM_ERROR( > + "Cannot allocate memory for context bitmap.\n"); > + goto err_ht; > + } > > if (drm_core_check_feature(dev, DRIVER_GEM)) { > ret = drm_gem_init(dev); > -- > 1.9.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

2 1

[PATCH] drm/atomic: add drm_atomic_get_existing_*_state helpers
by Maarten Lankhorst 13 May '15

13 May '15

There are cases where we want to test if a given object is part of the state, but don't want to add them if they're not. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> --- drivers/gpu/drm/drm_atomic.c | 18 +++++++--------- include/drm/drm_atomic.h | 50 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 88259057f87b..47364f244dc0 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -263,13 +263,12 @@ struct drm_crtc_state * drm_atomic_get_crtc_state(struct drm_atomic_state *state, struct drm_crtc *crtc) { - int ret, index; + int ret, index = drm_crtc_index(crtc); struct drm_crtc_state *crtc_state; - index = drm_crtc_index(crtc); - - if (state->crtc_states[index]) - return state->crtc_states[index]; + crtc_state = drm_atomic_get_existing_crtc_state(state, crtc); + if (crtc_state) + return crtc_state; ret = drm_modeset_lock(&crtc->mutex, state->acquire_ctx); if (ret) @@ -397,13 +396,12 @@ struct drm_plane_state * drm_atomic_get_plane_state(struct drm_atomic_state *state, struct drm_plane *plane) { - int ret, index; + int ret, index = drm_plane_index(plane); struct drm_plane_state *plane_state; - index = drm_plane_index(plane); - - if (state->plane_states[index]) - return state->plane_states[index]; + plane_state = drm_atomic_get_existing_plane_state(state, plane); + if (plane_state) + return plane_state; ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); if (ret) diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 953af6bd7430..6445970535ec 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -59,6 +59,56 @@ int drm_atomic_connector_set_property(struct drm_connector *connector, struct drm_connector_state *state, struct drm_property *property, uint64_t val); +/** + * drm_atomic_get_existing_crtc_state - get crtc state, if it exists + * @state: global atomic state object + * @crtc: crtc to grab + * + * This function returns the crtc state for the given crtc, or NULL + * if the crtc is not part of the global atomic state. + */ +static inline struct drm_crtc_state * +drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state, + struct drm_crtc *crtc) +{ + return state->crtc_states[drm_crtc_index(crtc)]; +} + +/** + * drm_atomic_get_existing_plane_state - get plane state, if it exists + * @state: global atomic state object + * @plane: plane to grab + * + * This function returns the plane state for the given plane, or NULL + * if the plane is not part of the global atomic state. + */ +static inline struct drm_plane_state * +drm_atomic_get_existing_plane_state(struct drm_atomic_state *state, + struct drm_plane *plane) +{ + return state->plane_states[drm_plane_index(plane)]; +} + +/** + * drm_atomic_get_existing_connector_state - get connector state, if it exists + * @state: global atomic state object + * @connector: connector to grab + * + * This function returns the connector state for the given connector, + * or NULL if the connector is not part of the global atomic state. + */ +static inline struct drm_connector_state * +drm_atomic_get_existing_connector_state(struct drm_atomic_state *state, + struct drm_connector *connector) +{ + int index = drm_connector_index(connector); + + if (index >= state->num_connector) + return NULL; + + return state->connector_states[index]; +} + int __must_check drm_atomic_set_crtc_for_plane(struct drm_plane_state *plane_state, struct drm_crtc *crtc); -- 2.1.0

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2015