dri-devel September 2015

dri-devel@lists.freedesktop.org

168 participants
1129 discussions

drm/msm/dsi: hs_zero timing
by Johansson, Werner 01 Sep '15

01 Sep '15

Hi, In drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c there are a few "magic number" writes to the PHY_LN_CFG_4(x) registers around line 108 (adjusting the hs_zero period per lane). This causes some problems with certain panel timings when timing->hs_zero plus an "unknown integer" becomes evenly divisible by 8 - this will cause the DSI output to misbehave (typically leading to black screen). On the three panels I've tested I have different "unknown integers" which I can't immediately derive from the rest of the PHY timings: (PHY timing debug output in this order: clk_pre, clk_post, clk_zero, clk_trail, clk_prepare, hs_exit, hs_zero, hs_prepare, hs_trail, hs_rqst) Panasonic VVX panel (WUXGA): PHY timings: 47, 2, 259, 62, 42, 112, 118, 46, 66, 51 hs_zero calculated value of 118 does not work (neither does anything <74, 78, 86, 94, 102, 110, 126, 134, 142, 150, 158, 166, 174, 182, 190, 198, 206, 214, 222, 230, 238, 246, 254) Sharp (1080p) on Xperia Z3: PHY timings: 44, 2, 238, 56, 38, 104, 110, 42, 60, 44 hs_zero calculated value of 110 works fine here but 104, 112, 120 and the remaining multiples of 8 does not. Sharp (qHD) on Dragonboard 800: PHY timings: 28, 4, 139, 30, 20, 68, 72, 24, 34, 25 hs_zero calculated value of 72 works fine but 62, 70, 78, 86 and the remaining multiples of 8 does not. hs_trail looked promising at first: a bad hs_zero value + hs_trail would be evenly divisible by 8 for Panasonic and the 1080p Sharp panel but not for the Sharp qHD display, and adjusting hs_trail did not solve the issue. However, setting all the lane adjust values for hs_zero to 0 solves the problem for the troublesome WUXGA panel timing and does not create any apparent downsides for the other two. Does anyone know of a reason this skew is implemented? If it is indeed needed in some cases would a move to DT instead of leaving it hard-coded make sense? Thanks for any input! /wj

6 19

[git pull] vmwgfx-next-15-09-01
by Thomas Hellstrom 01 Sep '15

01 Sep '15

Dave, A single commit. Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1227193 The following changes since commit 36d4e87b497d9cb3bf8e1bb2f803c7aa41dfb463: drm/vmwgfx: Remove duplicate ttm_bo_device_release (2015-08-21 00:38:23 -0700) are available in the git repository at: git://people.freedesktop.org/~thomash/linux tags/vmwgfx-next-15-09-01 for you to fetch changes up to aa3469ce7afd86a670d22375a64f1b5a06707725: drm/vmwgfx: Allow dropped masters render-node like access on legacy nodes v2 (2015-09-01 02:06:02 -0700) ---------------------------------------------------------------- Pull request of 2015-09-01 ---------------------------------------------------------------- Thomas Hellstrom (1): drm/vmwgfx: Allow dropped masters render-node like access on legacy nodes v2 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 ++++++- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[PATCH] drm/atomic: Fix bookkeeping with TEST_ONLY, v3.
by Maarten Lankhorst 01 Sep '15

01 Sep '15

