dri-devel December 2015

dri-devel@lists.freedesktop.org

162 participants
1148 discussions

[PATCH 00/28] kerneldoc for display vtables
by Daniel Vetter 08 Dec '15

08 Dec '15

Hi all, So here's finally my promised doc update for atomic, with massive amounts of kerneldoc in the new in-line style for all the vfunc hooks we have in the KMS code (so yeah also all the legacy hooks are documented). This also merges in anything from Laurent's original docbook docs, where it wasn't outdated by atomic. Of course there's still lots left to do with docs ;-) Comments, review and feeback highly welcome! Cheers, Daniel Daniel Vetter (28): drm: Polish fbdev helper struct docs drm: Move LEAVE/ENTER_ATOMIC_MODESET to fbdev helpers drm: Reorganize helper vtables and their docs drm: Make helper vtable pointers type-safe drm: Merge helper docbook into kerneldoc comments drm/bridge: Improve kerneldoc drm: Update drm_plane_funcs kerneldoc drm/noveau: Ditch NULL save/restore hook assignments drm/qxl: Drop dummy save/restore hooks drm/virtio: Drop dummy save/restore functions drm/vmwgfx: Drop dummy save/restore hooks drm/gma500: Move to private save/restore hooks drm/nouveau: Use private save/restore hooks drm: Remove crtc/connector->save/restore hooks drm: Move encoder->save/restore into nouveau drm: Document drm_atomic_*_get_property drm: Document drm_connector_funcs drm: connector->dpms is not optional drm: document drm_crtc_funcs drm: Add kerneldoc for drm_framebuffer_funcs drm: Kerneldoc for drm_mode_config_funcs drm/atomic-helper: Reject attempts at re-stealing encoders drm: Document drm_plane_helper_funcs drm: Document drm_connector_helper_funcs drm/atomic-helper: Mention the new system/resume helpers the docs drm: Move drm_display_mode an related docs into kerneldoc drm: Document drm_encoder/crtc_helper_funcs drm/atomic-helper: Reject legacy flips on a disabled pipe Documentation/DocBook/gpu.tmpl | 500 +----------- drivers/gpu/drm/drm_atomic.c | 42 +- drivers/gpu/drm/drm_atomic_helper.c | 48 ++ drivers/gpu/drm/drm_bridge.c | 69 +- drivers/gpu/drm/drm_crtc.c | 4 +- drivers/gpu/drm/drm_crtc_helper.c | 52 +- drivers/gpu/drm/drm_modes.c | 3 +- drivers/gpu/drm/drm_plane_helper.c | 4 + drivers/gpu/drm/drm_probe_helper.c | 30 +- drivers/gpu/drm/gma500/cdv_device.c | 2 + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 - drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 5 +- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 4 +- drivers/gpu/drm/gma500/mdfld_device.c | 2 + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +- drivers/gpu/drm/gma500/oaktrail_device.c | 2 + drivers/gpu/drm/gma500/psb_device.c | 22 +- drivers/gpu/drm/gma500/psb_drv.h | 2 + drivers/gpu/drm/gma500/psb_intel_display.c | 2 - drivers/gpu/drm/gma500/psb_intel_drv.h | 3 + drivers/gpu/drm/gma500/psb_intel_lvds.c | 5 +- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 5 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 5 +- drivers/gpu/drm/nouveau/dispnv04/dac.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/dfp.c | 7 +- drivers/gpu/drm/nouveau/dispnv04/disp.c | 43 +- drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 5 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 5 +- drivers/gpu/drm/nouveau/nouveau_connector.c | 6 - drivers/gpu/drm/nouveau/nouveau_crtc.h | 3 + drivers/gpu/drm/nouveau/nouveau_encoder.h | 3 + drivers/gpu/drm/nouveau/nv50_display.c | 1 + drivers/gpu/drm/qxl/qxl_display.c | 12 - drivers/gpu/drm/virtio/virtgpu_display.c | 12 - drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 16 - drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 - drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 - drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 4 - include/drm/drm_crtc.h | 1157 ++++++++++++++++++++++++--- include/drm/drm_crtc_helper.h | 161 +--- include/drm/drm_fb_helper.h | 97 ++- include/drm/drm_modes.h | 342 ++++++-- include/drm/drm_modeset_helper_vtables.h | 884 ++++++++++++++++++++ include/drm/drm_plane_helper.h | 38 +- 44 files changed, 2600 insertions(+), 1031 deletions(-) create mode 100644 include/drm/drm_modeset_helper_vtables.h -- 2.5.1

