dri-devel December 2016

dri-devel@lists.freedesktop.org

237 participants
1390 discussions

linux-next: problems fetching the drm-intel, etc trees
by Stephen Rothwell 01 Dec '16

01 Dec '16

Hi all, There is something seriaously wrong with anongit.freedesktop.org this morning. Fething trees from there takes an enormous amount of time - so long that I had to abort the fetches ... -- Cheers, Stephen Rothwell

4 5

[Bug 98874] Desktop suddenly freezes, login via ssh possible, no error messages, unable to power off
by bugzilla-daemon＠freedesktop.org 01 Dec '16

01 Dec '16

https://bugs.freedesktop.org/show_bug.cgi?id=98874 --- Comment #8 from Matthias Nagel <matthias.h.nagel(a)gmail.com> --- Created attachment 128305 --> https://bugs.freedesktop.org/attachment.cgi?id=128305&action=edit 2nd dump Here is a new dump from a another crash -- You are receiving this mail because: You are the assignee for the bug.

1 0

[drm-intel:drm-intel-next-queued 3/10] htmldocs: drivers/gpu/drm/i915/intel_guc_loader.c:779: warning: No description found for parameter 'dev_priv'
by kbuild test robot 01 Dec '16

01 Dec '16

tree: git://anongit.freedesktop.org/drm-intel drm-intel-next-queued head: 192aa18142b28fdcb63b12984e02466ced382a54 commit: bf9e8429ab9747f584e692bad52a7a9f1787a4da [3/10] drm/i915: Make various init functions take dev_priv reproduce: make htmldocs All warnings (new ones prefixed by >>): make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule. include/linux/init.h:1: warning: no structured comments found include/linux/workqueue.h:392: warning: No description found for parameter '...' include/linux/workqueue.h:392: warning: Excess function parameter 'args' description in 'alloc_workqueue' include/linux/workqueue.h:413: warning: No description found for parameter '...' include/linux/workqueue.h:413: warning: Excess function parameter 'args' description in 'alloc_ordered_workqueue' include/linux/kthread.h:26: warning: No description found for parameter '...' kernel/sys.c:1: warning: no structured comments found drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found include/sound/core.h:324: warning: No description found for parameter '...' include/sound/core.h:335: warning: No description found for parameter '...' include/sound/core.h:388: warning: No description found for parameter '...' include/drm/drm_drv.h:295: warning: Incorrect use of kernel-doc format: * Hook for allocating the GEM object struct, for use by core include/drm/drm_drv.h:407: warning: No description found for parameter 'load' include/drm/drm_drv.h:407: warning: No description found for parameter 'firstopen' include/drm/drm_drv.h:407: warning: No description found for parameter 'open' include/drm/drm_drv.h:407: warning: No description found for parameter 'preclose' include/drm/drm_drv.h:407: warning: No description found for parameter 'postclose' include/drm/drm_drv.h:407: warning: No description found for parameter 'lastclose' include/drm/drm_drv.h:407: warning: No description found for parameter 'unload' include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_ioctl' include/drm/drm_drv.h:407: warning: No description found for parameter 'dma_quiescent' include/drm/drm_drv.h:407: warning: No description found for parameter 'context_dtor' include/drm/drm_drv.h:407: warning: No description found for parameter 'set_busid' include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_handler' include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_preinstall' include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_postinstall' include/drm/drm_drv.h:407: warning: No description found for parameter 'irq_uninstall' include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_init' include/drm/drm_drv.h:407: warning: No description found for parameter 'debugfs_cleanup' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_open_object' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_close_object' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_create_object' include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_handle_to_fd' include/drm/drm_drv.h:407: warning: No description found for parameter 'prime_fd_to_handle' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_export' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_pin' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_unpin' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_res_obj' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_get_sg_table' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_import_sg_table' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vmap' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_vunmap' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_prime_mmap' include/drm/drm_drv.h:407: warning: No description found for parameter 'vgaarb_irq' include/drm/drm_drv.h:407: warning: No description found for parameter 'gem_vm_ops' include/drm/drm_drv.h:407: warning: No description found for parameter 'major' include/drm/drm_drv.h:407: warning: No description found for parameter 'minor' include/drm/drm_drv.h:407: warning: No description found for parameter 'patchlevel' include/drm/drm_drv.h:407: warning: No description found for parameter 'name' include/drm/drm_drv.h:407: warning: No description found for parameter 'desc' include/drm/drm_drv.h:407: warning: No description found for parameter 'date' include/drm/drm_drv.h:407: warning: No description found for parameter 'driver_features' include/drm/drm_drv.h:407: warning: No description found for parameter 'dev_priv_size' include/drm/drm_drv.h:407: warning: No description found for parameter 'ioctls' include/drm/drm_drv.h:407: warning: No description found for parameter 'num_ioctls' include/drm/drm_drv.h:407: warning: No description found for parameter 'fops' include/drm/drm_drv.h:407: warning: No description found for parameter 'legacy_dev_list' drivers/gpu/drm/i915/intel_psr.c:822: warning: No description found for parameter 'dev_priv' drivers/gpu/drm/i915/intel_psr.c:822: warning: Excess function parameter 'dev' description in 'intel_psr_init' drivers/gpu/drm/i915/intel_psr.c:823: warning: No description found for parameter 'dev_priv' drivers/gpu/drm/i915/intel_psr.c:823: warning: Excess function parameter 'dev' description in 'intel_psr_init' >> drivers/gpu/drm/i915/intel_guc_loader.c:779: warning: No description found for parameter 'dev_priv' >> drivers/gpu/drm/i915/intel_guc_loader.c:779: warning: Excess function parameter 'dev' description in 'intel_guc_fini' drivers/gpu/drm/i915/intel_guc_loader.c:780: warning: No description found for parameter 'dev_priv' drivers/gpu/drm/i915/intel_guc_loader.c:780: warning: Excess function parameter 'dev' description in 'intel_guc_fini' include/media/media-entity.h:1054: warning: No description found for parameter '...' include/net/mac80211.h:3207: ERROR: Unexpected indentation. include/net/mac80211.h:3210: WARNING: Block quote ends without a blank line; unexpected unindent. include/net/mac80211.h:3212: ERROR: Unexpected indentation. include/net/mac80211.h:3213: WARNING: Block quote ends without a blank line; unexpected unindent. include/net/mac80211.h:1772: ERROR: Unexpected indentation. include/net/mac80211.h:1776: WARNING: Block quote ends without a blank line; unexpected unindent. kernel/sched/fair.c:7259: WARNING: Inline emphasis start-string without end-string. kernel/time/timer.c:1240: ERROR: Unexpected indentation. kernel/time/timer.c:1242: ERROR: Unexpected indentation. kernel/time/timer.c:1243: WARNING: Block quote ends without a blank line; unexpected unindent. include/linux/wait.h:121: WARNING: Block quote ends without a blank line; unexpected unindent. include/linux/wait.h:124: ERROR: Unexpected indentation. include/linux/wait.h:126: WARNING: Block quote ends without a blank line; unexpected unindent. kernel/time/hrtimer.c:1021: WARNING: Block quote ends without a blank line; unexpected unindent. kernel/signal.c:317: WARNING: Inline literal start-string without end-string. drivers/base/firmware_class.c:1348: WARNING: Bullet list ends without a blank line; unexpected unindent. drivers/message/fusion/mptbase.c:5054: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/tty/serial/serial_core.c:1893: WARNING: Definition list ends without a blank line; unexpected unindent. include/linux/spi/spi.h:369: ERROR: Unexpected indentation. WARNING: dvipng command 'dvipng' cannot be run (needed for math display), check the imgmath_dvipng setting vim +/dev_priv +779 drivers/gpu/drm/i915/intel_guc_loader.c 33a732f4 Alex Dai 2015-08-12 763 if (fw_path == NULL) 33a732f4 Alex Dai 2015-08-12 764 return; fce91f22 Dave Gordon 2016-05-20 765 if (*fw_path == '\0') 33a732f4 Alex Dai 2015-08-12 766 return; 33a732f4 Alex Dai 2015-08-12 767 33a732f4 Alex Dai 2015-08-12 768 guc_fw->guc_fw_fetch_status = GUC_FIRMWARE_PENDING; 33a732f4 Alex Dai 2015-08-12 769 DRM_DEBUG_DRIVER("GuC firmware pending, path %s\n", fw_path); bf9e8429 Tvrtko Ursulin 2016-12-01 770 guc_fw_fetch(dev_priv, guc_fw); 33a732f4 Alex Dai 2015-08-12 771 /* status must now be FAIL or SUCCESS */ 33a732f4 Alex Dai 2015-08-12 772 } 33a732f4 Alex Dai 2015-08-12 773 33a732f4 Alex Dai 2015-08-12 774 /** f09d675f Dave Gordon 2016-05-13 775 * intel_guc_fini() - clean up all allocated resources 33a732f4 Alex Dai 2015-08-12 776 * @dev: drm device 33a732f4 Alex Dai 2015-08-12 777 */ bf9e8429 Tvrtko Ursulin 2016-12-01 778 void intel_guc_fini(struct drm_i915_private *dev_priv) 33a732f4 Alex Dai 2015-08-12 @779 { 33a732f4 Alex Dai 2015-08-12 780 struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; 33a732f4 Alex Dai 2015-08-12 781 bf9e8429 Tvrtko Ursulin 2016-12-01 782 mutex_lock(&dev_priv->drm.struct_mutex); 0c5664e4 Dave Gordon 2016-09-12 783 guc_interrupts_release(dev_priv); beffa517 Dave Gordon 2016-06-10 784 i915_guc_submission_disable(dev_priv); beffa517 Dave Gordon 2016-06-10 785 i915_guc_submission_fini(dev_priv); bac427f8 Alex Dai 2015-08-12 786 33a732f4 Alex Dai 2015-08-12 787 if (guc_fw->guc_fw_obj) :::::: The code at line 779 was first introduced by commit :::::: 33a732f407fed464df687370d7bb4d64533f9920 drm/i915: GuC-specific firmware loader :::::: TO: Alex Dai <yu.dai(a)intel.com> :::::: CC: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[PATCH] drm: Make the connector .detect() callback optional
by Laurent Pinchart 01 Dec '16