Commit ec9f932ed41622d120de52a5b525e4d77b9ef17e "drm/atomic: Cleanup on error properly in the atomic ioctl." cleaned up some error paths, but didn't fix the TEST_ONLY path. In the check only case plane->fb shouldn't be updated, and the vblank events should be cleared as on failure. Changes since v1: - Fix -EDEADLK handling of vblank events too. - Free state last with CHECK_ONLY. Changes since v2: - Add comment about freeing crtc_state->event with TEST_ONLY. (Daniel Stone) Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Reviewed-by: Daniel Stone <daniels(a)collabora.com> --- drivers/gpu/drm/drm_atomic.c | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index e515261d0a7f..940f80bbf192 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1540,7 +1540,8 @@ retry: copied_props++; } - if (obj->type == DRM_MODE_OBJECT_PLANE && count_props) { + if (obj->type == DRM_MODE_OBJECT_PLANE && count_props && + !(arg->flags & DRM_MODE_ATOMIC_TEST_ONLY)) { plane = obj_to_plane(obj); plane_mask |= (1 << drm_plane_index(plane)); plane->old_fb = plane->fb; @@ -1562,10 +1563,11 @@ retry: } if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) { + /* + * Unlike commit, check_only does not clean up state. + * Below we call drm_atomic_state_free for it. + */ ret = drm_atomic_check_only(state); - /* _check_only() does not free state, unlike _commit() */ - if (!ret) - drm_atomic_state_free(state); } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) { ret = drm_atomic_async_commit(state); } else { @@ -1592,25 +1594,30 @@ out: plane->old_fb = NULL; } + if (ret && arg->flags & DRM_MODE_PAGE_FLIP_EVENT) { + /* + * TEST_ONLY and PAGE_FLIP_EVENT are mutually exclusive, + * if they weren't, this code should be called on success + * for TEST_ONLY too. + */ + + for_each_crtc_in_state(state, crtc, crtc_state, i) { + if (!crtc_state->event) + continue; + + destroy_vblank_event(dev, file_priv, + crtc_state->event); + } + } + if (ret == -EDEADLK) { drm_atomic_state_clear(state); drm_modeset_backoff(&ctx); goto retry; } - if (ret) { - if (arg->flags & DRM_MODE_PAGE_FLIP_EVENT) { - for_each_crtc_in_state(state, crtc, crtc_state, i) { - if (!crtc_state->event) - continue; - - destroy_vblank_event(dev, file_priv, - crtc_state->event); - } - } - + if (ret || arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) drm_atomic_state_free(state); - } drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); -- 2.1.0

2 1

drm/exynos: add render node support
by Inki Dae 01 Sep '15

01 Sep '15