8 80

[PATCH v3 00/15] ASoC: hdac_hdmi: Add DP & notification support
by Subhransu S. Prusty 08 Dec '15

08 Dec '15

This patch series adds DP audio and hotplug notification support. On Skylake two DP ports are available and to enable DP on both ports all pins need to be enabled. There is a special vendor widget which need to be programmed to enable all pins and converters. This series adds hotplug notification, read/set constraint based on ELD, enable all pin/cvts, DP1.2, programs the audio infoframe for DP. There is a one to one mapping between converter and stream, so the dais are created based on the no of streams supported on hdmi codec. Even though cvts can be mapped dynamically to the streams, currently it is statically mapped as simultaneous playback on both DP and HDMI is not supported as of now. Pin muxes and controls are created dynamically to map converter to pin widget. So at run time specific pin is mapped to the dai based on the control selected (based on the display type DP/HDMI connected). Finally the DP audio infoframe programming is added to support the DP feature. Also with hotplug notification support, ELD is read and capabilities are set for rate, formats and channels. drm_eld sound/core framework is updated to limit the formats based on ELD. There are few fixes one fixing the static checker warning and other one not to fail if no connection list is found for a pin widget. Pls note, the 10th patch is adding a small macro for getting connection type in drm header, we have CCed drm folks on that and this one. Pls ack so that we can have this series merged thru sound trees changes in v3: - Addressed review comments - Use of list_for_each_entry_safe for node deletion. - Moved the format constraint based on ELD to driver - Fix constant as per kernel doc for connection type in drm helper - Fix dp infoframe - Add hotplug event reporting to user space - Move device configuration from dai startup to hw_params as the user space can keep the device open always. Jeeja KP (2): ASoC: hdac_hdmi: Add codec suspend/resume handler ASoC: hdac_hdmi: Fix to enable device configuration in hw_params Ramesh Babu (1): ASoC: hdac_hdmi: Fix to keep display active while enumerating codec Subhransu S. Prusty (12): ASoC: hdac_hdmi: Fix to check num nodes correctly ASoC: hdac_hdmi: Fix to warn instead of err for no connected nids ASoC: hdac_hdmi: Use list to add pins and converters ASoC: hdac_hdmi: Add hotplug notification and read eld ASoC: hdac_hdmi: Apply constraints based on ELD ASoC: hdac_hdmi: Enable DP1.2 and all converters/pins ASoC: hdac_hdmi: create dais based on number of streams ASoC: hdac_hdmi: Create widget/route based on nodes enumerated ASoC: hdac_hdmi: Assign pin for stream based on dapm connection drm/edid: Add API to help find connection type ASoC: hdac_hdmi: Add infoframe support for dp audio ASoC: hdac_hdmi: Add jack reporting for user space include/drm/drm_edid.h | 12 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdac_hdmi.c | 1101 +++++++++++++++++++++++++++++++++++------- 3 files changed, 936 insertions(+), 178 deletions(-) -- 1.9.1

2 2

i915 Skylake crash on 4.4-rc3
by Andy Lutomirski 08 Dec '15

08 Dec '15

