dri-devel October 2020

dri-devel@lists.freedesktop.org

304 participants
773 discussions

[PATCH 1/2] panfrost: Make sure GPU is powered on when reading GPU_LATEST_FLUSH_ID
by Tomeu Vizoso 05 Oct '20

05 Oct '20

Bifrost devices do support the flush reduction feature, so on first job submit we were trying to read the register while still powered off. If the GPU is powered off, the feature doesn't bring any benefit, so don't try to read. Signed-off-by: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> --- drivers/gpu/drm/panfrost/panfrost_gpu.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_gpu.c b/drivers/gpu/drm/panfrost/… [View More]

5 9

[PATCH] dt-bindings: Fix 'reg' size issues in zynqmp examples
by Rob Herring 05 Oct '20

05 Oct '20

The default sizes in examples for 'reg' are 1 cell each. Fix the incorrect sizes in zynqmp examples: Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.example.dt.yaml: example-0: dma-controller@fd4c0000:reg:0: [0, 4249616384, 0, 4096] is too long From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.example.dt.yaml: example-0: display@fd4a0000:reg:0: [0, 4249485312, 0, 4096] is too long From … [View More]schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.example.dt.yaml: example-0: display@fd4a0000:reg:1: [0, 4249526272, 0, 4096] is too long From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.example.dt.yaml: example-0: display@fd4a0000:reg:2: [0, 4249530368, 0, 4096] is too long From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.example.dt.yaml: example-0: display@fd4a0000:reg:3: [0, 4249534464, 0, 4096] is too long From schema: /usr/local/lib/python3.8/dist-packages/dtschema/schemas/reg.yaml Cc: Hyun Kwon <hyun.kwon(a)xilinx.com> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Michal Simek <michal.simek(a)xilinx.com> Cc: Vinod Koul <vkoul(a)kernel.org> Cc: dri-devel(a)lists.freedesktop.org Cc: dmaengine(a)vger.kernel.org Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 8 ++++---- .../devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml index 52a939cade3b..7b9d468c3e52 100644 --- a/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml +++ b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml @@ -145,10 +145,10 @@ examples: display@fd4a0000 { compatible = "xlnx,zynqmp-dpsub-1.7"; - reg = <0x0 0xfd4a0000 0x0 0x1000>, - <0x0 0xfd4aa000 0x0 0x1000>, - <0x0 0xfd4ab000 0x0 0x1000>, - <0x0 0xfd4ac000 0x0 0x1000>; + reg = <0xfd4a0000 0x1000>, + <0xfd4aa000 0x1000>, + <0xfd4ab000 0x1000>, + <0xfd4ac000 0x1000>; reg-names = "dp", "blend", "av_buf", "aud"; interrupts = <0 119 4>; interrupt-parent = <&gic>; diff --git a/Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml b/Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml index 5de510f8c88c..2a595b18ff6c 100644 --- a/Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml +++ b/Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml @@ -57,7 +57,7 @@ examples: dma: dma-controller@fd4c0000 { compatible = "xlnx,zynqmp-dpdma"; - reg = <0x0 0xfd4c0000 0x0 0x1000>; + reg = <0xfd4c0000 0x1000>; interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>; interrupt-parent = <&gic>; clocks = <&dpdma_clk>; -- 2.25.1 [View Less]

3 4

[PATCH] drm/msm/dp: add voltage corners voting support base on dp link rate
by Kuogee Hsieh 03 Oct '20

03 Oct '20

Set link rate by using OPP set rate api so that CX level will be set accordingly base on the link rate. Signed-off-by: Kuogee Hsieh <khsieh(a)codeaurora.org> --- drivers/gpu/drm/msm/dp/dp_ctrl.c | 33 ++++++++++++++++++++++- drivers/gpu/drm/msm/dp/dp_ctrl.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 8 +++--- drivers/gpu/drm/msm/dp/dp_power.c | 42 ++++++++++++++++++++++++++--- drivers/gpu/drm/msm/dp/dp_power.h | 2 +- 5 files changed, 77 insertions(+), 10 deletions(-) … [View More]diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c index 2e3e1917351f..e1595d829e04 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c @@ -10,6 +10,7 @@ #include <linux/delay.h> #include <linux/phy/phy.h> #include <linux/phy/phy-dp.h> +#include <linux/pm_opp.h> #include <drm/drm_fixed.h> #include <drm/drm_dp_helper.h> #include <drm/drm_print.h> @@ -76,6 +77,8 @@ struct dp_ctrl_private { struct dp_parser *parser; struct dp_catalog *catalog; + struct opp_table *opp_table; + struct completion idle_comp; struct completion video_comp; }; @@ -1836,6 +1839,7 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, struct dp_parser *parser) { struct dp_ctrl_private *ctrl; + int ret; if (!dev || !panel || !aux || !link || !catalog) { @@ -1849,6 +1853,21 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, return ERR_PTR(-ENOMEM); } + ctrl->opp_table = dev_pm_opp_set_clkname(dev, "ctrl_link"); + + if (IS_ERR(ctrl->opp_table)) { + dev_err(dev, "invalid DP OPP table in device tree\n"); + ctrl->opp_table = NULL; + } else { + /* OPP table is optional */ + ret = dev_pm_opp_of_add_table(dev); + if (ret && ret != -ENODEV) { + dev_err(dev, "add DP OPP table\n"); + dev_pm_opp_put_clkname(ctrl->opp_table); + ctrl->opp_table = NULL; + } + } + init_completion(&ctrl->idle_comp); init_completion(&ctrl->video_comp); @@ -1864,6 +1883,18 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, return &ctrl->dp_ctrl; } -void dp_ctrl_put(struct dp_ctrl *dp_ctrl) +void dp_ctrl_put(struct device *dev, struct dp_ctrl *dp_ctrl) { + struct dp_ctrl_private *ctrl; + + if (!dp_ctrl) + return; + + ctrl = container_of(dp_ctrl, struct dp_ctrl_private, dp_ctrl); + + if (ctrl->opp_table != NULL) { + dev_pm_opp_of_remove_table(dev); + dev_pm_opp_put_clkname(ctrl->opp_table); + ctrl->opp_table = NULL; + } } diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.h b/drivers/gpu/drm/msm/dp/dp_ctrl.h index f60ba93c8678..19b412a93e02 100644 --- a/drivers/gpu/drm/msm/dp/dp_ctrl.h +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.h @@ -31,6 +31,6 @@ struct dp_ctrl *dp_ctrl_get(struct device *dev, struct dp_link *link, struct dp_panel *panel, struct drm_dp_aux *aux, struct dp_power *power, struct dp_catalog *catalog, struct dp_parser *parser); -void dp_ctrl_put(struct dp_ctrl *dp_ctrl); +void dp_ctrl_put(struct device *dev, struct dp_ctrl *dp_ctrl); #endif /* _DP_CTRL_H_ */ diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 431dff9de797..be941eedf4c6 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -648,8 +648,10 @@ static int dp_irq_hpd_handle(struct dp_display_private *dp, u32 data) static void dp_display_deinit_sub_modules(struct dp_display_private *dp) { + struct device *dev = &dp->pdev->dev; + dp_debug_put(dp->debug); - dp_ctrl_put(dp->ctrl); + dp_ctrl_put(dev, dp->ctrl); dp_panel_put(dp->panel); dp_aux_put(dp->aux); dp_audio_put(dp->audio); @@ -693,7 +695,7 @@ static int dp_init_sub_modules(struct dp_display_private *dp) goto error; } - dp->power = dp_power_get(dp->parser); + dp->power = dp_power_get(dev, dp->parser); if (IS_ERR(dp->power)) { rc = PTR_ERR(dp->power); DRM_ERROR("failed to initialize power, rc = %d\n", rc); @@ -749,7 +751,7 @@ static int dp_init_sub_modules(struct dp_display_private *dp) return rc; error_audio: - dp_ctrl_put(dp->ctrl); + dp_ctrl_put(dev, dp->ctrl); error_ctrl: dp_panel_put(dp->panel); error_link: diff --git a/drivers/gpu/drm/msm/dp/dp_power.c b/drivers/gpu/drm/msm/dp/dp_power.c index 17c1fc6a2d44..3d75bf09e38f 100644 --- a/drivers/gpu/drm/msm/dp/dp_power.c +++ b/drivers/gpu/drm/msm/dp/dp_power.c @@ -8,12 +8,14 @@ #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regulator/consumer.h> +#include <linux/pm_opp.h> #include "dp_power.h" #include "msm_drv.h" struct dp_power_private { struct dp_parser *parser; struct platform_device *pdev; + struct device *dev; struct clk *link_clk_src; struct clk *pixel_provider; struct clk *link_provider; @@ -148,18 +150,49 @@ static int dp_power_clk_deinit(struct dp_power_private *power) return 0; } +static int dp_power_clk_set_link_rate(struct dp_power_private *power, + struct dss_clk *clk_arry, int num_clk, int enable) +{ + u32 rate; + int i, rc = 0; + + for (i = 0; i < num_clk; i++) { + if (clk_arry[i].clk) { + if (clk_arry[i].type == DSS_CLK_PCLK) { + if (enable) + rate = clk_arry[i].rate; + else + rate = 0; + + rc = dev_pm_opp_set_rate(power->dev, rate); + } + + } + } + return rc; +} + static int dp_power_clk_set_rate(struct dp_power_private *power, enum dp_pm_type module, bool enable) { int rc = 0; struct dss_module_power *mp = &power->parser->mp[module]; - if (enable) { - rc = msm_dss_clk_set_rate(mp->clk_config, mp->num_clk); + if (module == DP_CTRL_PM) { + rc = dp_power_clk_set_link_rate(power, mp->clk_config, mp->num_clk, enable); if (rc) { - DRM_ERROR("failed to set clks rate.\n"); + DRM_ERROR("failed to set link clks rate.\n"); return rc; } + } else { + + if (enable) { + rc = msm_dss_clk_set_rate(mp->clk_config, mp->num_clk); + if (rc) { + DRM_ERROR("failed to set clks rate.\n"); + return rc; + } + } } rc = msm_dss_enable_clk(mp->clk_config, mp->num_clk, enable); @@ -349,7 +382,7 @@ int dp_power_deinit(struct dp_power *dp_power) return 0; } -struct dp_power *dp_power_get(struct dp_parser *parser) +struct dp_power *dp_power_get(struct device *dev, struct dp_parser *parser) { struct dp_power_private *power; struct dp_power *dp_power; @@ -365,6 +398,7 @@ struct dp_power *dp_power_get(struct dp_parser *parser) power->parser = parser; power->pdev = parser->pdev; + power->dev = dev; dp_power = &power->dp_power; diff --git a/drivers/gpu/drm/msm/dp/dp_power.h b/drivers/gpu/drm/msm/dp/dp_power.h index 76743d755833..7d0327bbc0d5 100644 --- a/drivers/gpu/drm/msm/dp/dp_power.h +++ b/drivers/gpu/drm/msm/dp/dp_power.h @@ -102,6 +102,6 @@ void dp_power_client_deinit(struct dp_power *power); * methods to be called by the client to configure the power related * modueles. */ -struct dp_power *dp_power_get(struct dp_parser *parser); +struct dp_power *dp_power_get(struct device *dev, struct dp_parser *parser); #endif /* _DP_POWER_H_ */ base-commit: 3c0f462da069af12211901ddf26f7e16e6951d9b prerequisite-patch-id: a109eaf08147f50149ad661a58122b6745a52445 -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project [View Less]

4 3

[RFC PATCH] drm: add support for taking drm atomic state snapshot
by Abhinav Kumar 03 Oct '20

03 Oct '20

Add support to capture the drm atomic state snapshot which can then be wired up with the devcoredump of the relevant display errors to give useful information to debug the issues. Since the devcoredump is read by usermode and it is allowed upto 5 minutes to read the coredump, capturing the snapshot that time will not result in an accurate result. Rather we should capture the snapshot right after the error happened. Hence add support for capturing this snapshot by re-using the … [View More]drm_atomic_helper_duplicate_state() API to support a non-context version. Also add nolock versions of the drm_atomic_get_***_state() APIs which can be used to get snapshot of the drm atomic state of display drivers. Signed-off-by: Abhinav Kumar <abhinavk(a)codeaurora.org> --- drivers/gpu/drm/drm_atomic.c | 154 ++++++++++++++++++---------- drivers/gpu/drm/drm_atomic_helper.c | 28 ++++- include/drm/drm_atomic.h | 10 ++ include/drm/drm_atomic_helper.h | 2 + 4 files changed, 136 insertions(+), 58 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 9ccfbf213d72..4e805157100b 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -272,37 +272,23 @@ void __drm_atomic_state_free(struct kref *ref) } EXPORT_SYMBOL(__drm_atomic_state_free); -/** - * drm_atomic_get_crtc_state - get CRTC state - * @state: global atomic state object - * @crtc: CRTC to get state object for - * - * This function returns the CRTC state for the given CRTC, allocating it if - * needed. It will also grab the relevant CRTC lock to make sure that the state - * is consistent. - * - * Returns: - * - * Either the allocated state or the error code encoded into the pointer. When - * the error is EDEADLK then the w/w mutex code has detected a deadlock and the - * entire atomic sequence must be restarted. All other errors are fatal. - */ -struct drm_crtc_state * -drm_atomic_get_crtc_state(struct drm_atomic_state *state, - struct drm_crtc *crtc) +static struct drm_crtc_state * +__drm_atomic_get_crtc_state(struct drm_atomic_state *state, + struct drm_crtc *crtc, bool take_lock) { int ret, index = drm_crtc_index(crtc); struct drm_crtc_state *crtc_state; - WARN_ON(!state->acquire_ctx); - 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) - return ERR_PTR(ret); + if (take_lock) { + WARN_ON(!state->acquire_ctx); + ret = drm_modeset_lock(&crtc->mutex, state->acquire_ctx); + if (ret) + return ERR_PTR(ret); + } crtc_state = crtc->funcs->atomic_duplicate_state(crtc); if (!crtc_state) @@ -319,8 +305,37 @@ drm_atomic_get_crtc_state(struct drm_atomic_state *state, return crtc_state; } + +/** + * drm_atomic_get_crtc_state - get CRTC state + * @state: global atomic state object + * @crtc: CRTC to get state object for + * + * This function returns the CRTC state for the given CRTC, allocating it if + * needed. It will also grab the relevant CRTC lock to make sure that the state + * is consistent. + * + * Returns: + * + * Either the allocated state or the error code encoded into the pointer. When + * the error is EDEADLK then the w/w mutex code has detected a deadlock and the + * entire atomic sequence must be restarted. All other errors are fatal. + */ +struct drm_crtc_state * +drm_atomic_get_crtc_state(struct drm_atomic_state *state, + struct drm_crtc *crtc) +{ + return __drm_atomic_get_crtc_state(state, crtc, true); +} EXPORT_SYMBOL(drm_atomic_get_crtc_state); +struct drm_crtc_state * +drm_atomic_get_crtc_state_nl(struct drm_atomic_state *state, + struct drm_crtc *crtc) +{ + return __drm_atomic_get_crtc_state(state, crtc, false); +} + static int drm_atomic_crtc_check(const struct drm_crtc_state *old_crtc_state, const struct drm_crtc_state *new_crtc_state) { @@ -445,30 +460,13 @@ static int drm_atomic_connector_check(struct drm_connector *connector, return 0; } -/** - * drm_atomic_get_plane_state - get plane state - * @state: global atomic state object - * @plane: plane to get state object for - * - * This function returns the plane state for the given plane, allocating it if - * needed. It will also grab the relevant plane lock to make sure that the state - * is consistent. - * - * Returns: - * - * Either the allocated state or the error code encoded into the pointer. When - * the error is EDEADLK then the w/w mutex code has detected a deadlock and the - * entire atomic sequence must be restarted. All other errors are fatal. - */ -struct drm_plane_state * -drm_atomic_get_plane_state(struct drm_atomic_state *state, - struct drm_plane *plane) +static struct drm_plane_state * +__drm_atomic_get_plane_state(struct drm_atomic_state *state, + struct drm_plane *plane, bool take_lock) { int ret, index = drm_plane_index(plane); struct drm_plane_state *plane_state; - WARN_ON(!state->acquire_ctx); - /* the legacy pointers should never be set */ WARN_ON(plane->fb); WARN_ON(plane->old_fb); @@ -478,9 +476,12 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state, if (plane_state) return plane_state; - ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); - if (ret) - return ERR_PTR(ret); + if (take_lock) { + WARN_ON(!state->acquire_ctx); + ret = drm_modeset_lock(&plane->mutex, state->acquire_ctx); + if (ret) + return ERR_PTR(ret); + } plane_state = plane->funcs->atomic_duplicate_state(plane); if (!plane_state) @@ -506,8 +507,37 @@ drm_atomic_get_plane_state(struct drm_atomic_state *state, return plane_state; } + +/** + * drm_atomic_get_plane_state - get plane state + * @state: global atomic state object + * @plane: plane to get state object for + * + * This function returns the plane state for the given plane, allocating it if + * needed. It will also grab the relevant plane lock to make sure that the state + * is consistent. + * + * Returns: + * + * Either the allocated state or the error code encoded into the pointer. When + * the error is EDEADLK then the w/w mutex code has detected a deadlock and the + * entire atomic sequence must be restarted. All other errors are fatal. + */ +struct drm_plane_state * +drm_atomic_get_plane_state(struct drm_atomic_state *state, + struct drm_plane *plane) +{ + return __drm_atomic_get_plane_state(state, plane, true); +} EXPORT_SYMBOL(drm_atomic_get_plane_state); +struct drm_plane_state * +drm_atomic_get_plane_state_nl(struct drm_atomic_state *state, + struct drm_plane *plane) +{ + return __drm_atomic_get_plane_state(state, plane, false); +} + static bool plane_switching_crtc(const struct drm_plane_state *old_plane_state, const struct drm_plane_state *new_plane_state) @@ -939,19 +969,21 @@ EXPORT_SYMBOL(drm_atomic_get_new_connector_for_encoder); * the error is EDEADLK then the w/w mutex code has detected a deadlock and the * entire atomic sequence must be restarted. All other errors are fatal. */ -struct drm_connector_state * -drm_atomic_get_connector_state(struct drm_atomic_state *state, - struct drm_connector *connector) +static struct drm_connector_state * +__drm_atomic_get_connector_state(struct drm_atomic_state *state, +struct drm_connector *connector, bool take_lock) { int ret, index; struct drm_mode_config *config = &connector->dev->mode_config; struct drm_connector_state *connector_state; - WARN_ON(!state->acquire_ctx); - - ret = drm_modeset_lock(&config->connection_mutex, state->acquire_ctx); - if (ret) - return ERR_PTR(ret); + if (take_lock) { + WARN_ON(!state->acquire_ctx); + ret = drm_modeset_lock(&config->connection_mutex, + state->acquire_ctx); + if (ret) + return ERR_PTR(ret); + } index = drm_connector_index(connector); @@ -999,8 +1031,22 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, return connector_state; } + +struct drm_connector_state * +drm_atomic_get_connector_state(struct drm_atomic_state *state, +struct drm_connector *connector) +{ + return __drm_atomic_get_connector_state(state, connector, true); +} EXPORT_SYMBOL(drm_atomic_get_connector_state); +struct drm_connector_state * +drm_atomic_get_connector_state_nl(struct drm_atomic_state *state, + struct drm_connector *connector) +{ + return __drm_atomic_get_connector_state(state, connector, false); +} + static void drm_atomic_connector_print_state(struct drm_printer *p, const struct drm_connector_state *state) { diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index ea1926b5bb80..229dc41aedb9 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3140,13 +3140,18 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, if (!state) return ERR_PTR(-ENOMEM); - state->acquire_ctx = ctx; + if (ctx) + state->acquire_ctx = ctx; state->duplicated = true; drm_for_each_crtc(crtc, dev) { struct drm_crtc_state *crtc_state; - crtc_state = drm_atomic_get_crtc_state(state, crtc); + if (ctx) + crtc_state = drm_atomic_get_crtc_state(state, crtc); + else + crtc_state = drm_atomic_get_crtc_state_nl(state, + crtc); if (IS_ERR(crtc_state)) { err = PTR_ERR(crtc_state); goto free; @@ -3156,7 +3161,11 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, drm_for_each_plane(plane, dev) { struct drm_plane_state *plane_state; - plane_state = drm_atomic_get_plane_state(state, plane); + if (ctx) + plane_state = drm_atomic_get_plane_state(state, plane); + else + plane_state = drm_atomic_get_plane_state_nl(state, + plane); if (IS_ERR(plane_state)) { err = PTR_ERR(plane_state); goto free; @@ -3167,7 +3176,12 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, drm_for_each_connector_iter(conn, &conn_iter) { struct drm_connector_state *conn_state; - conn_state = drm_atomic_get_connector_state(state, conn); + if (ctx) + conn_state = drm_atomic_get_connector_state(state, + conn); + else + conn_state = drm_atomic_get_connector_state_nl(state, + conn); if (IS_ERR(conn_state)) { err = PTR_ERR(conn_state); drm_connector_list_iter_end(&conn_iter); @@ -3189,6 +3203,12 @@ drm_atomic_helper_duplicate_state(struct drm_device *dev, } EXPORT_SYMBOL(drm_atomic_helper_duplicate_state); +struct drm_atomic_state * +drm_atomic_helper_snapshot_state(struct drm_device *dev) +{ + return drm_atomic_helper_duplicate_state(dev, NULL); +} + /** * drm_atomic_helper_suspend - subsystem-level suspend helper * @dev: DRM device diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 1dc8af7671b7..85e43489e33d 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -452,6 +452,16 @@ struct drm_connector_state * __must_check drm_atomic_get_connector_state(struct drm_atomic_state *state, struct drm_connector *connector); +struct drm_crtc_state * +drm_atomic_get_crtc_state_nl(struct drm_atomic_state *state, + struct drm_crtc *crtc); +struct drm_plane_state * +drm_atomic_get_plane_state_nl(struct drm_atomic_state *state, + struct drm_plane *plane); +struct drm_connector_state * +drm_atomic_get_connector_state_nl(struct drm_atomic_state *state, + struct drm_connector *connector); + void drm_atomic_private_obj_init(struct drm_device *dev, struct drm_private_obj *obj, struct drm_private_state *state, diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index b268180c97eb..e6be47ba4834 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -126,6 +126,8 @@ void drm_atomic_helper_shutdown(struct drm_device *dev); struct drm_atomic_state * drm_atomic_helper_duplicate_state(struct drm_device *dev, struct drm_modeset_acquire_ctx *ctx); +struct drm_atomic_state * +drm_atomic_helper_snapshot_state(struct drm_device *dev); struct drm_atomic_state *drm_atomic_helper_suspend(struct drm_device *dev); int drm_atomic_helper_commit_duplicated_state(struct drm_atomic_state *state, struct drm_modeset_acquire_ctx *ctx); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project [View Less]

3 5

[PATCH v3 0/2] Add configurable handler to execute a compound action
by Andrzej Pietrasiewicz 03 Oct '20

03 Oct '20

This is a follow-up of this thread: https://www.spinics.net/lists/linux-input/msg68446.html It only touches DRM (dri-devel) in such a way that it changes the help message of sysrq_drm_fb_helper_restore_op, otherwise it is unrelated to DRM. Patch 2/2 adds a configurable handler to execute a compound action. Userland might want to execute e.g. 'w' (show blocked tasks), followed by 's' (sync), followed by 1000 ms delay and then followed by 'c' (crash) upon a single magic SysRq. Or one might … [View More]

3 12

[PATCH 0/4] Mediatek DRM driver detect CMDQ execution timeout by vblank IRQ
by Chun-Kuang Hu 03 Oct '20

03 Oct '20

CMDQ helper provide timer to detect execution timeout, but DRM driver could have a better way to detect execution timeout by vblank IRQ. For DRM, CMDQ command should execute in vblank, so if it fail to execute in next 2 vblank, timeout happen. Even though we could calculate time between 2 vblank and use timer to delect, this would make things more complicated. This introduce a series refinement for CMDQ mailbox controller and CMDQ helper. Remove timer handler in helper function because … [View More]

2 6

Re: WARNING in ieee80211_bss_info_change_notify
by syzbot 03 Oct '20

03 Oct '20

syzbot has bisected this issue to: commit 135f971181d779c96ff3725c1a350a721785cc66 Author: Alex Deucher <alexander.deucher(a)amd.com> Date: Mon Nov 20 22:49:53 2017 +0000 drm/amdgpu: don't skip attributes when powerplay is enabled bisection log: https://syzkaller.appspot.com/x/bisect.txt?x=120f55bd900000 start commit: fcadab74 Merge tag 'drm-fixes-2020-10-01-1' of git://anong.. git tree: upstream final oops: https://syzkaller.appspot.com/x/report.txt?x=110f55bd900000… [View More]

1 0

[PULL] drm-intel-next-fixes
by Rodrigo Vivi 02 Oct '20

02 Oct '20

Hi Dave and Daniel, Here goes our first next-fixes. Please be aware this includes both drm-intel-next and drm-intel-gt-next. Also, most of patches from drm-intel-gt-next were accumulated for not being part of current drm-intel-fixes flow while we are defining the new split and flow. So, there are many important fixes for the next and current release and also for previous stable branches. drm-intel-next-fixes-2020-10-02: Thanks, Rodrigo. Propagated from drm-intel-next-queued: - Fix CRTC … [View More]state checker (Ville) Propated from drm-intel-gt-next: - Avoid implicit vmpa for highmem on 32b (Chris) - Prevent PAT attriutes for writecombine if CPU doesn't support PAT (Chris) - Clear the buffer pool age before use. (Chris) - Fix error code (Dan) - Break up error capture compression loops (Chris) - Fix uninitialized variable in context_create_request (Maarten) - Check for errors on i915_vm_alloc_pt_stash to avoid NULL dereference (Matt) - Serialize debugfs i915_gem_objects with ctx->mutex (Chris) - Fix a rebase mistake caused during drm-intel-gt-next creation (Chris) - Hold request reference for canceling an active context (Chris) - Heartbeats fixes (Chris) - Use usigned during batch copies (Chris) The following changes since commit 32e4d9df60f71d641fbe628a9afbe2f44d7e9a37: agp: use semicolons rather than commas to separate statements (2020-09-28 06:06:52 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-fixes-2020-10-02 for you to fetch changes up to c60b93cd4862d108214a14e655358ea714d7a12a: drm/i915: Avoid mixing integer types during batch copies (2020-09-30 14:24:54 -0400) ---------------------------------------------------------------- Propagated from drm-intel-next-queued: - Fix CRTC state checker (Ville) Propated from drm-intel-gt-next: - Avoid implicit vmpa for highmem on 32b (Chris) - Prevent PAT attriutes for writecombine if CPU doesn't support PAT (Chris) - Clear the buffer pool age before use. (Chris) - Fix error code (Dan) - Break up error capture compression loops (Chris) - Fix uninitialized variable in context_create_request (Maarten) - Check for errors on i915_vm_alloc_pt_stash to avoid NULL dereference (Matt) - Serialize debugfs i915_gem_objects with ctx->mutex (Chris) - Fix a rebase mistake caused during drm-intel-gt-next creation (Chris) - Hold request reference for canceling an active context (Chris) - Heartbeats fixes (Chris) - Use usigned during batch copies (Chris) ---------------------------------------------------------------- Chris Wilson (11): drm/i915/gem: Avoid implicit vmap for highmem on x86-32 drm/i915/gem: Prevent using pgprot_writecombine() if PAT is not supported drm/i915/gt: Clear the buffer pool age before use drm/i915: Break up error capture compression loops with cond_resched() drm/i915/gem: Serialise debugfs i915_gem_objects with ctx->mutex drm/i915: Redo "Remove i915_request.lock requirement for execution callbacks" drm/i915/gem: Hold request reference for canceling an active context drm/i915: Cancel outstanding work after disabling heartbeats on an engine drm/i915/gt: Always send a pulse down the engine after disabling heartbeat drm/i915/gem: Always test execution status on closing the context drm/i915: Avoid mixing integer types during batch copies Dan Carpenter (1): drm/i915: Fix an error code i915_gem_object_copy_blt() Maarten Lankhorst (1): drm/i915: Fix uninitialised variable in intel_context_create_request. Matthew Auld (1): drm/i915: check i915_vm_alloc_pt_stash for errors Ville Syrjälä (1): drm/i915: Fix state checker hw.active/hw.enable readout drivers/gpu/drm/i915/display/intel_display.c | 15 ++-- drivers/gpu/drm/i915/gem/i915_gem_context.c | 73 +++++++--------- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 7 +- drivers/gpu/drm/i915/gem/i915_gem_object_blt.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 30 ++++++- drivers/gpu/drm/i915/gt/intel_context.c | 1 + drivers/gpu/drm/i915/gt/intel_engine.h | 9 ++ drivers/gpu/drm/i915/gt/intel_engine_heartbeat.c | 106 ++++++++++++++--------- drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c | 2 + drivers/gpu/drm/i915/i915_cmd_parser.c | 10 +-- drivers/gpu/drm/i915/i915_debugfs.c | 2 + drivers/gpu/drm/i915/i915_drv.h | 4 +- drivers/gpu/drm/i915/i915_gpu_error.c | 3 + drivers/gpu/drm/i915/i915_request.c | 17 ++-- drivers/gpu/drm/i915/i915_vma.c | 8 +- 15 files changed, 175 insertions(+), 114 deletions(-) [View Less]

1 0

[PATCH][next] drm/i915: fix size_t greater or equal to zero comparison
by Colin King 02 Oct '20

02 Oct '20

From: Colin Ian King <colin.king(a)canonical.com> Currently the check that the unsigned size_t variable i is >= 0 is always true because the unsigned variable will never be negative, causing the loop to run forever. Fix this by changing the pre-decrement check to a zero check on i followed by a decrement of i. Addresses-Coverity: ("Unsigned compared against 0") Fixes: 400b65cb5acb ("drm/i915: use vmap in shmem_pin_map") Signed-off-by: Colin Ian King <colin.king(a)canonical.com… [View More]

1 0

[PATCH rdma-next v4 0/4] Dynamicaly allocate SG table from the pages
by Leon Romanovsky 02 Oct '20

02 Oct '20

From: Leon Romanovsky <leonro(a)nvidia.com> Changelog: v4: * Fixed formatting in first patch. * Added fix (clear tmp_netnts) in first patch to fix i915 failure. * Added test patches v3: https://lore.kernel.org/linux-rdma/20200922083958.2150803-1-leon@kernel.org/ * Squashed Christopher's suggestion to avoid introduced new API, but extend existing one. v2: https://lore.kernel.org/linux-rdma/20200916140726.839377-1-leon@kernel.org * Fixed indentations and comments * Deleted … [View More]sg_alloc_next() * Squashed lib/scatterlist patches into one v1: https://lore.kernel.org/lkml/20200910134259.1304543-1-leon@kernel.org * Changed _sg_chain to be __sg_chain * Added dependency on ARCH_NO_SG_CHAIN * Removed struct sg_append v0: * https://lore.kernel.org/lkml/20200903121853.1145976-1-leon@kernel.org -------------------------------------------------------------------------- >From Maor: This series extends __sg_alloc_table_from_pages to allow chaining of new pages to already initialized SG table. This allows drivers to utilize the optimization of merging contiguous pages without a need to pre allocate all the pages and hold them in a very large temporary buffer prior to the call to SG table initialization. The second patch changes the Infiniband driver to use the new API. It removes duplicate functionality from the code and benefits the optimization of allocating dynamic SG table from pages. In huge pages system of 2MB page size, without this change, the SG table would contain x512 SG entries. E.g. for 100GB memory registration: Number of entries Size Before 26214400 600.0MB After 51200 1.2MB Thanks Maor Gottlieb (2): lib/scatterlist: Add support in dynamic allocation of SG table from pages RDMA/umem: Move to allocate SG table from pages Tvrtko Ursulin (2): tools/testing/scatterlist: Rejuvenate bit-rotten test tools/testing/scatterlist: Show errors in human readable form drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 12 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 15 +- drivers/infiniband/core/umem.c | 92 ++--------- include/linux/scatterlist.h | 43 +++--- lib/scatterlist.c | 160 +++++++++++++++----- lib/sg_pool.c | 3 +- tools/testing/scatterlist/Makefile | 3 +- tools/testing/scatterlist/linux/mm.h | 35 +++++ tools/testing/scatterlist/main.c | 53 +++++-- 9 files changed, 248 insertions(+), 168 deletions(-) -- 2.26.2 [View Less]

3 16

← Newer
1
...
71
72
73
74
75
76
77
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel October 2020