From: Joonyoung Shim <jy0922.shim(a)samsung.com> This patch allows clients who want to use render node to access rendering relevant ioctls - g2d, post processor and gem allocation. Signed-off-by: Joonyoung Shim <jy0922.shim(a)samsung.com> Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 39 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 7c65819..20800b3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -275,25 +275,25 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { static const struct drm_ioctl_desc exynos_ioctls[] = { DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_GEM_GET, exynos_drm_gem_get_ioctl, + DRM_UNLOCKED | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_VIDI_CONNECTION, vidi_connection_ioctl, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_GEM_GET, - exynos_drm_gem_get_ioctl, DRM_UNLOCKED), - DRM_IOCTL_DEF_DRV(EXYNOS_VIDI_CONNECTION, - vidi_connection_ioctl, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_G2D_GET_VER, - exynos_g2d_get_ver_ioctl, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_G2D_SET_CMDLIST, - exynos_g2d_set_cmdlist_ioctl, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_G2D_EXEC, - exynos_g2d_exec_ioctl, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_IPP_GET_PROPERTY, - exynos_drm_ipp_get_property, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_IPP_SET_PROPERTY, - exynos_drm_ipp_set_property, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_IPP_QUEUE_BUF, - exynos_drm_ipp_queue_buf, DRM_UNLOCKED | DRM_AUTH), - DRM_IOCTL_DEF_DRV(EXYNOS_IPP_CMD_CTRL, - exynos_drm_ipp_cmd_ctrl, DRM_UNLOCKED | DRM_AUTH), + DRM_IOCTL_DEF_DRV(EXYNOS_G2D_GET_VER, exynos_g2d_get_ver_ioctl, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_G2D_SET_CMDLIST, exynos_g2d_set_cmdlist_ioctl, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_G2D_EXEC, exynos_g2d_exec_ioctl, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_IPP_GET_PROPERTY, exynos_drm_ipp_get_property, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_IPP_SET_PROPERTY, exynos_drm_ipp_set_property, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_IPP_QUEUE_BUF, exynos_drm_ipp_queue_buf, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), + DRM_IOCTL_DEF_DRV(EXYNOS_IPP_CMD_CTRL, exynos_drm_ipp_cmd_ctrl, + DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), }; static const struct file_operations exynos_drm_driver_fops = { @@ -310,7 +310,8 @@ static const struct file_operations exynos_drm_driver_fops = { }; static struct drm_driver exynos_drm_driver = { - .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | + DRIVER_RENDER, .load = exynos_drm_load, .unload = exynos_drm_unload, .suspend = exynos_drm_suspend, -- 1.9.1

4 6

[PATCH 0/9] drm/exynos: cleanup patchset for exynos_drm_fb/fbdev
by Joonyoung Shim 01 Sep '15

01 Sep '15

Hi, This patchset is for cleanup about fb and fbdev codes of exynos-drm driver. This removes unnecesary and redundant codes mostly, and make a variable having too long name to be short. Thanks. Joonyoung Shim (9): drm/exynos: remove exynos_drm_fb_set_buf_cnt() drm/exynos: s/exynos_gem_obj/obj in exynos_drm_fbdev.c drm/exynos: cleanup exynos_drm_fbdev_update() drm/exynos: update fb_info via only one function drm/exynos: cleanup to get gem object for fb drm/exynos: update exynos_drm_framebuffer_init() for multiple buffers drm/exynos: cleanup exynos_user_fb_create() drm/exynos: remove exynos_drm_fb_get_buf_cnt() drm/exynos: remove buf_cnt from struct exynos_drm_fb drivers/gpu/drm/exynos/exynos_drm_fb.c | 115 +++++++++--------------------- drivers/gpu/drm/exynos/exynos_drm_fb.h | 12 ++-- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 78 ++++++++------------ drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- 4 files changed, 69 insertions(+), 138 deletions(-)

1 0

[PATCH] amdgpu: fix missing deinit on vamgr_32
by Alex Deucher 01 Sep '15

01 Sep '15

From: "monk.liu" <monk.liu(a)amd.com> Signed-off-by: monk.liu <monk.liu(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- amdgpu/amdgpu_device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/amdgpu/amdgpu_device.c b/amdgpu/amdgpu_device.c index 75b12e2..e5a923e 100644 --- a/amdgpu/amdgpu_device.c +++ b/amdgpu/amdgpu_device.c @@ -132,6 +132,8 @@ static void amdgpu_device_free_internal(amdgpu_device_handle dev) { amdgpu_vamgr_deinit(dev->vamgr); free(dev->vamgr); + amdgpu_vamgr_deinit(dev->vamgr_32); + free(dev->vamgr_32); util_hash_table_destroy(dev->bo_flink_names); util_hash_table_destroy(dev->bo_handles); pthread_mutex_destroy(&dev->bo_table_mutex); -- 1.8.3.1

3 2

[PATCH v2 00/22] Enable gpu switching on the MacBook Pro
by Lukas Wunner 01 Sep '15

01 Sep '15

This is a follow-up to the v1 posted in April: http://lists.freedesktop.org/archives/dri-devel/2015-April/081515.html Patches 1 - 17 enable GPU switching on the pre-retina MacBook Pro. These were tested successfully by multiple people and solve two tickets in Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88861 https://bugs.freedesktop.org/show_bug.cgi?id=61115 Patches 18 - 22 are a preview of how we're tackling retina support. Those are marked experimental and are NOT ready to be merged yet. Feedback on them is welcome. The patches are based on drm-next. They were tested on the following hardware (thanks a lot everyone!): Tested-by: Paul Hordiienko <pvt.gord(a)gmail.com> [MBP 6,2 2010 intel ILK + nvidia GT216 pre-retina] Tested-by: William Brown <william(a)blackhats.net.au> [MBP 8,2 2011 intel SNB + amd turks pre-retina] Tested-by: Lukas Wunner <lukas(a)wunner.de> [MBP 9,1 2012 intel IVB + nvidia GK107 pre-retina] Tested-by: Bruno Bierbaumer <bruno(a)bierbaumer.net> [MBP 11,3 2013 intel HSW + nvidia GK107 retina -- work in progress] What's new: * By default the MBP boots with the display switched to the discrete GPU but it can be forced to the integrated GPU with an EFI boot variable. Here's a handy tool for that: https://github.com/0xbb/gpu-switch v1 didn't work in this configuration, v2 does. * Reprobing if the inactive GPU initializes before the apple-gmux module: v1 used Matthew Garrett's approach of adding a driver callback. v2 simply generates a hotplug event instead. nouveau polls its outputs every 10 seconds so we want it to poll immediately once apple-gmux registers. That is achieved by the hotplug event. The i915 driver is changed to behave identically to nouveau. (Right now it deletes LVDS and eDP connectors from the mode configuration if they can't be probed, deeming them to be ghosts.) * Framebuffer recreation if the inactive GPU initializes before the apple-gmux module (i.e. discarding the default 1024x768 fb and replacing with a new one with the actual panel resolution): v1 only supported this for i915, v2 has a generic solution which works with nouveau and radeon as well. (Necessary if the discrete GPU is forced to be the inactive one on boot via the EFI variable.) * Generally lots of rough edges were smoothed to hopefully make the patches more suitable for merging. E.g. there's a bug in i915 where the SSC status set by BIOS is preserved too late and v1 only contained a workaround, whereas v2 contains a proper fix in a separate commit. The long journey towards retina support: The pixel clock required for retina resolution is not supported by LVDS (which was used on pre-retinas), necessitating eDP instead. Problem is, the gmux register which switches the DDC lines on pre-retinas doesn't switch the AUX channel on retinas. Disassembling the OS X driver revealed that the gmux in retina MBPs gained an additional register 0x7f which gets written to when setting up the eDP configuration. There was some hope that this might switch the AUX channel. Alas, we tried writing various values to that register but were unable to get the inactive GPU to talk to the panel. The purpose of register 0x7f remains a mystery. Teardowns of the first generation retina MBP name the NXP CBTL06142 and TI HD3SS212 as multiplexers and according to the data sheets I've found, neither supports switching the AUX channel separately from the main link. Matthew Garrett had the idea of having the active GPU stash the EDID and the first 8 bytes of the DPCD (receiver capabilities) and letting the inactive GPU retrieve that data. I rebased and rewrote his patches and got everything working, only to discover that the drivers are unhappy with just 8 bytes of DPCD. They need full access to the DPCD to set up their outputs. We could stash the entire DPCD but some parts of it are mutable so the stashed data may become stale when the active GPU performs writes to the DPCD. So I had the idea of using the active GPU as a proxy to talk to the panel, thus emulating switching of the AUX channel in software. We can leverage the struct drm_dp_aux and i2c_adapter (for DDC) to achieve this, swapping the inactive GPU's structs with those of the active GPU on the fly. That approach is implemented in patches 18 - 22 but there are still some driver issues that I'm debugging. The current status as per the latest logs Bruno sent me is that i915 rejects the mode retrieved via proxying with CLOCK_HIGH and nouveau aborts link training halfway through. Bottom line is that it's not yet working but we're getting closer. As a side effect, the pre-retinas gain a second way to initialize their outputs: They can either use gmux to switch the DDC lines, or use the active GPU as a proxy for the DDC communication. Which method gets used depends on the order in which the drivers initialize, the inactive GPU will happily use whatever is available and it automatically receives a hotplug event once either method becomes ready for use. But, once again, the patches implementing proxying (patches 18 - 22) are still in a state of flux and not ready for prime time, unlike the prior ones which seem stable. Folks are hereby invited to poke holes into them and I'm looking forward to your feedback. Thanks, Lukas Dave Airlie (1): vga_switcheroo: Lock/unlock DDC lines Lukas Wunner (15): vga_switcheroo: Lock/unlock DDC lines harder Revert "vga_switcheroo: Add helper function to get the active client" Revert "vga_switcheroo: add reprobe hook for fbcon to recheck connected outputs." drm/nouveau: Lock/unlock DDC lines on probe vga_switcheroo: Generate hotplug event on handler and proxy registration drm/i915: Preserve SSC earlier drm/i915: Reprobe eDP and LVDS connectors on hotplug event drm/i915: On fb alloc failure, unref gem object where it gets refed drm: Create new fb and replace default 1024x768 fb on hotplug event drm/nouveau/timer: Fall back to kernel timer if GPU timer read failed vga_switcheroo: Allow using active client as proxy when reading DDC/AUX drm: Amend struct drm_dp_aux with connector attribute drm: Use vga_switcheroo active client as proxy when reading DDC/AUX drm/nouveau/i2c: Use vga_switcheroo active client as proxy when reading DDC/AUX drm/nouveau: Use vga_switcheroo active client as proxy when probing DDC on LVDS Matthew Garrett (1): apple-gmux: Assign apple_gmux_data before registering Seth Forshee (4): vga_switcheroo: Add support for switching only the DDC vga_switcheroo: Add helper function to get the active client apple-gmux: Add switch_ddc support drm/edid: Switch DDC when reading the EDID Tvrtko Ursulin (1): drm/i915: Fix failure paths around initial fbdev allocation drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 - drivers/gpu/drm/drm_dp_helper.c | 14 ++ drivers/gpu/drm/drm_edid.c | 23 ++- drivers/gpu/drm/drm_fb_helper.c | 41 ++++- drivers/gpu/drm/i915/i915_dma.c | 1 - drivers/gpu/drm/i915/intel_display.c | 91 +++++++--- drivers/gpu/drm/i915/intel_dp.c | 39 +++-- drivers/gpu/drm/i915/intel_drv.h | 6 + drivers/gpu/drm/i915/intel_fbdev.c | 46 ++--- drivers/gpu/drm/i915/intel_lvds.c | 67 ++++--- drivers/gpu/drm/i915/intel_panel.c | 4 +- drivers/gpu/drm/msm/edp/edp_connector.c | 2 + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 1 + drivers/gpu/drm/nouveau/nouveau_connector.c | 18 +- drivers/gpu/drm/nouveau/nouveau_dp.c | 20 +++ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 10 +- drivers/gpu/drm/nouveau/nouveau_vga.c | 8 - drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c | 6 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h | 1 + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 24 +++ drivers/gpu/drm/nouveau/nvkm/subdev/timer/gk20a.c | 4 + drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.c | 9 + drivers/gpu/drm/nouveau/nvkm/subdev/timer/nv04.h | 1 + drivers/gpu/drm/radeon/atombios_dp.c | 1 + drivers/gpu/drm/radeon/radeon_device.c | 1 - drivers/gpu/drm/radeon/radeon_fb.c | 11 +- drivers/gpu/drm/tegra/sor.c | 1 + drivers/gpu/vga/vga_switcheroo.c | 204 +++++++++++++++++++++- drivers/platform/x86/apple-gmux.c | 35 +++- include/drm/drm_dp_helper.h | 5 + include/linux/vga_switcheroo.h | 18 +- 32 files changed, 590 insertions(+), 125 deletions(-) -- 1.8.5.2 (Apple Git-48)

4 35

[PATCH] drm/exynos: fix exynos_drm_gem_prime_import_sg_table() error handling
by Joonyoung Shim 01 Sep '15

01 Sep '15

If exynos_drm_gem_init() is failed, the result is ERR_PTR, so we should just return the result. If not, wrong porinter will be referenced from err label. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Joonyoung Shim <jy0922.shim(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 3e4a64a..4842a31 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -569,10 +569,8 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device *dev, int ret; exynos_gem_obj = exynos_drm_gem_init(dev, attach->dmabuf->size); - if (IS_ERR(exynos_gem_obj)) { - ret = PTR_ERR(exynos_gem_obj); - goto err; - } + if (IS_ERR(exynos_gem_obj)) + return exynos_gem_obj; exynos_gem_obj->dma_addr = sg_dma_address(sgt->sgl); -- 1.9.1

2 2

[PATCH 1/2] drm/radeon/native: Send out the full AUX address
by Alex Deucher 01 Sep '15

01 Sep '15

AUX addresses are 20 bits long. Send out the entire address instead of just the low 16 bits. Port of: drm/radeon/atom: Send out the full AUX address to radeon non-atom aux path Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/radeon_dp_auxch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_dp_auxch.c b/drivers/gpu/drm/radeon/radeon_dp_auxch.c index fcbd60b..3b0c229 100644 --- a/drivers/gpu/drm/radeon/radeon_dp_auxch.c +++ b/drivers/gpu/drm/radeon/radeon_dp_auxch.c @@ -116,8 +116,8 @@ radeon_dp_aux_transfer_native(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg AUX_SW_WR_BYTES(bytes)); /* write the data header into the registers */ - /* request, addres, msg size */ - byte = (msg->request << 4); + /* request, address, msg size */ + byte = (msg->request << 4) | ((msg->address >> 16) & 0xf); WREG32(AUX_SW_DATA + aux_offset[instance], AUX_SW_DATA_MASK(byte) | AUX_SW_AUTOINCREMENT_DISABLE); -- 1.8.3.1

3 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel September 2015