dri-devel May 2015

dri-devel@lists.freedesktop.org

191 participants
1132 discussions

[PATCH] drm/bridge: use flags argument of devm_gpiod_get to set direction
by Uwe Kleine-König 19 May '15

19 May '15

Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions) which appeared in v3.17-rc1, the gpiod_get* functions take an additional parameter that allows to specify direction and initial value for output. Use this to simplify the driver. Furthermore this is one caller less that stops us making the flags argument to gpiod_get*() mandatory. Fixes: b2ea8772799d ("drm/bridge: Add I2C based driver for ps8622/ps8625 bridge") Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- drivers/gpu/drm/bridge/ps8622.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/bridge/ps8622.c b/drivers/gpu/drm/bridge/ps8622.c index e895aa7ea353..9534607cbd10 100644 --- a/drivers/gpu/drm/bridge/ps8622.c +++ b/drivers/gpu/drm/bridge/ps8622.c @@ -581,31 +581,21 @@ static int ps8622_probe(struct i2c_client *client, ps8622->v12 = NULL; } - ps8622->gpio_slp = devm_gpiod_get(dev, "sleep"); + ps8622->gpio_slp = devm_gpiod_get(dev, "sleep", GPIOD_OUT_HIGH); if (IS_ERR(ps8622->gpio_slp)) { ret = PTR_ERR(ps8622->gpio_slp); dev_err(dev, "cannot get gpio_slp %d\n", ret); return ret; } - ret = gpiod_direction_output(ps8622->gpio_slp, 1); - if (ret) { - dev_err(dev, "cannot configure gpio_slp\n"); - return ret; - } - ps8622->gpio_rst = devm_gpiod_get(dev, "reset"); - if (IS_ERR(ps8622->gpio_rst)) { - ret = PTR_ERR(ps8622->gpio_rst); - dev_err(dev, "cannot get gpio_rst %d\n", ret); - return ret; - } /* * Assert the reset pin high to avoid the bridge being * initialized prematurely */ - ret = gpiod_direction_output(ps8622->gpio_rst, 1); - if (ret) { - dev_err(dev, "cannot configure gpio_rst\n"); + ps8622->gpio_rst = devm_gpiod_get(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(ps8622->gpio_rst)) { + ret = PTR_ERR(ps8622->gpio_rst); + dev_err(dev, "cannot get gpio_rst %d\n", ret); return ret; } -- 2.1.4

2 4

[PATCH] drm/bridge/ptn3460: use flags argument of devm_gpiod_get to set direction
by Uwe Kleine-König 19 May '15

19 May '15

Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions) which appeared in v3.17-rc1, the gpiod_get* functions take an additional parameter that allows to specify direction and initial value for output. Use this to simplify the driver. Furthermore this is one caller less that stops us making the flags argument to gpiod_get*() mandatory. Fixes: af478d8823a7 ("drm/bridge: ptn3460: use gpiod interface") Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- drivers/gpu/drm/bridge/ptn3460.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/bridge/ptn3460.c b/drivers/gpu/drm/bridge/ptn3460.c index 9d2f053382e1..c70abbe166b6 100644 --- a/drivers/gpu/drm/bridge/ptn3460.c +++ b/drivers/gpu/drm/bridge/ptn3460.c @@ -330,32 +330,23 @@ static int ptn3460_probe(struct i2c_client *client, ptn_bridge->client = client; - ptn_bridge->gpio_pd_n = devm_gpiod_get(&client->dev, "powerdown"); + ptn_bridge->gpio_pd_n = devm_gpiod_get(&client->dev, "powerdown", + GPIOD_OUT_HIGH); if (IS_ERR(ptn_bridge->gpio_pd_n)) { ret = PTR_ERR(ptn_bridge->gpio_pd_n); dev_err(dev, "cannot get gpio_pd_n %d\n", ret); return ret; } - ret = gpiod_direction_output(ptn_bridge->gpio_pd_n, 1); - if (ret) { - DRM_ERROR("cannot configure gpio_pd_n\n"); - return ret; - } - - ptn_bridge->gpio_rst_n = devm_gpiod_get(&client->dev, "reset"); - if (IS_ERR(ptn_bridge->gpio_rst_n)) { - ret = PTR_ERR(ptn_bridge->gpio_rst_n); - DRM_ERROR("cannot get gpio_rst_n %d\n", ret); - return ret; - } /* * Request the reset pin low to avoid the bridge being * initialized prematurely */ - ret = gpiod_direction_output(ptn_bridge->gpio_rst_n, 0); - if (ret) { - DRM_ERROR("cannot configure gpio_rst_n\n"); + ptn_bridge->gpio_rst_n = devm_gpiod_get(&client->dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(ptn_bridge->gpio_rst_n)) { + ret = PTR_ERR(ptn_bridge->gpio_rst_n); + DRM_ERROR("cannot get gpio_rst_n %d\n", ret); return ret; } -- 2.1.4

2 1

[PATCH] drm/radeon: make dpcd parameters const
by Alex Deucher 19 May '15

19 May '15

Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> --- drivers/gpu/drm/radeon/atombios_dp.c | 8 ++++---- drivers/gpu/drm/radeon/radeon_mode.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 3e3290c..ed173d3 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c @@ -253,7 +253,7 @@ void radeon_dp_aux_init(struct radeon_connector *radeon_connector) #define DP_VOLTAGE_MAX DP_TRAIN_VOLTAGE_SWING_LEVEL_3 #define DP_PRE_EMPHASIS_MAX DP_TRAIN_PRE_EMPH_LEVEL_3 -static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE], +static void dp_get_adjust_train(const u8 link_status[DP_LINK_STATUS_SIZE], int lane_count, u8 train_set[4]) { @@ -311,7 +311,7 @@ static int dp_get_max_dp_pix_clock(int link_rate, /***** radeon specific DP functions *****/ int radeon_dp_get_max_link_rate(struct drm_connector *connector, - u8 dpcd[DP_DPCD_SIZE]) + const u8 dpcd[DP_DPCD_SIZE]) { int max_link_rate; @@ -328,7 +328,7 @@ int radeon_dp_get_max_link_rate(struct drm_connector *connector, * if the max lane# < low rate lane# then use max lane# instead. */ static int radeon_dp_get_dp_lane_number(struct drm_connector *connector, - u8 dpcd[DP_DPCD_SIZE], + const u8 dpcd[DP_DPCD_SIZE], int pix_clock) { int bpp = convert_bpc_to_bpp(radeon_get_monitor_bpc(connector)); @@ -347,7 +347,7 @@ static int radeon_dp_get_dp_lane_number(struct drm_connector *connector, } static int radeon_dp_get_dp_link_clock(struct drm_connector *connector, - u8 dpcd[DP_DPCD_SIZE], + const u8 dpcd[DP_DPCD_SIZE], int pix_clock) { int bpp = convert_bpc_to_bpp(radeon_get_monitor_bpc(connector)); diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index fa91a17..6de5459 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h @@ -754,7 +754,7 @@ extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector); extern int radeon_dp_get_panel_mode(struct drm_encoder *encoder, struct drm_connector *connector); int radeon_dp_get_max_link_rate(struct drm_connector *connector, - u8 *dpcd); + const u8 *dpcd); extern void radeon_dp_set_rx_power_state(struct drm_connector *connector, u8 power_state); extern void radeon_dp_aux_init(struct radeon_connector *radeon_connector); -- 1.8.3.1

4 8

[BUG/REGRESSION] Screen flickering
by Thomas Gummerer 19 May '15

19 May '15

Hi, I noticed that on my machine the screen starts to flicker after I suspend and resume my machine, on the main laptop display if an external display is attached with kernel v4.1-rc1. I tracked the regression down to commit c9f038a1a592 ("drm/i915: Don't assume primary & cursor are always on for wm calculation (v4)"), and sent a patch that fixes that behavior at [1] about two weeks ago, although I'm not sure it's the right thing to do, as I'm not very familiar with the code. The same bug still exists in vv4.1-rc3. Jan Niehusmann confirmed the behavior, but there has been no further discussion on the topic. I also forgot to cc the people that were involved in the patch that caused the regression (sorry about that). Is there anything else that I can do to help fixing this issue? Thanks, Thomas [1] http://lists.freedesktop.org/archives/intel-gfx/2015-April/065494.html

5 12

radeon: ring 0 stalled for more than 10480msec
by Mike Mestnik 19 May '15

19 May '15

May 18 21:38:55 arcadia kernel: [ 0.000000] Linux version 4.0.0-1-amd64 (debian-kernel(a)lists.debian.org) (gcc version 4.9.2 (Debian 4.9.2-16) ) #1 SMP Debian 4.0.2-1 (2015-05-11) May 18 21:38:55 arcadia kernel: [ 3.467818] [drm] radeon/VERDE_mc2.bin: 31500 bytes May 19 00:06:08 arcadia kernel: [ 6226.594929] radeon 0000:01:00.0: ring 0 stalled for more than 10480msec May 19 00:06:08 arcadia kernel: [ 6226.594938] radeon 0000:01:00.0: GPU lockup (current fence id 0x000000000003dc60 last fence id 0x000000000003dc7c on ring 0) May 19 00:06:09 arcadia kernel: [ 6227.126990] radeon 0000:01:00.0: Saved 1185 dwords of commands on ring 0. May 19 00:06:09 arcadia kernel: [ 6227.127068] radeon 0000:01:00.0: GPU softreset: 0x0000004D May 19 00:06:09 arcadia kernel: [ 6227.127072] radeon 0000:01:00.0: GRBM_STATUS = 0xA25E7028 May 19 00:06:09 arcadia kernel: [ 6227.127076] radeon 0000:01:00.0: GRBM_STATUS_SE0 = 0x0F800006 May 19 00:06:09 arcadia kernel: [ 6227.127080] radeon 0000:01:00.0: GRBM_STATUS_SE1 = 0x00000006 May 19 00:06:09 arcadia kernel: [ 6227.127083] radeon 0000:01:00.0: SRBM_STATUS = 0x200400C0 May 19 00:06:09 arcadia kernel: [ 6227.127141] radeon 0000:01:00.0: SRBM_STATUS2 = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.127144] radeon 0000:01:00.0: R_008674_CP_STALLED_STAT1 = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.127147] radeon 0000:01:00.0: R_008678_CP_STALLED_STAT2 = 0x00010800 May 19 00:06:09 arcadia kernel: [ 6227.127150] radeon 0000:01:00.0: R_00867C_CP_BUSY_STAT = 0x00408006 May 19 00:06:09 arcadia kernel: [ 6227.127154] radeon 0000:01:00.0: R_008680_CP_STAT = 0x84038647 May 19 00:06:09 arcadia kernel: [ 6227.127157] radeon 0000:01:00.0: R_00D034_DMA_STATUS_REG = 0x44483146 May 19 00:06:09 arcadia kernel: [ 6227.127160] radeon 0000:01:00.0: R_00D834_DMA_STATUS_REG = 0x44C83D57 May 19 00:06:09 arcadia kernel: [ 6227.127163] radeon 0000:01:00.0: VM_CONTEXT1_PROTECTION_FAULT_ADDR 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.127167] radeon 0000:01:00.0: VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.637461] radeon 0000:01:00.0: GRBM_SOFT_RESET=0x0000DDFF May 19 00:06:09 arcadia kernel: [ 6227.637520] radeon 0000:01:00.0: SRBM_SOFT_RESET=0x00100100 May 19 00:06:09 arcadia kernel: [ 6227.638671] radeon 0000:01:00.0: GRBM_STATUS = 0x80007028 May 19 00:06:09 arcadia kernel: [ 6227.638675] radeon 0000:01:00.0: GRBM_STATUS_SE0 = 0x02000006 May 19 00:06:09 arcadia kernel: [ 6227.638679] radeon 0000:01:00.0: GRBM_STATUS_SE1 = 0x00000006 May 19 00:06:09 arcadia kernel: [ 6227.638682] radeon 0000:01:00.0: SRBM_STATUS = 0x200400C0 May 19 00:06:09 arcadia kernel: [ 6227.638740] radeon 0000:01:00.0: SRBM_STATUS2 = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.638744] radeon 0000:01:00.0: R_008674_CP_STALLED_STAT1 = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.638747] radeon 0000:01:00.0: R_008678_CP_STALLED_STAT2 = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.638750] radeon 0000:01:00.0: R_00867C_CP_BUSY_STAT = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.638753] radeon 0000:01:00.0: R_008680_CP_STAT = 0x00000000 May 19 00:06:09 arcadia kernel: [ 6227.638756] radeon 0000:01:00.0: R_00D034_DMA_STATUS_REG = 0x44C83D57 May 19 00:06:09 arcadia kernel: [ 6227.638759] radeon 0000:01:00.0: R_00D834_DMA_STATUS_REG = 0x44C83D57 May 19 00:06:09 arcadia kernel: [ 6227.638890] radeon 0000:01:00.0: GPU reset succeeded, trying to resume May 19 00:06:09 arcadia kernel: [ 6227.670575] [drm] probing gen 2 caps for device 1022:1425 = 733d03/e May 19 00:06:09 arcadia kernel: [ 6227.670580] [drm] PCIE gen 3 link speeds already enabled May 19 00:06:09 arcadia kernel: [ 6227.673508] [drm] PCIE GART of 1024M enabled (table at 0x0000000000277000). May 19 00:06:09 arcadia kernel: [ 6227.673631] radeon 0000:01:00.0: WB enabled May 19 00:06:09 arcadia kernel: [ 6227.673634] radeon 0000:01:00.0: fence driver on ring 0 use gpu addr 0x0000000080000c00 and cpu addr 0xffff88040a4ffc00 May 19 00:06:09 arcadia kernel: [ 6227.673636] radeon 0000:01:00.0: fence driver on ring 1 use gpu addr 0x0000000080000c04 and cpu addr 0xffff88040a4ffc04 May 19 00:06:09 arcadia kernel: [ 6227.673638] radeon 0000:01:00.0: fence driver on ring 2 use gpu addr 0x0000000080000c08 and cpu addr 0xffff88040a4ffc08 May 19 00:06:09 arcadia kernel: [ 6227.673639] radeon 0000:01:00.0: fence driver on ring 3 use gpu addr 0x0000000080000c0c and cpu addr 0xffff88040a4ffc0c May 19 00:06:09 arcadia kernel: [ 6227.673641] radeon 0000:01:00.0: fence driver on ring 4 use gpu addr 0x0000000080000c10 and cpu addr 0xffff88040a4ffc10 May 19 00:06:09 arcadia kernel: [ 6227.674040] radeon 0000:01:00.0: fence driver on ring 5 use gpu addr 0x0000000000075a18 and cpu addr 0xffffc90005f35a18 May 19 00:06:09 arcadia kernel: [ 6227.841114] [drm] ring test on 0 succeeded in 1 usecs May 19 00:06:09 arcadia kernel: [ 6227.841120] [drm] ring test on 1 succeeded in 1 usecs May 19 00:06:09 arcadia kernel: [ 6227.841125] [drm] ring test on 2 succeeded in 1 usecs May 19 00:06:09 arcadia kernel: [ 6227.841138] [drm] ring test on 3 succeeded in 9 usecs May 19 00:06:09 arcadia kernel: [ 6227.841144] [drm] ring test on 4 succeeded in 3 usecs May 19 00:06:10 arcadia kernel: [ 6228.017029] [drm] ring test on 5 succeeded in 2 usecs May 19 00:06:10 arcadia kernel: [ 6228.017034] [drm] UVD initialized successfully. May 19 00:06:10 arcadia kernel: [ 6228.017177] radeon 0000:01:00.0: GPU fault detected: 147 0x0fec4401 May 19 00:06:10 arcadia kernel: [ 6228.017183] radeon 0000:01:00.0: VM_CONTEXT1_PROTECTION_FAULT_ADDR 0x0FFFFFFF May 19 00:06:10 arcadia kernel: [ 6228.017185] radeon 0000:01:00.0: VM_CONTEXT1_PROTECTION_FAULT_STATUS 0x0C044001 May 19 00:06:10 arcadia kernel: [ 6228.017187] VM fault (0x01, vmid 6) at page 268435455, read from TC (68) libgl1-mesa-dri:i386 10.6~git1505141930.b9cb7c~gd~u OpenGL renderer string: Gallium 0.4 on AMD CAPE VERDE R7 250X 2GB

1 0

[PULL] drm-amdkfd-next
by Oded Gabbay 19 May '15

19 May '15

Hi Dave, Here is the pull request of amdkfd for 4.2 drm-amdkfd-next-2015-05-18: - Add the interrupts & events modules, including new IOCTLs to create and wait on events. The HSA RT open source stack is mainly using events to know when a dispatched work has been completed. In addition, this module is a pre-requisite for the next module I'm going to upstream - debugger support This module also handles H/W exceptions, such as memory exception received through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU. - Adding a new kernel module parameter to let the user decide whether he wants to receive a SIGTERM when a memory exception occurs inside the GPU kernel and the HSA application doesn't wait on an appropriate event, or if he just want to receive notification about this event in dmesg. The default is the latter. - Additional improvements for SDMA code - Update my email address in Maintainers file as I'm leaving AMD in two weeks. Thanks, Oded The following changes since commit dde10068e1a4798fa44e68a5d08b5dfe3602cbba: Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next (2015-05-15 15:24:41 +1000) are available in the git repository at: ssh://gabbayo@people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-05-18 for you to fetch changes up to a441b1ddc5ad53aaa9e6d4d0b98387b1cf0a9ba8: drm/amdkfd: change driver version to 0.7.2 (2015-05-18 09:15:28 +0300) ---------------------------------------------------------------- Alexey Skidanov (2): drm/amdkfd: Add memory exception handling drm/amdkfd: Add bad opcode exception handling Andrew Lewycky (4): drm/amdkfd: Add interrupt handling module drm/amdkfd: add events IOCTL set definitions drm/amdkfd: Add the events module drm/amdkfd: Implement events IOCTLs Firo Yang (1): drm/amdkfd: Remove unessary void pointer cast Oded Gabbay (7): drm/amdkfd: reformat some debug prints drm/amdkfd: Use new struct for asic specific ops drm/amdkfd: make the sdma vm init to be asic specific MAINTAINERS: update amdkfd Oded's email address drm/radeon: Add init interrupt kfd->kgd interface drm/amdkfd: Add module parameter of send_sigterm drm/amdkfd: change driver version to 0.7.2 MAINTAINERS | 2 +- drivers/gpu/drm/amd/amdkfd/Makefile | 1 + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 66 ++ drivers/gpu/drm/amd/amdkfd/cik_int.h | 41 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 87 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 52 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 30 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 21 +- .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 18 +- .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 15 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 965 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_events.h | 84 ++ drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 188 ++++ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 9 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 75 ++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 27 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 + drivers/gpu/drm/radeon/cik_reg.h | 2 + drivers/gpu/drm/radeon/cikd.h | 1 + drivers/gpu/drm/radeon/radeon_kfd.c | 21 +- include/uapi/linux/kfd_ioctl.h | 96 +- 23 files changed, 1778 insertions(+), 40 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_int.h create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.h create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c

2 3

Re: [PATCH] drm/exynos: dp: Lower level of EDID read success message
by Jingoo Han 18 May '15

18 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> Right, dev_err() is not right. Thank you for sending the patch. Acked-by: Jingoo Han <jingoohan1(a)gmail.com> Best regards, Jingoo Han > --- > 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

Re: [PATCH] radeon: Deinline indirect register accessor functions
by Ilia Mirkin 18 May '15

18 May '15

On Mon, May 18, 2015 at 3:04 PM, Christian König <christian.koenig(a)amd.com> wrote: > On 18.05.2015 20:50, Denys Vlasenko wrote: >> >> On 05/18/2015 08:06 PM, Christian König wrote: >>> >>> I'm actually surprised how often people come along with that. The last >>> time we tried this it caused a noticeable performance drop. >>> >>> Basic problem is that this line: >>>> >>>> + if ((reg < rdev->rmmio_size || reg < RADEON_MIN_MMIO_SIZE) && >>>> !always_indirect) >>> >>> optimizes away in most of the cases which reduces the call to a readl >>> which is way faster than the spinlock path. >>> >>> So this is a NAK, >> >> >> Fair enough. >> >> I'm preparing a v2 where the fast branch of r100_mm_{r,w}reg() will stay >> inlined. >> > Sounds good to be, but IIRC that was suggested the last time this came up as > well. You might just want to google a bit why it wasn't done like this > before submitting the patch for review. > > BTW: Please CC the dri-devel list as well, cause not everybody is reading on > linux-kernel. http://lists.freedesktop.org/archives/dri-devel/2014-April/057349.html ... http://lists.freedesktop.org/archives/dri-devel/2014-April/057520.html Actually Lauri was *inlining* the function, not out-of-lining. I made the suggestion (and you agreed at the time) that the slow-path should be kept out of line, but apparently there was still high CPU overhead as a result? Cheers, -ilia

1 0

re: drm/nouveau/fb: namespace + nvidia gpu names (no binary change)
by Dan Carpenter 18 May '15

18 May '15

Hello Ben Skeggs, The patch 639c308effb9: "drm/nouveau/fb: namespace + nvidia gpu names (no binary change)" from Jan 14, 2015, leads to the following static checker warning: drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c:1297 gk104_ram_train_init() error: potential null dereference 'train'. (kzalloc returns null) drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c 1280 static int 1281 gk104_ram_train_init(struct nvkm_fb *pfb) 1282 { 1283 u8 ramcfg = nvbios_ramcfg_index(nv_subdev(pfb)); 1284 struct gk104_ram_train *train; 1285 int ret = -ENOMEM, i; 1286 1287 if ((train = kzalloc(sizeof(*train), GFP_KERNEL))) { ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Assume the allocation fails. 1288 for (i = 0; i < 0x100; i++) { 1289 ret = gk104_ram_train_type(pfb, i, ramcfg, train); 1290 if (ret && ret != -ENOENT) 1291 break; 1292 } 1293 } 1294 1295 switch (pfb->ram->type) { 1296 case NV_MEM_TYPE_GDDR5: 1297 ret = gk104_ram_train_init_0(pfb, train); ^^^^^ Dereferenced inside the gk104_ram_train_init_0() function. 1298 break; 1299 default: 1300 ret = 0; 1301 break; 1302 } 1303 1304 kfree(train); 1305 return ret; 1306 } regards, dan carpenter

1 0

[PATCH] drm/tegra: rgb: Use atomic DPMS helpers
by Dmitry Osipenko 18 May '15

18 May '15

Panel DPMS got broken after adding support for atomic modesetting. Fix it by making RGB output use of generic atomic DPMS helpers. Signed-off-by: Dmitry Osipenko <digetx(a)gmail.com> --- drivers/gpu/drm/tegra/rgb.c | 49 ++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c index 7cd833f..46cbaf2 100644 --- a/drivers/gpu/drm/tegra/rgb.c +++ b/drivers/gpu/drm/tegra/rgb.c @@ -88,13 +88,8 @@ static void tegra_dc_write_regs(struct tegra_dc *dc, tegra_dc_writel(dc, table[i].value, table[i].offset); } -static void tegra_rgb_connector_dpms(struct drm_connector *connector, - int mode) -{ -} - static const struct drm_connector_funcs tegra_rgb_connector_funcs = { - .dpms = tegra_rgb_connector_dpms, + .dpms = drm_atomic_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, .detect = tegra_output_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, @@ -125,21 +120,28 @@ static const struct drm_encoder_funcs tegra_rgb_encoder_funcs = { .destroy = tegra_output_encoder_destroy, }; -static void tegra_rgb_encoder_dpms(struct drm_encoder *encoder, int mode) +static void tegra_rgb_encoder_mode_set(struct drm_encoder *encoder, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted) { } -static void tegra_rgb_encoder_prepare(struct drm_encoder *encoder) +static void tegra_rgb_encoder_disable(struct drm_encoder *encoder) { -} + struct tegra_output *output = encoder_to_output(encoder); + struct tegra_rgb *rgb = to_rgb(output); -static void tegra_rgb_encoder_commit(struct drm_encoder *encoder) -{ + if (output->panel) + drm_panel_disable(output->panel); + + tegra_dc_write_regs(rgb->dc, rgb_disable, ARRAY_SIZE(rgb_disable)); + tegra_dc_commit(rgb->dc); + + if (output->panel) + drm_panel_unprepare(output->panel); } -static void tegra_rgb_encoder_mode_set(struct drm_encoder *encoder, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted) +static void tegra_rgb_encoder_enable(struct drm_encoder *encoder) { struct tegra_output *output = encoder_to_output(encoder); struct tegra_rgb *rgb = to_rgb(output); @@ -174,21 +176,6 @@ static void tegra_rgb_encoder_mode_set(struct drm_encoder *encoder, drm_panel_enable(output->panel); } -static void tegra_rgb_encoder_disable(struct drm_encoder *encoder) -{ - struct tegra_output *output = encoder_to_output(encoder); - struct tegra_rgb *rgb = to_rgb(output); - - if (output->panel) - drm_panel_disable(output->panel); - - tegra_dc_write_regs(rgb->dc, rgb_disable, ARRAY_SIZE(rgb_disable)); - tegra_dc_commit(rgb->dc); - - if (output->panel) - drm_panel_unprepare(output->panel); -} - static int tegra_rgb_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, @@ -231,11 +218,9 @@ tegra_rgb_encoder_atomic_check(struct drm_encoder *encoder, } static const struct drm_encoder_helper_funcs tegra_rgb_encoder_helper_funcs = { - .dpms = tegra_rgb_encoder_dpms, - .prepare = tegra_rgb_encoder_prepare, - .commit = tegra_rgb_encoder_commit, .mode_set = tegra_rgb_encoder_mode_set, .disable = tegra_rgb_encoder_disable, + .enable = tegra_rgb_encoder_enable, .atomic_check = tegra_rgb_encoder_atomic_check, }; -- 2.4.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2015