[53834.386369] traps: gnome-session-b[2308] general protection ip:7f10efc1fc2b sp:7ffdfde31880 error:0 in libc-2.22.so[7f10efba1000+1b7000] [53834.687584] ------------[ cut here ]------------ [53834.687607] WARNING: CPU: 0 PID: 23730 at drivers/gpu/drm/i915/i915_gem_context.c:144 i915_gem_context_free+0x196/0x1c0 [i915]() [53834.687609] WARN_ON(!list_empty(&ppgtt->base.active_list)) [53834.687610] Modules linked in: [53834.687612] wmi_mof dell_wmi wmi(E) rfcomm fuse ccm cmac xt_CHECKSUM ipt_MASQUERADE nf_nat_masquerade_ipv4 tun nf_conntrack_netbios_ns nf_conntrack_broadcast ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 xt_conntrack ebtable_broute bridge stp llc ebtable_nat ebtable_filter ebtables ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_raw ip6table_security ip6table_filter ip6_tables iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_raw iptable_security arc4 bnep iwlmvm mac80211 snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel iwlwifi snd_hda_codec intel_rapl x86_pkg_temp_thermal snd_hwdep coretemp snd_hda_core kvm_intel btusb snd_seq btrtl kvm uvcvideo btbcm cfg80211 btintel bluetooth snd_seq_device [53834.687656] videobuf2_vmalloc snd_pcm videobuf2_memops videobuf2_v4l2 hid_multitouch videobuf2_core sparse_keymap v4l2_common videodev i2c_designware_platform i2c_designware_core vfat snd_timer fat irqbypass dell_laptop snd dcdbas efi_pstore pcspkr joydev efivars media rtsx_pci_ms rfkill soundcore i2c_i801 memstick pinctrl_sunrisepoint pinctrl_intel intel_lpss_acpi int3400_thermal int3403_thermal acpi_thermal_rel acpi_pad mei_me tpm_tis mei tpm idma64 shpchp virt_dma acpi_als kfifo_buf processor_thermal_device nfsd industrialio intel_soc_dts_iosf iosf_mbi intel_lpss_pci int340x_thermal_zone intel_lpss auth_rpcgss nfs_acl lockd grace sunrpc dm_crypt i915 i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm rtsx_pci_sdmmc mmc_core crct10dif_pclmul crc32_pclmul crc32c_intel [53834.687700] serio_raw rtsx_pci i2c_hid video [last unloaded: wmi] [53834.687706] CPU: 0 PID: 23730 Comm: kworker/u8:4 Tainted: G W E 4.4.0-rc3+ #19 [53834.687708] Hardware name: Dell Inc. XPS 13 9350/07TYC2, BIOS 1.0.4 10/19/2015 [53834.687726] Workqueue: i915 i915_gem_retire_work_handler [i915] [53834.687728] 0000000000000000 00000000c62a1d15 ffff88017ffb7c70 ffffffff8142510c [53834.687731] ffff88017ffb7cb8 ffff88017ffb7ca8 ffffffff81092122 ffff8802adfd1240 [53834.687734] ffff8802845dd800 ffff880284680000 ffff88017ffb7d70 ffff8802adfd12b8 [53834.687738] Call Trace: [53834.687743] [<ffffffff8142510c>] dump_stack+0x4e/0x82 [53834.687747] [<ffffffff81092122>] warn_slowpath_common+0x82/0xc0 [53834.687750] [<ffffffff810921bc>] warn_slowpath_fmt+0x5c/0x80 [53834.687764] [<ffffffffa012b7c6>] i915_gem_context_free+0x196/0x1c0 [i915] [53834.687777] [<ffffffffa01392df>] i915_gem_request_free+0x9f/0xb0 [i915] [53834.687792] [<ffffffffa014e7f8>] intel_execlists_retire_requests+0x138/0x190 [i915] [53834.687806] [<ffffffffa013b841>] i915_gem_retire_requests+0xd1/0xe0 [i915] [53834.687827] [<ffffffffa013bbc8>] i915_gem_retire_work_handler+0x58/0x70 [i915] [53834.687831] [<ffffffff810aa832>] process_one_work+0x152/0x400 [53834.687834] [<ffffffff810aab2b>] worker_thread+0x4b/0x440 [53834.687837] [<ffffffff810aaae0>] ? process_one_work+0x400/0x400 [53834.687839] [<ffffffff810aaae0>] ? process_one_work+0x400/0x400 [53834.687842] [<ffffffff810b0648>] kthread+0xd8/0xf0 [53834.687845] [<ffffffff810b0570>] ? kthread_worker_fn+0x150/0x150 [53834.687849] [<ffffffff81811e8f>] ret_from_fork+0x3f/0x70 [53834.687851] [<ffffffff810b0570>] ? kthread_worker_fn+0x150/0x150 [53834.690419] ---[ end trace 1802637761c0942d ]--- I think this happened when I started emacs. My user session crashed, but the system is still usable after logging back in. --Andy