01 Dec '16

Many drivers (21 to be exact) create connectors that are always connected (for instance to an LVDS or DSI panel). Instead of forcing them to implement a dummy .detect() handler, make the callback optional and consider the connector as always connected in that case. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> --- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 ------- drivers/gpu/drm/arc/arcpgu_sim.c | 7 ------- drivers/gpu/drm/ast/ast_mode.c | 7 ------- drivers/gpu/drm/bochs/bochs_kms.c | 7 ------- drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 ------- drivers/gpu/drm/bridge/parade-ps8622.c | 7 ------- drivers/gpu/drm/bridge/tc358767.c | 7 ------- drivers/gpu/drm/cirrus/cirrus_mode.c | 7 ------- drivers/gpu/drm/drm_probe_helper.c | 14 +++++++++++--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 7 ------- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 14 -------------- drivers/gpu/drm/gma500/psb_intel_lvds.c | 14 -------------- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 7 ------- drivers/gpu/drm/i915/intel_dsi.c | 7 ------- drivers/gpu/drm/imx/imx-ldb.c | 7 ------- drivers/gpu/drm/imx/imx-tve.c | 7 ------- drivers/gpu/drm/imx/parallel-display.c | 7 ------- drivers/gpu/drm/mediatek/mtk_dsi.c | 7 ------- drivers/gpu/drm/mgag200/mgag200_mode.c | 7 ------- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 7 ------- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 7 ------- drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 7 ------- drivers/gpu/drm/sti/sti_hda.c | 7 ------- drivers/gpu/drm/sun4i/sun4i_rgb.c | 7 ------- drivers/gpu/drm/sun4i/sun4i_tv.c | 7 ------- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 8 -------- include/drm/drm_connector.h | 3 +++ 27 files changed, 14 insertions(+), 193 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c index 81cbf0b05dff..1d93e123532d 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c @@ -429,12 +429,6 @@ dce_virtual_dpms(struct drm_connector *connector, int mode) return 0; } -static enum drm_connector_status -dce_virtual_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static int dce_virtual_set_property(struct drm_connector *connector, struct drm_property *property, @@ -463,7 +457,6 @@ static const struct drm_connector_helper_funcs dce_virtual_connector_helper_func static const struct drm_connector_funcs dce_virtual_connector_funcs = { .dpms = dce_virtual_dpms, - .detect = dce_virtual_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = dce_virtual_set_property, .destroy = dce_virtual_destroy, diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c index 2bf06d71556a..bca3a678c955 100644 --- a/drivers/gpu/drm/arc/arcpgu_sim.c +++ b/drivers/gpu/drm/arc/arcpgu_sim.c @@ -41,12 +41,6 @@ static int arcpgu_drm_connector_get_modes(struct drm_connector *connector) return count; } -static enum drm_connector_status -arcpgu_drm_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void arcpgu_drm_connector_destroy(struct drm_connector *connector) { drm_connector_unregister(connector); @@ -61,7 +55,6 @@ arcpgu_drm_connector_helper_funcs = { static const struct drm_connector_funcs arcpgu_drm_connector_funcs = { .dpms = drm_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, - .detect = arcpgu_drm_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = arcpgu_drm_connector_destroy, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index 5957c3e659fe..e26c98f51eb4 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -839,12 +839,6 @@ static void ast_connector_destroy(struct drm_connector *connector) kfree(connector); } -static enum drm_connector_status -ast_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_helper_funcs ast_connector_helper_funcs = { .mode_valid = ast_mode_valid, .get_modes = ast_get_modes, @@ -853,7 +847,6 @@ static const struct drm_connector_helper_funcs ast_connector_helper_funcs = { static const struct drm_connector_funcs ast_connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = ast_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = ast_connector_destroy, }; diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 0b4e5d117043..d5e63eff357b 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -216,12 +216,6 @@ bochs_connector_best_encoder(struct drm_connector *connector) return NULL; } -static enum drm_connector_status bochs_connector_detect(struct drm_connector - *connector, bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_helper_funcs bochs_connector_connector_helper_funcs = { .get_modes = bochs_connector_get_modes, .mode_valid = bochs_connector_mode_valid, @@ -230,7 +224,6 @@ static const struct drm_connector_helper_funcs bochs_connector_connector_helper_ static const struct drm_connector_funcs bochs_connector_connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = bochs_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, }; diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index f1a99938e924..27f98c518dde 100644 --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c @@ -239,16 +239,9 @@ static const struct drm_connector_helper_funcs ptn3460_connector_helper_funcs = .get_modes = ptn3460_get_modes, }; -static enum drm_connector_status ptn3460_detect(struct drm_connector *connector, - bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_funcs ptn3460_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = ptn3460_detect, .destroy = drm_connector_cleanup, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 6f7c2f9860d2..ac8cc5b50d9f 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -477,16 +477,9 @@ static const struct drm_connector_helper_funcs ps8622_connector_helper_funcs = { .get_modes = ps8622_get_modes, }; -static enum drm_connector_status ps8622_detect(struct drm_connector *connector, - bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_funcs ps8622_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = ps8622_detect, .destroy = drm_connector_cleanup, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 44d476ea6d2e..018be8911f71 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -1038,12 +1038,6 @@ static int tc_main_link_stream(struct tc_data *tc, int state) return ret; } -static enum drm_connector_status -tc_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void tc_bridge_pre_enable(struct drm_bridge *bridge) { struct tc_data *tc = bridge_to_tc(bridge); @@ -1168,7 +1162,6 @@ static const struct drm_connector_helper_funcs tc_connector_helper_funcs = { static const struct drm_connector_funcs tc_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = tc_connector_detect, .destroy = drm_connector_cleanup, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c index 17c915d9a03e..9a4a27c1afd2 100644 --- a/drivers/gpu/drm/cirrus/cirrus_mode.c +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c @@ -498,12 +498,6 @@ static struct drm_encoder *cirrus_connector_best_encoder(struct drm_connector return NULL; } -static enum drm_connector_status cirrus_vga_detect(struct drm_connector - *connector, bool force) -{ - return connector_status_connected; -} - static void cirrus_connector_destroy(struct drm_connector *connector) { drm_connector_cleanup(connector); @@ -517,7 +511,6 @@ static const struct drm_connector_helper_funcs cirrus_vga_connector_helper_funcs static const struct drm_connector_funcs cirrus_vga_connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = cirrus_vga_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = cirrus_connector_destroy, }; diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index f6b64d7d3528..078d9703a4fe 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -152,6 +152,14 @@ void drm_kms_helper_poll_enable_locked(struct drm_device *dev) } EXPORT_SYMBOL(drm_kms_helper_poll_enable_locked); +static enum drm_connector_status +drm_connector_detect(struct drm_connector *connector, bool force) +{ + return connector->funcs->detect ? + connector->funcs->detect(connector, force) : + connector_status_connected; +} + /** * drm_helper_probe_single_connector_modes - get complete set of display modes * @connector: connector to probe @@ -239,7 +247,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, if (connector->funcs->force) connector->funcs->force(connector); } else { - connector->status = connector->funcs->detect(connector, true); + connector->status = drm_connector_detect(connector, true); } /* @@ -405,7 +413,7 @@ static void output_poll_execute(struct work_struct *work) repoll = true; - connector->status = connector->funcs->detect(connector, false); + connector->status = drm_connector_detect(connector, false); if (old_status != connector->status) { const char *old, *new; @@ -565,7 +573,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev) old_status = connector->status; - connector->status = connector->funcs->detect(connector, false); + connector->status = drm_connector_detect(connector, false); DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", connector->base.id, connector->name, diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c index e1dd75b18118..05a8ee106879 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c @@ -58,17 +58,10 @@ static void fsl_dcu_drm_connector_destroy(struct drm_connector *connector) drm_connector_cleanup(connector); } -static enum drm_connector_status -fsl_dcu_drm_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_funcs fsl_dcu_drm_connector_funcs = { .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, .destroy = fsl_dcu_drm_connector_destroy, - .detect = fsl_dcu_drm_connector_detect, .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, .reset = drm_atomic_helper_connector_reset, diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c index ea733ab5b1e0..5efdb7fbb7ee 100644 --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c @@ -387,19 +387,6 @@ static void cdv_intel_lvds_mode_set(struct drm_encoder *encoder, } /** - * Detect the LVDS connection. - * - * This always returns CONNECTOR_STATUS_CONNECTED. - * This connector should only have - * been set up if the LVDS was actually connected anyway. - */ -static enum drm_connector_status cdv_intel_lvds_detect( - struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - -/** * Return the list of DDC modes if available, or the BIOS fixed mode otherwise. */ static int cdv_intel_lvds_get_modes(struct drm_connector *connector) @@ -521,7 +508,6 @@ static const struct drm_connector_helper_funcs static const struct drm_connector_funcs cdv_intel_lvds_connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = cdv_intel_lvds_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = cdv_intel_lvds_set_property, .destroy = cdv_intel_lvds_destroy, diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c index fd7c91254841..483fdce74e39 100644 --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c @@ -500,19 +500,6 @@ static void psb_intel_lvds_mode_set(struct drm_encoder *encoder, } /* - * Detect the LVDS connection. - * - * This always returns CONNECTOR_STATUS_CONNECTED. - * This connector should only have - * been set up if the LVDS was actually connected anyway. - */ -static enum drm_connector_status psb_intel_lvds_detect(struct drm_connector - *connector, bool force) -{ - return connector_status_connected; -} - -/* * Return the list of DDC modes if available, or the BIOS fixed mode otherwise. */ static int psb_intel_lvds_get_modes(struct drm_connector *connector) @@ -643,7 +630,6 @@ const struct drm_connector_helper_funcs const struct drm_connector_funcs psb_intel_lvds_connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = psb_intel_lvds_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = psb_intel_lvds_set_property, .destroy = psb_intel_lvds_destroy, diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c index d1f67a9d4d86..12a18557c5fd 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c @@ -39,12 +39,6 @@ hibmc_connector_best_encoder(struct drm_connector *connector) return drm_encoder_find(connector->dev, connector->encoder_ids[0]); } -static enum drm_connector_status hibmc_connector_detect(struct drm_connector - *connector, bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_helper_funcs hibmc_connector_helper_funcs = { .get_modes = hibmc_connector_get_modes, @@ -54,7 +48,6 @@ static const struct drm_connector_helper_funcs static const struct drm_connector_funcs hibmc_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, - .detect = hibmc_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, .reset = drm_atomic_helper_connector_reset, diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c index 4e0d025490a3..5b72c50d6f76 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c @@ -1298,12 +1298,6 @@ static void intel_dsi_prepare(struct intel_encoder *intel_encoder, } } -static enum drm_connector_status -intel_dsi_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static int intel_dsi_get_modes(struct drm_connector *connector) { struct intel_connector *intel_connector = to_intel_connector(connector); @@ -1407,7 +1401,6 @@ static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs static const struct drm_connector_funcs intel_dsi_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, - .detect = intel_dsi_detect, .late_register = intel_connector_register, .early_unregister = intel_connector_unregister, .destroy = intel_dsi_connector_destroy, diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index b300998dce7d..516d06490465 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c @@ -101,12 +101,6 @@ struct imx_ldb { const struct bus_mux *lvds_mux; }; -static enum drm_connector_status imx_ldb_connector_detect( - struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void imx_ldb_ch_set_bus_format(struct imx_ldb_channel *imx_ldb_ch, u32 bus_format) { @@ -397,7 +391,6 @@ static int imx_ldb_encoder_atomic_check(struct drm_encoder *encoder, static const struct drm_connector_funcs imx_ldb_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = imx_ldb_connector_detect, .destroy = imx_drm_connector_destroy, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c index 8fc088843e55..3b602ee33c44 100644 --- a/drivers/gpu/drm/imx/imx-tve.c +++ b/drivers/gpu/drm/imx/imx-tve.c @@ -227,12 +227,6 @@ static int tve_setup_vga(struct imx_tve *tve) TVE_TVDAC_TEST_MODE_MASK, 1); } -static enum drm_connector_status imx_tve_connector_detect( - struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static int imx_tve_connector_get_modes(struct drm_connector *connector) { struct imx_tve *tve = con_to_tve(connector); @@ -352,7 +346,6 @@ static int imx_tve_atomic_check(struct drm_encoder *encoder, static const struct drm_connector_funcs imx_tve_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = imx_tve_connector_detect, .destroy = imx_drm_connector_destroy, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index d796ada2a47a..8582a83c0d9b 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -49,12 +49,6 @@ static inline struct imx_parallel_display *enc_to_imxpd(struct drm_encoder *e) return container_of(e, struct imx_parallel_display, encoder); } -static enum drm_connector_status imx_pd_connector_detect( - struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static int imx_pd_connector_get_modes(struct drm_connector *connector) { struct imx_parallel_display *imxpd = con_to_imxpd(connector); @@ -143,7 +137,6 @@ static int imx_pd_encoder_atomic_check(struct drm_encoder *encoder, static const struct drm_connector_funcs imx_pd_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = imx_pd_connector_detect, .destroy = imx_drm_connector_destroy, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 28b2044ed9f2..30027b26a59f 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -562,12 +562,6 @@ static void mtk_dsi_encoder_enable(struct drm_encoder *encoder) mtk_output_dsi_enable(dsi); } -static enum drm_connector_status mtk_dsi_connector_detect( - struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static int mtk_dsi_connector_get_modes(struct drm_connector *connector) { struct mtk_dsi *dsi = connector_to_dsi(connector); @@ -584,7 +578,6 @@ static const struct drm_encoder_helper_funcs mtk_dsi_encoder_helper_funcs = { static const struct drm_connector_funcs mtk_dsi_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, - .detect = mtk_dsi_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, .reset = drm_atomic_helper_connector_reset, diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 6b21cb27e1cc..3a03ac4045d8 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -1658,12 +1658,6 @@ static struct drm_encoder *mga_connector_best_encoder(struct drm_connector return NULL; } -static enum drm_connector_status mga_vga_detect(struct drm_connector - *connector, bool force) -{ - return connector_status_connected; -} - static void mga_connector_destroy(struct drm_connector *connector) { struct mga_connector *mga_connector = to_mga_connector(connector); @@ -1680,7 +1674,6 @@ static const struct drm_connector_helper_funcs mga_vga_connector_helper_funcs = static const struct drm_connector_funcs mga_vga_connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = mga_vga_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = mga_connector_destroy, }; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c index ee87494f9218..ee91481131ad 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c @@ -37,12 +37,6 @@ static const struct drm_connector_helper_funcs connector_helper_funcs = { .get_modes = rcar_du_lvds_connector_get_modes, }; -static enum drm_connector_status -rcar_du_lvds_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void rcar_du_lvds_connector_destroy(struct drm_connector *connector) { struct rcar_du_connector *rcon = to_rcar_connector(connector); @@ -54,7 +48,6 @@ static void rcar_du_lvds_connector_destroy(struct drm_connector *connector) static const struct drm_connector_funcs connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, - .detect = rcar_du_lvds_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = rcar_du_lvds_connector_destroy, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index ca22e5ee89ca..d9aa382bb629 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -969,12 +969,6 @@ static struct drm_connector_helper_funcs dw_mipi_dsi_connector_helper_funcs = { .mode_valid = dw_mipi_dsi_mode_valid, }; -static enum drm_connector_status -dw_mipi_dsi_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) { drm_connector_unregister(connector); @@ -984,7 +978,6 @@ static void dw_mipi_dsi_drm_connector_destroy(struct drm_connector *connector) static struct drm_connector_funcs dw_mipi_dsi_atomic_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = dw_mipi_dsi_detect, .destroy = dw_mipi_dsi_drm_connector_destroy, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c index 6547b1db460a..dddbdd62bed0 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c @@ -669,15 +669,8 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector) drm_connector_cleanup(connector); } -static enum drm_connector_status -shmob_drm_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static const struct drm_connector_funcs connector_funcs = { .dpms = drm_helper_connector_dpms, - .detect = shmob_drm_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = shmob_drm_connector_destroy, }; diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index e7c243f70870..96f336dd0e29 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -642,12 +642,6 @@ struct drm_connector_helper_funcs sti_hda_connector_helper_funcs = { .mode_valid = sti_hda_connector_mode_valid, }; -static enum drm_connector_status -sti_hda_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static int sti_hda_late_register(struct drm_connector *connector) { struct sti_hda_connector *hda_connector @@ -665,7 +659,6 @@ static int sti_hda_late_register(struct drm_connector *connector) static const struct drm_connector_funcs sti_hda_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, .fill_modes = drm_helper_probe_single_connector_modes, - .detect = sti_hda_connector_detect, .destroy = drm_connector_cleanup, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c index c3ff10f559cc..5380085b3c06 100644 --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c @@ -110,12 +110,6 @@ static struct drm_connector_helper_funcs sun4i_rgb_con_helper_funcs = { .mode_valid = sun4i_rgb_mode_valid, }; -static enum drm_connector_status -sun4i_rgb_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void sun4i_rgb_connector_destroy(struct drm_connector *connector) { @@ -129,7 +123,6 @@ sun4i_rgb_connector_destroy(struct drm_connector *connector) static struct drm_connector_funcs sun4i_rgb_con_funcs = { .dpms = drm_atomic_helper_connector_dpms, - .detect = sun4i_rgb_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = sun4i_rgb_connector_destroy, .reset = drm_atomic_helper_connector_reset, diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index d430b331fed5..c6f47222e8fc 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -537,12 +537,6 @@ static struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = .mode_valid = sun4i_tv_comp_mode_valid, }; -static enum drm_connector_status -sun4i_tv_comp_connector_detect(struct drm_connector *connector, bool force) -{ - return connector_status_connected; -} - static void sun4i_tv_comp_connector_destroy(struct drm_connector *connector) { @@ -551,7 +545,6 @@ sun4i_tv_comp_connector_destroy(struct drm_connector *connector) static struct drm_connector_funcs sun4i_tv_comp_connector_funcs = { .dpms = drm_atomic_helper_connector_dpms, - .detect = sun4i_tv_comp_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = sun4i_tv_comp_connector_destroy, .reset = drm_atomic_helper_connector_reset, diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c index 2134bb20fbe9..e634201db821 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c @@ -144,13 +144,6 @@ static void panel_connector_destroy(struct drm_connector *connector) drm_connector_cleanup(connector); } -static enum drm_connector_status panel_connector_detect( - struct drm_connector *connector, - bool force) -{ - return connector_status_connected; -} - static int panel_connector_get_modes(struct drm_connector *connector) { struct drm_device *dev = connector->dev; @@ -197,7 +190,6 @@ static struct drm_encoder *panel_connector_best_encoder( static const struct drm_connector_funcs panel_connector_funcs = { .destroy = panel_connector_destroy, .dpms = drm_atomic_helper_connector_dpms, - .detect = panel_connector_detect, .fill_modes = drm_helper_probe_single_connector_modes, .reset = drm_atomic_helper_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index e9390b1bd3a4..43b37906e20b 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -264,6 +264,9 @@ struct drm_connector_funcs { * connector due to a user request. force can be used by the driver to * avoid expensive, destructive operations during automated probing. * + * This callback is optional, if not implemented the connector will be + * considered as always being attached. + * * FIXME: * * Note that this hook is only called by the probe helper. It's not in -- Regards, Laurent Pinchart

10 10

4.9-rc7 nouveau fails on arm64 64k page kernel but works with 4k
by Jeremy Linton 01 Dec '16

01 Dec '16

Hi, I placed a 9600GT in a softiron 3k running fedora 25, and the nouveau driver failed to claim the device with : [drm] Initialized nouveau 0000:01:00.0: NVIDIA G94 (094100a1) nouveau 0000:01:00.0: bios: version 62.94.0d.00.04 nouveau: probe of 0000:01:00.0 failed with error -22 Which with a little bit of debugging seems to be a failure in: [77216.692605] [<ffff000001404120>] ttm_bo_validate+0xb0/0x1e8 [ttm] [77216.698697] [<ffff0000014045ac>] ttm_bo_init+0x354/0x410 [ttm] [77216.704706] [<ffff0000019d7bd0>] nouveau_bo_new+0x1f4/0x314 [nouveau] [77216.711308] [<ffff0000019e4620>] nv50_display_create+0x10c/0xa1c [nouveau] [77216.718340] [<ffff0000019df898>] nouveau_display_create+0x50c/0x59c [nouveau] [77216.725632] [<ffff0000019d3e24>] nouveau_drm_load+0x22c/0x8c0 [nouveau] [77216.732286] [<ffff00000137a1a0>] drm_dev_register+0xc0/0xf0 [drm] [77216.738409] [<ffff00000137b8a4>] drm_get_pci_dev+0xbc/0x188 [drm] [77216.744663] [<ffff0000019d35e8>] nouveau_drm_probe+0x180/0x208 [nouveau] [77216.751354] [<ffff0000084c30dc>] local_pci_probe+0x50/0xb4 [77216.756827] [<ffff0000084c3e40>] pci_device_probe+0xf8/0x148 [77216.762474] [<ffff0000085b6a10>] driver_probe_device+0x284/0x420 [77216.768467] [<ffff0000085b6ccc>] __driver_attach+0x120/0x124 [77216.774115] [<ffff0000085b446c>] bus_for_each_dev+0x6c/0xac [77216.779673] [<ffff0000085b6204>] driver_attach+0x2c/0x34 [77216.784972] [<ffff0000085b5cb4>] bus_add_driver+0x244/0x2b0 [77216.790531] [<ffff0000085b78e4>] driver_register+0x68/0xfc [77216.796004] [<ffff0000084c29a8>] __pci_register_driver+0x60/0x6c [77216.802047] [<ffff00000137bcb8>] drm_pci_init+0x108/0x138 [drm] [77216.808146] [<ffff000001530158>] nouveau_drm_init+0x158/0x10000 [nouveau] [77216.814922] [<ffff0000080831a8>] do_one_initcall+0x44/0x128 [77216.820483] [<ffff0000081cad6c>] do_init_module+0x68/0x1e0 [77216.825957] [<ffff000008150d84>] load_module+0xfac/0x12bc [77216.831343] [<ffff00000815132c>] SyS_finit_module+0xe4/0xf0 [77216.836902] [<ffff000008082b70>] el0_svc_naked+0x24/0x28 By default fedora is using a 64k page kernel, switching to a mainline 4.9-rc7 kernel using the same configuration the same problem exists (there are a couple others, mentioned briefly in the defect). Changing the mainline kernel from 64k to 4k pages corrects the problem and a terminal display can be seen. The fedora defect is: https://bugzilla.redhat.com/show_bug.cgi?id=1400623 Thanks,

1 0

[PATCH v2 01/11] drm/vgem: Use ww_mutex_(un)lock even with a NULL context
by Nicolai Hähnle 01 Dec '16

01 Dec '16

From: Nicolai Hähnle <Nicolai.Haehnle(a)amd.com> v2: use resv->lock instead of resv->lock.base (Christian König) Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Maarten Lankhorst <dev(a)mblankhorst.nl> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Nicolai Hähnle <Nicolai.Haehnle(a)amd.com> --- drivers/gpu/drm/vgem/vgem_fence.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c index 488909a..9cb00a5 100644 --- a/drivers/gpu/drm/vgem/vgem_fence.c +++ b/drivers/gpu/drm/vgem/vgem_fence.c @@ -191,12 +191,12 @@ int vgem_fence_attach_ioctl(struct drm_device *dev, /* Expose the fence via the dma-buf */ ret = 0; - mutex_lock(&resv->lock.base); + ww_mutex_lock(&resv->lock, NULL); if (arg->flags & VGEM_FENCE_WRITE) reservation_object_add_excl_fence(resv, fence); else if ((ret = reservation_object_reserve_shared(resv)) == 0) reservation_object_add_shared_fence(resv, fence); - mutex_unlock(&resv->lock.base); + ww_mutex_unlock(&resv->lock); /* Record the fence in our idr for later signaling */ if (ret == 0) { -- 2.7.4

4 3

[pull] radeon and amdgpu drm-next-4.10
by Alex Deucher 01 Dec '16

01 Dec '16

Hi Dave, More features for 4.10. Highlights: - lots of code cleanup - lots of bug fixes - expose rpm based fan info via hwmon - lots of clock and powergating fixes - SI register header cleanup and conversion to common format used by newer asics The following changes since commit d8c1abd968f1c880ad8ce4ecf7df55489f8c69a1: Merge tag 'zxdrm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into drm-next (2016-11-11 10:09:13 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-next-4.10 for you to fetch changes up to e7b8243d3e0ace9f5130c3b5c3c52a50039a7501: drm/amdgpu: drop is_display_hung from display funcs (2016-11-23 15:13:21 -0500) ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu/sdma: fix typo in packet setup drm/amdgpu/uvd: consolidate code for fetching addr from ctx drm/amdgpu/uvd: reduce IB parsing overhead on UVD5+ (v2) drm/amdgpu: drop is_display_hung from display funcs Christian König (7): drm/amdgpu: disable the VRAM manager on special placements v2 drm/amdgpu: remove extra placement for AMDGPU_GEM_CREATE_NO_CPU_ACCESS drm/amdgpu: remove amdgpu_irq_get_delayed drm/amdgpu: fix amdgpu_fill_buffer (v2) drm/amdgpu: fix error handling in amdgpu_bo_create_restricted drm/amdgpu: improve AMDGPU_GEM_CREATE_VRAM_CLEARED handling (v2) drm/amdgpu: use AMDGPU_GEM_CREATE_VRAM_CLEARED for VM PD/PTs (v2) Edward O'Callaghan (2): amdgpu: Use dev_err() over vanilla printk() in vm_decode_fault() amdgpu: Wrap dev_err() calls on vm faults with printk_ratelimit() Grazvydas Ignotas (2): drm/amd/powerplay: export a function to read fan rpm drm/amd/amdgpu: expose fan rpm though hwmon Huang Rui (4): drm/amdgpu: cleanup amdgpu_cs_ioctl to make code logicality clear drm/amdgpu: remove amdgpu_cs_handle_lockup drm/amdgpu: cleanup unused iterator members for sdma v3 drm/amdgpu: cleanup unused iterator members for sdma v2.4 Maruthi Srinivas Bayyavarapu (1): drm/amdgpu: enable UVD clockgating in Polaris-10/11 Monk Liu (1): drm/amdgpu:impl vgt_flush for VI(V5) Ravikant B Sharma (1): drm/amd/amdgpu : Fix NULL pointer comparison Rex Zhu (18): drm/amd/powerplay: add new bit mask to ctrl clock stretch feature. drm/amd/powerplay: make CAC feature controlled by module parameter. drm/amdgpu/powerplay: pp module only enable smu when dpm disabled. drm/amd/powerplay: use mask bit for deepsleep/power tune feature. drm/amdgpu: use mask bit for deep sleep feature on dpm. drm/amdgpu: delete duplicate module parameter. drm/amd/powerplay: fix code style drm/amd/powerplay: enable voltage control by default for dgpu. drm/amd/powerplay: delete duplicate code in smu7_hwmgr.c drm/amdgpu: refine uvd_4.2 clock gate sequence. drm/amdgpu: not set bypass mode for uvd5.0/uvd6.0 drm/amd/powerplay: partial revert commit 01b0e7fb1. drm/amdgpu: refine uvd 5.0 clock gate feature. drm/amd/powerplay: add mask bit for fan control mode. drm/amdgpu: always un-gate UVD REGS path. drm/amdgpu: change log level to KERN_INFO in ci_dpm.c drm/amdgpu: refine cz uvd clock gate logic. drm/amdgpu: enable uvd mgcg for Fiji. Tom St Denis (8): drm/amd/amdgpu: Clean up wave gfx7 helper drm/amd/amdgpu: Clean up wave gfx8 helper drm/amd/amdgpu: Introduction of SI registers (v2) drm/amd/amdgpu: add SI defines/registers drm/amd/amdgpu: port gfx6 over to new si headers (v2) drm/amd/amdgpu: add wave reader to gfx v6 drm/amd/amdgpu: Port GMC v6 driver to new SI headers (v2) drm/amd/amdgpu: port of DCE v6 to new headers (v3) Trigger Huang (5): drm/amdgpu: Add a ring type KIQ definition drm/amdgpu:no gpu scheduler for KIQ drm/amdgpu:bypass avfs event manager for sriov drm/amd/powerplay:Tonga not to start SMC if SRIOV drm/amdgpu: Disable DPM in virtualization jimqu (1): drm/amdgpu: fix logic error for checking amdgpu_vram_page_split drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 43 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 7 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 39 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 9 - drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 47 +- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 21 + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 69 +- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 43 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 99 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 12 +- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 8 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 515 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 - drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 770 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 23 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 339 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 4 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/si_enums.h | 272 + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 42 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 113 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/vi.c | 7 +- .../gpu/drm/amd/include/asic_reg/bif/bif_3_0_d.h | 661 + .../drm/amd/include/asic_reg/bif/bif_3_0_sh_mask.h | 8127 ++++++++++++ .../gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h | 4457 +++++++ .../drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h | 9836 ++++++++++++++ .../gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h | 1784 +++ .../drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h | 12821 +++++++++++++++++++ .../gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_d.h | 1274 ++ .../drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h | 11895 +++++++++++++++++ .../gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h | 275 + .../drm/amd/include/asic_reg/oss/oss_1_0_sh_mask.h | 1079 ++ .../gpu/drm/amd/include/asic_reg/smu/smu_6_0_d.h | 148 + .../drm/amd/include/asic_reg/smu/smu_6_0_sh_mask.h | 715 ++ .../gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_d.h | 96 + .../drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h | 795 ++ .../gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h | 64 + .../drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h | 99 + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 72 +- .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 31 +- .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 14 +- .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 5 +- drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 3 + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 +- .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 3 +- 66 files changed, 55685 insertions(+), 1205 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/si_enums.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/bif/bif_3_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_6_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/oss_1_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smu/smu_6_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_d.h create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vce/vce_1_0_sh_mask.h

1 1

[PATCH 1/2] drm/i915/dsi: Fix swapping of MIPI_SEQ_DEASSERT_RESET / MIPI_SEQ_ASSERT_RESET
by Hans de Goede 01 Dec '16

01 Dec '16

Looking at the ADF code from the Android kernel sources for a cherrytrail tablet I noticed that it is calling the MIPI_SEQ_ASSERT_RESET sequence from the panel prepare hook. Until commit b1cb1bd29189 ("drm/i915/dsi: update reset and power sequences in panel prepare/unprepare hooks") the mainline i915 code was doing the same. That commits effectively swaps the calling of MIPI_SEQ_ASSERT_RESET / MIPI_SEQ_DEASSERT_RESET. Looking at the naming of the sequences that is the right thing to do, but the problem is, that the old mainline code and the ADF code was actually calling the right sequence (tested on a cube iwork8 air tablet), and the swapping of the calling breaks things. This breakage was likely not noticed in testing because on cherrytrail, currently chv_exec_gpio ends up disabling the gpio pins rather then setting them (this is fixed in the next patch in this patch-set). This commit fixes the swapping by fixing MIPI_SEQ_ASSERT/DEASSERT_RESET's places in the enum defining them, so that their (new) names match their actual use. Fixes: b1cb1bd29189 ("drm/i915/dsi: update reset and power sequences...") Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- drivers/gpu/drm/i915/intel_bios.h | 4 ++-- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index 8405b5a..642a5eb 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h @@ -49,11 +49,11 @@ struct edp_power_seq { /* MIPI Sequence Block definitions */ enum mipi_seq { MIPI_SEQ_END = 0, - MIPI_SEQ_ASSERT_RESET, + MIPI_SEQ_DEASSERT_RESET, MIPI_SEQ_INIT_OTP, MIPI_SEQ_DISPLAY_ON, MIPI_SEQ_DISPLAY_OFF, - MIPI_SEQ_DEASSERT_RESET, + MIPI_SEQ_ASSERT_RESET, MIPI_SEQ_BACKLIGHT_ON, /* sequence block v2+ */ MIPI_SEQ_BACKLIGHT_OFF, /* sequence block v2+ */ MIPI_SEQ_TEAR_ON, /* sequence block v2+ */ diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c index 0d8ff00..579d2f5 100644 --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c @@ -376,11 +376,11 @@ static const fn_mipi_elem_exec exec_elem[] = { */ static const char * const seq_name[] = { - [MIPI_SEQ_ASSERT_RESET] = "MIPI_SEQ_ASSERT_RESET", + [MIPI_SEQ_DEASSERT_RESET] = "MIPI_SEQ_DEASSERT_RESET", [MIPI_SEQ_INIT_OTP] = "MIPI_SEQ_INIT_OTP", [MIPI_SEQ_DISPLAY_ON] = "MIPI_SEQ_DISPLAY_ON", [MIPI_SEQ_DISPLAY_OFF] = "MIPI_SEQ_DISPLAY_OFF", - [MIPI_SEQ_DEASSERT_RESET] = "MIPI_SEQ_DEASSERT_RESET", + [MIPI_SEQ_ASSERT_RESET] = "MIPI_SEQ_ASSERT_RESET", [MIPI_SEQ_BACKLIGHT_ON] = "MIPI_SEQ_BACKLIGHT_ON", [MIPI_SEQ_BACKLIGHT_OFF] = "MIPI_SEQ_BACKLIGHT_OFF", [MIPI_SEQ_TEAR_ON] = "MIPI_SEQ_TEAR_ON", -- 2.9.3

2 8

[PATCH v2 03/11] locking/ww_mutex: Extract stamp comparison to __ww_mutex_stamp_after
by Nicolai Hähnle 01 Dec '16

01 Dec '16

From: Nicolai Hähnle <Nicolai.Haehnle(a)amd.com> The function will be re-used in subsequent patches. Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Maarten Lankhorst <dev(a)mblankhorst.nl> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Nicolai Hähnle <Nicolai.Haehnle(a)amd.com> --- kernel/locking/mutex.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 0afa998..200629a 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -277,6 +277,13 @@ static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww, ww_ctx->acquired++; } +static inline bool __sched +__ww_mutex_stamp_after(struct ww_acquire_ctx *a, struct ww_acquire_ctx *b) +{ + return a->stamp - b->stamp <= LONG_MAX && + (a->stamp != b->stamp || a > b); +} + /* * After acquiring lock with fastpath or when we lost out in contested * slowpath, set ctx and wake up any waiters so they can recheck. @@ -610,8 +617,7 @@ __ww_mutex_lock_check_stamp(struct mutex *lock, struct ww_acquire_ctx *ctx) if (!hold_ctx) return 0; - if (ctx->stamp - hold_ctx->stamp <= LONG_MAX && - (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) { + if (__ww_mutex_stamp_after(ctx, hold_ctx)) { #ifdef CONFIG_DEBUG_MUTEXES DEBUG_LOCKS_WARN_ON(ctx->contending_lock); ctx->contending_lock = ww; -- 2.7.4

2 1

[PATCH v2 11/11] [rfc] locking/ww_mutex: Always spin optimistically for the first waiter
by Nicolai Hähnle 01 Dec '16

01 Dec '16

From: Nicolai Hähnle <Nicolai.Haehnle(a)amd.com> Check the current owner's context once against our stamp. If our stamp is lower, we continue to spin optimistically instead of backing off. This is correct with respect to deadlock detection because while the (owner, ww_ctx) pair may re-appear if the owner task manages to unlock and re-acquire the lock while we're spinning, the context could only have been re-initialized with an even higher stamp. We also still detect when we have to back off for other waiters that join the list while we're spinning. But taking the wait_lock in mutex_spin_on_owner feels iffy, even if it is done only once. Median timings taken of a contention-heavy GPU workload: Before: real 0m53.086s user 0m7.360s sys 1m46.204s After: real 0m52.577s user 0m7.544s sys 1m49.200s Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Maarten Lankhorst <dev(a)mblankhorst.nl> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Nicolai Hähnle <Nicolai.Haehnle(a)amd.com> --- kernel/locking/mutex.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index 38d173c..9216239 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -378,6 +378,28 @@ bool mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner, struct mutex_waiter *waiter) { bool ret = true; + struct ww_acquire_ctx *owner_ww_ctx = NULL; + + if (use_ww_ctx && ww_ctx && ww_ctx->acquired > 0) { + struct ww_mutex *ww; + unsigned long flags; + + ww = container_of(lock, struct ww_mutex, base); + + /* + * Check the stamp of the current owner once. This allows us + * to spin optimistically in the case where the current owner + * has a higher stamp than us. + */ + spin_lock_mutex(&lock->wait_lock, flags); + owner_ww_ctx = ww->ctx; + if (owner_ww_ctx && + __ww_mutex_stamp_after(ww_ctx, owner_ww_ctx)) { + spin_unlock_mutex(&lock->wait_lock, flags); + return false; + } + spin_unlock_mutex(&lock->wait_lock, flags); + } rcu_read_lock(); while (__mutex_owner(lock) == owner) { @@ -414,9 +436,16 @@ bool mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner, * Check this in every inner iteration because we may * be racing against another thread's ww_mutex_lock. */ - if (ww_ctx->acquired > 0 && READ_ONCE(ww->ctx)) { - ret = false; - break; + if (ww_ctx->acquired > 0) { + struct ww_acquire_ctx *current_ctx; + + current_ctx = READ_ONCE(ww->ctx); + + if (current_ctx && + current_ctx != owner_ww_ctx) { + ret = false; + break; + } } /* -- 2.7.4

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel December 2016