4 3

[PATCH] drm/i2c/tda998x: Remove unused save/restore drm encoder helpers.
by Rodrigo Vivi 08 Dec '15

08 Dec '15

save/restore have been removed from drm_encoder_helper_funcs by 'commit 79f13ad5d8e0 ("drm: Move encoder->save/restore into nouveau")' But this module was still defining it with empty content causing compilation fails: drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .save = tda998x_encoder_save, drivers/gpu/drm/i2c/tda998x_drv.c:1355:2: error: unknown field 'restore' specified in initializer .restore = tda998x_encoder_restore, Cc: Reinette Chatre <reinette.chatre(a)intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> --- drivers/gpu/drm/i2c/tda998x_drv.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 896b6aa..79cb920 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -855,18 +855,6 @@ static void tda998x_encoder_dpms(struct drm_encoder *encoder, int mode) priv->dpms = mode; } -static void -tda998x_encoder_save(struct drm_encoder *encoder) -{ - DBG(""); -} - -static void -tda998x_encoder_restore(struct drm_encoder *encoder) -{ - DBG(""); -} - static bool tda998x_encoder_mode_fixup(struct drm_encoder *encoder, const struct drm_display_mode *mode, @@ -1351,8 +1339,6 @@ static void tda998x_encoder_commit(struct drm_encoder *encoder) static const struct drm_encoder_helper_funcs tda998x_encoder_helper_funcs = { .dpms = tda998x_encoder_dpms, - .save = tda998x_encoder_save, - .restore = tda998x_encoder_restore, .mode_fixup = tda998x_encoder_mode_fixup, .prepare = tda998x_encoder_prepare, .commit = tda998x_encoder_commit, -- 2.4.3

2 1

[PATCH 1/4] drm: Make drm_fb_unregister/remove accept NULL fb
by Daniel Vetter 08 Dec '15

08 Dec '15

These functions are used by drivers to release fbdev emulation buffers. We need to make them resilient to NULL pointers to make the fbdev compile/runtime knobs not cause Oopses on module unload. Cc: Archit Taneja <architt(a)codeaurora.org> Signed-off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- drivers/gpu/drm/drm_crtc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 33d877c65ced..884690c81094 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -538,7 +538,12 @@ EXPORT_SYMBOL(drm_framebuffer_reference); */ void drm_framebuffer_unregister_private(struct drm_framebuffer *fb) { - struct drm_device *dev = fb->dev; + struct drm_device *dev; + + if (!fb) + return; + + dev = fb->dev; mutex_lock(&dev->mode_config.fb_lock); /* Mark fb as reaped and drop idr ref. */ @@ -589,12 +594,17 @@ EXPORT_SYMBOL(drm_framebuffer_cleanup); */ void drm_framebuffer_remove(struct drm_framebuffer *fb) { - struct drm_device *dev = fb->dev; + struct drm_device *dev; struct drm_crtc *crtc; struct drm_plane *plane; struct drm_mode_set set; int ret; + if (!fb) + return; + + dev = fb->dev; + WARN_ON(!list_empty(&fb->filp_head)); /* -- 1.8.3.1

5 24

[PATCH v3] staging/android: add TODO to de-stage android sync framework
by Gustavo Padovan 08 Dec '15

08 Dec '15

From: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> - remove CONFIG_SW_SYNC_USER, it is used only for testing/debugging and should not be upstreamed. - port CONFIG_SW_SYNC_USER tests interfaces to use debugfs somehow - port libsync tests to kselftest - clean up and ABI check for security issues - move the sync framework to drivers/base/dma-buf Cc: Arve Hjønnevåg <arve(a)android.com> Cc: Riley Andrews <riandrews(a)android.com> Cc: Daniel Vetter <daniel.vetter(a)ffwll.ch> Cc: Rob Clark <robdclark(a)gmail.com> Cc: Greg Hackmann <ghackmann(a)google.com> Cc: John Harrison <John.C.Harrison(a)Intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk> --- drivers/staging/android/TODO | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/staging/android/TODO b/drivers/staging/android/TODO index 8f3ac37..64d8c87 100644 --- a/drivers/staging/android/TODO +++ b/drivers/staging/android/TODO @@ -25,5 +25,13 @@ ion/ exposes existing cma regions and doesn't reserve unecessarily memory when booting a system which doesn't use ion. +sync framework: + - remove CONFIG_SW_SYNC_USER, it is used only for testing/debugging and + should not be upstreamed. + - port CONFIG_SW_SYNC_USER tests interfaces to use debugfs somehow + - port libsync tests to kselftest + - clean up and ABI check for security issues + - move it to drivers/base/dma-buf + Please send patches to Greg Kroah-Hartman <greg(a)kroah.com> and Cc: Arve Hjønnevåg <arve(a)android.com> and Riley Andrews <riandrews(a)android.com> -- 2.1.0

2 2

[PATCH 1/9] drm: Create a driver hook for allocating GEM object structs.
by Eric Anholt 08 Dec '15

08 Dec '15

The CMA helpers had no way for a driver to extend the struct with its own fields. Since the CMA helpers are mostly "Allocate a drm_gem_cma_object, then fill in a few fields", it's hard to write as pure helpers without passing in a driver callback for the allocate step. Signed-off-by: Eric Anholt <eric(a)anholt.net> --- drivers/gpu/drm/drm_gem_cma_helper.c | 10 ++++++---- include/drm/drmP.h | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_cma_helper.c b/drivers/gpu/drm/drm_gem_cma_helper.c index e109b49..0f7b00ba 100644 --- a/drivers/gpu/drm/drm_gem_cma_helper.c +++ b/drivers/gpu/drm/drm_gem_cma_helper.c @@ -59,11 +59,13 @@ __drm_gem_cma_create(struct drm_device *drm, size_t size) struct drm_gem_object *gem_obj; int ret; - cma_obj = kzalloc(sizeof(*cma_obj), GFP_KERNEL); - if (!cma_obj) + if (drm->driver->gem_create_object) + gem_obj = drm->driver->gem_create_object(drm, size); + else + gem_obj = kzalloc(sizeof(*cma_obj), GFP_KERNEL); + if (!gem_obj) return ERR_PTR(-ENOMEM); - - gem_obj = &cma_obj->base; + cma_obj = container_of(gem_obj, struct drm_gem_cma_object, base); ret = drm_gem_object_init(drm, gem_obj, size); if (ret) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0b921ae..22ff162 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -580,6 +580,13 @@ struct drm_driver { int (*gem_open_object) (struct drm_gem_object *, struct drm_file *); void (*gem_close_object) (struct drm_gem_object *, struct drm_file *); + /** + * Hook for allocating the GEM object struct, for use by core + * helpers. + */ + struct drm_gem_object *(*gem_create_object)(struct drm_device *dev, + size_t size); + /* prime: */ /* export handle -> fd (see drm_gem_prime_handle_to_fd() helper) */ int (*prime_handle_to_fd)(struct drm_device *dev, struct drm_file *file_priv, -- 2.6.2

5 26

linux-next: build failure after merge of the drm-misc tree
by Stephen Rothwell 08 Dec '15

08 Dec '15

Hi all, After merging the drm-misc tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/i2c/tda998x_drv.c:1354:2: error: unknown field 'save' specified in initializer .save = tda998x_encoder_save, ^ drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] .save = tda998x_encoder_save, ^ drivers/gpu/drm/i2c/tda998x_drv.c:1354:10: note: (near initialization for 'tda998x_encoder_helper_funcs.mode_fixup') drivers/gpu/drm/i2c/tda998x_drv.c:1355:2: error: unknown field 'restore' specified in initializer .restore = tda998x_encoder_restore, ^ Caused by commit 79f13ad5d8e0 ("drm: Move encoder->save/restore into nouveau") I have used the drm-misc tree from next-20151207 for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au

1 0

[PATCH] drm: do not use device name as a format string
by Nicolas Iooss 07 Dec '15

07 Dec '15

drm_dev_set_unique() formats its parameter using kvasprintf() but many of its callers directly pass dev_name(dev) as printf format string, without any format parameter. This can cause some issues when the device name contains '%' characters. To avoid any potential issue, always use "%s" when using drm_dev_set_unique() with dev_name(). Signed-off-by: Nicolas Iooss <nicolas.iooss_linux(a)m4x.org> --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/tegra/drm.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- include/drm/drmP.h | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 244df0a440b7..0d720d3a7ee0 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -733,7 +733,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev) if (!ddev) return -ENOMEM; - ret = drm_dev_set_unique(ddev, dev_name(ddev->dev)); + ret = drm_dev_set_unique(ddev, "%s", dev_name(ddev->dev)); if (ret) goto err_unref; diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 1930234ba5f1..947d75f59881 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -363,7 +363,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) fsl_dev->np = dev->of_node; drm->dev_private = fsl_dev; dev_set_drvdata(dev, fsl_dev); - drm_dev_set_unique(drm, dev_name(dev)); + drm_dev_set_unique(drm, "%s", dev_name(dev)); ret = drm_dev_register(drm, 0); if (ret < 0) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 159ef515cab1..b278f60f4376 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -991,7 +991,7 @@ static int host1x_drm_probe(struct host1x_device *dev) if (!drm) return -ENOMEM; - drm_dev_set_unique(drm, dev_name(&dev->dev)); + drm_dev_set_unique(drm, "%s", dev_name(&dev->dev)); dev_set_drvdata(&dev->dev, drm); err = drm_dev_register(drm, 0); diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 6e730605edcc..c90a451aaa79 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -168,7 +168,7 @@ static int vc4_drm_bind(struct device *dev) vc4->dev = drm; drm->dev_private = vc4; - drm_dev_set_unique(drm, dev_name(dev)); + drm_dev_set_unique(drm, "%s", dev_name(dev)); drm_mode_config_init(drm); if (ret) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0b921ae06cd8..995fb96cb740 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1049,6 +1049,7 @@ void drm_dev_ref(struct drm_device *dev); void drm_dev_unref(struct drm_device *dev); int drm_dev_register(struct drm_device *dev, unsigned long flags); void drm_dev_unregister(struct drm_device *dev); +__printf(2, 3) int drm_dev_set_unique(struct drm_device *dev, const char *fmt, ...); struct drm_minor *drm_minor_acquire(unsigned int minor_id); -- 2.6.2

5 9

[PATCH] drm: msm: dsi: Added missing mutex_unlock
by Saurabh Sengar 07 Dec '15

07 Dec '15

in case of failed to get iova, function was returning without releasing the mutex. Added it. Signed-off-by: Saurabh Sengar <saurabh.truth(a)gmail.com> --- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index 4c49868..13f937b 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -849,11 +849,11 @@ static int dsi_tx_buf_alloc(struct msm_dsi_host *msm_host, int size) } ret = msm_gem_get_iova_locked(msm_host->tx_gem_obj, 0, &iova); + mutex_unlock(&dev->struct_mutex); if (ret) { pr_err("%s: failed to get iova, %d\n", __func__, ret); return ret; } - mutex_unlock(&dev->struct_mutex); if (iova & 0x07) { pr_err("%s: buf NOT 8 bytes aligned\n", __func__); -- 1.9.1

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel December 2015