dri-devel August 2015

dri-devel@lists.freedesktop.org

178 participants
1142 discussions

[Bug 73530] New: Asus U38N: Black screen with Radeon driver in Linux 3.10, 3.11 and 3.12
by bugzilla-daemon＠freedesktop.org 12 Aug '15

12 Aug '15

https://bugs.freedesktop.org/show_bug.cgi?id=73530 Priority: medium Bug ID: 73530 Assignee: dri-devel(a)lists.freedesktop.org Summary: Asus U38N: Black screen with Radeon driver in Linux 3.10, 3.11 and 3.12 Severity: major Classification: Unclassified OS: All Reporter: paulepanter(a)users.sourceforge.net Hardware: Other Status: NEW Version: XOrg CVS … [View More]Component: DRM/Radeon Product: DRI Copying my message to list dri-devel [1]. As reported in the channel #radeon on <irc.freenode.net>, with the laptop Asus U38N-C4010H with an AMD Radeon HD 7600G (Trinity A8-4555M) I am unable to get something displayed on the screen with modesetting enabled. The backlight of the screen is on, but nothing is shown on the screen. Booting with `radeon.modeset=0` on the Linux kernel command line works. I was able to reproduce this problem with Grml with Linux 3.10 and 3.11 and Debian Sid/unstable with Linux 3.12.6. Attaching a VGA monitor to the mini VGA connector using an adapter, nothing was shown on the monitor either. The following is the output I get when starting with `radeon.modeset=0` and then doing `sudo modprobe -r radeon` and `sudo modprobe radeon modeset=1`. Jan 11 06:42:24 myhostname kernel: [ 1060.871165] [drm] radeon kernel modesetting enabled. Jan 11 06:42:24 myhostname kernel: [ 1060.871244] checking generic (d0000000 1f0000) vs hw (d0000000 10000000) Jan 11 06:42:24 myhostname kernel: [ 1060.871247] fb: conflicting fb hw usage radeondrmfb vs EFI VGA - removing generic driver Jan 11 06:42:24 myhostname kernel: [ 1060.871322] Console: switching to colour dummy device 80x25 Jan 11 06:42:24 myhostname kernel: [ 1060.871836] [drm] initializing kernel modesetting (ARUBA 0x1002:0x9908 0x1043:0x1557). Jan 11 06:42:24 myhostname kernel: [ 1060.871882] [drm] register mmio base: 0xFEB00000 Jan 11 06:42:24 myhostname kernel: [ 1060.871884] [drm] register mmio size: 262144 Jan 11 06:42:24 myhostname kernel: [ 1060.871913] [drm] ACPI VFCT contains a BIOS for 00:01.0 1002:9908, size 19968 Jan 11 06:42:24 myhostname kernel: [ 1060.871925] ATOM BIOS: 113 Jan 11 06:42:24 myhostname kernel: [ 1060.871997] radeon 0000:00:01.0: VRAM: 768M 0x0000000000000000 - 0x000000002FFFFFFF (768M used) Jan 11 06:42:24 myhostname kernel: [ 1060.872000] radeon 0000:00:01.0: GTT: 1024M 0x0000000030000000 - 0x000000006FFFFFFF Jan 11 06:42:24 myhostname kernel: [ 1060.872003] [drm] Detected VRAM RAM=768M, BAR=256M Jan 11 06:42:24 myhostname kernel: [ 1060.872005] [drm] RAM width 64bits DDR Jan 11 06:42:24 myhostname kernel: [ 1060.872088] [TTM] Zone kernel: Available graphics memory: 1581256 kiB Jan 11 06:42:24 myhostname kernel: [ 1060.872091] [TTM] Initializing pool allocator Jan 11 06:42:24 myhostname kernel: [ 1060.872101] [TTM] Initializing DMA pool allocator Jan 11 06:42:24 myhostname kernel: [ 1060.872129] [drm] radeon: 768M of VRAM memory ready Jan 11 06:42:24 myhostname kernel: [ 1060.872133] [drm] radeon: 1024M of GTT memory ready. Jan 11 06:42:24 myhostname kernel: [ 1060.874660] radeon 0000:00:01.0: firmware: direct-loading firmware radeon/TAHITI_uvd.bin Jan 11 06:42:24 myhostname kernel: [ 1060.874989] [drm] GART: num cpu pages 262144, num gpu pages 262144 Jan 11 06:42:24 myhostname kernel: [ 1060.882325] [drm] Loading ARUBA Microcode Jan 11 06:42:24 myhostname kernel: [ 1060.882749] radeon 0000:00:01.0: firmware: direct-loading firmware radeon/ARUBA_pfp.bin Jan 11 06:42:24 myhostname kernel: [ 1060.883100] radeon 0000:00:01.0: firmware: direct-loading firmware radeon/ARUBA_me.bin Jan 11 06:42:24 myhostname kernel: [ 1060.883456] radeon 0000:00:01.0: firmware: direct-loading firmware radeon/ARUBA_rlc.bin Jan 11 06:42:24 myhostname kernel: [ 1060.884967] [drm] PCIE GART of 1024M enabled (table at 0x0000000000276000). Jan 11 06:42:24 myhostname kernel: [ 1060.885159] radeon 0000:00:01.0: WB enabled Jan 11 06:42:24 myhostname kernel: [ 1060.885166] radeon 0000:00:01.0: fence driver on ring 0 use gpu addr 0x0000000030000c00 and cpu addr 0xffff880129f11c00 Jan 11 06:42:24 myhostname kernel: [ 1060.885905] radeon 0000:00:01.0: fence driver on ring 5 use gpu addr 0x0000000000075a18 and cpu addr 0xffffc90011db5a18 Jan 11 06:42:24 myhostname kernel: [ 1060.885910] radeon 0000:00:01.0: fence driver on ring 1 use gpu addr 0x0000000030000c04 and cpu addr 0xffff880129f11c04 Jan 11 06:42:24 myhostname kernel: [ 1060.885914] radeon 0000:00:01.0: fence driver on ring 2 use gpu addr 0x0000000030000c08 and cpu addr 0xffff880129f11c08 Jan 11 06:42:24 myhostname kernel: [ 1060.885918] radeon 0000:00:01.0: fence driver on ring 3 use gpu addr 0x0000000030000c0c and cpu addr 0xffff880129f11c0c Jan 11 06:42:24 myhostname kernel: [ 1060.885922] radeon 0000:00:01.0: fence driver on ring 4 use gpu addr 0x0000000030000c10 and cpu addr 0xffff880129f11c10 Jan 11 06:42:24 myhostname kernel: [ 1060.885929] [drm] Supports vblank timestamp caching Rev 1 (10.10.2010). Jan 11 06:42:24 myhostname kernel: [ 1060.885931] [drm] Driver supports precise vblank timestamp query. Jan 11 06:42:24 myhostname kernel: [ 1060.885958] radeon 0000:00:01.0: irq 52 for MSI/MSI-X Jan 11 06:42:24 myhostname kernel: [ 1060.885982] radeon 0000:00:01.0: radeon: using MSI. Jan 11 06:42:24 myhostname kernel: [ 1060.886266] [drm] radeon: irq initialized. Jan 11 06:42:24 myhostname kernel: [ 1060.905813] [drm] ring test on 0 succeeded in 2 usecs Jan 11 06:42:24 myhostname kernel: [ 1060.905876] [drm] ring test on 3 succeeded in 2 usecs Jan 11 06:42:24 myhostname kernel: [ 1060.905885] [drm] ring test on 4 succeeded in 1 usecs Jan 11 06:42:24 myhostname kernel: [ 1060.961514] [drm] ring test on 5 succeeded in 1 usecs Jan 11 06:42:24 myhostname kernel: [ 1060.981502] [drm] UVD initialized successfully. Jan 11 06:42:24 myhostname kernel: [ 1060.985538] [drm] Enabling audio 0 support Jan 11 06:42:24 myhostname kernel: [ 1060.985544] [drm] Enabling audio 1 support Jan 11 06:42:24 myhostname kernel: [ 1060.985549] [drm] Enabling audio 2 support Jan 11 06:42:24 myhostname kernel: [ 1060.985553] [drm] Enabling audio 3 support Jan 11 06:42:24 myhostname kernel: [ 1060.985557] [drm] Enabling audio 4 support Jan 11 06:42:24 myhostname kernel: [ 1060.985560] [drm] Enabling audio 5 support Jan 11 06:42:24 myhostname kernel: [ 1060.986106] [drm] ib test on ring 0 succeeded in 0 usecs Jan 11 06:42:24 myhostname kernel: [ 1060.986644] [drm] ib test on ring 3 succeeded in 0 usecs Jan 11 06:42:24 myhostname kernel: [ 1060.987175] [drm] ib test on ring 4 succeeded in 1 usecs Jan 11 06:42:24 myhostname kernel: [ 1061.007977] [drm] ib test on ring 5 succeeded Jan 11 06:42:24 myhostname kernel: [ 1061.032890] [drm] radeon atom DIG backlight initialized Jan 11 06:42:24 myhostname kernel: [ 1061.032894] [drm] Radeon Display Connectors Jan 11 06:42:24 myhostname kernel: [ 1061.032897] [drm] Connector 0: Jan 11 06:42:24 myhostname kernel: [ 1061.032899] [drm] eDP-1 Jan 11 06:42:24 myhostname kernel: [ 1061.032901] [drm] HPD1 Jan 11 06:42:24 myhostname kernel: [ 1061.032904] [drm] DDC: 0x6530 0x6530 0x6534 0x6534 0x6538 0x6538 0x653c 0x653c Jan 11 06:42:24 myhostname kernel: [ 1061.032906] [drm] Encoders: Jan 11 06:42:24 myhostname kernel: [ 1061.032908] [drm] LCD1: INTERNAL_UNIPHY2 Jan 11 06:42:24 myhostname kernel: [ 1061.032909] [drm] Connector 1: Jan 11 06:42:24 myhostname kernel: [ 1061.032911] [drm] VGA-1 Jan 11 06:42:24 myhostname kernel: [ 1061.032912] [drm] HPD2 Jan 11 06:42:24 myhostname kernel: [ 1061.032915] [drm] DDC: 0x6540 0x6540 0x6544 0x6544 0x6548 0x6548 0x654c 0x654c Jan 11 06:42:24 myhostname kernel: [ 1061.032916] [drm] Encoders: Jan 11 06:42:24 myhostname kernel: [ 1061.032917] [drm] CRT1: INTERNAL_UNIPHY2 Jan 11 06:42:24 myhostname kernel: [ 1061.032919] [drm] CRT1: NUTMEG Jan 11 06:42:24 myhostname kernel: [ 1061.032920] [drm] Connector 2: Jan 11 06:42:24 myhostname kernel: [ 1061.032922] [drm] HDMI-A-1 Jan 11 06:42:24 myhostname kernel: [ 1061.032923] [drm] HPD3 Jan 11 06:42:24 myhostname kernel: [ 1061.032925] [drm] DDC: 0x6550 0x6550 0x6554 0x6554 0x6558 0x6558 0x655c 0x655c Jan 11 06:42:24 myhostname kernel: [ 1061.032926] [drm] Encoders: Jan 11 06:42:24 myhostname kernel: [ 1061.032928] [drm] DFP1: INTERNAL_UNIPHY Jan 11 06:42:25 myhostname kernel: [ 1061.082355] [drm] Internal thermal controller without fan control Jan 11 06:42:25 myhostname kernel: [ 1061.082493] [drm] radeon: power management initialized Jan 11 06:42:26 myhostname kernel: [ 1062.360915] [drm] fb mappable at 0xD1488000 Jan 11 06:42:26 myhostname kernel: [ 1062.360922] [drm] vram apper at 0xD0000000 Jan 11 06:42:26 myhostname kernel: [ 1062.360926] [drm] size 8294400 Jan 11 06:42:26 myhostname kernel: [ 1062.360928] [drm] fb depth is 24 Jan 11 06:42:26 myhostname kernel: [ 1062.360931] [drm] pitch is 7680 Jan 11 06:42:26 myhostname kernel: [ 1062.361231] fbcon: radeondrmfb (fb0) is primary device Jan 11 06:42:28 myhostname kernel: [ 1064.675993] Console: switching to colour frame buffer device 240x67 Jan 11 06:42:28 myhostname kernel: [ 1064.681973] radeon 0000:00:01.0: fb0: radeondrmfb frame buffer device Jan 11 06:42:28 myhostname kernel: [ 1064.681976] radeon 0000:00:01.0: registered panic notifier Jan 11 06:42:28 myhostname kernel: [ 1064.682222] [drm] Initialized radeon 2.34.0 20080528 for 0000:00:01.0 on minor 0 The screen turns off shortly (backlight too) and then only the backlight comes back up. As requested by Alex [2] I am going to attach the two files. [1] http://lists.freedesktop.org/archives/dri-devel/2014-January/051737.html [2] http://lists.freedesktop.org/archives/dri-devel/2014-January/051791.html -- You are receiving this mail because: You are the assignee for the bug. [View Less]

1 119

[RFC 7/8] drm: Add support for pps and compression mode command packet
by vikas.korjani＠intel.com 12 Aug '15

12 Aug '15

From: vkorjani <vikas.korjani(a)intel.com> After enabling DSC we need to send compression mode command packet and pps data packet, for which 2 new data types are added 07h Compression Mode Data Type Write , short write, 2 parameters 0Ah PPS Long Write (word count determines number of bytes) This patch adds support to send these packets. Cc: David Airlie <airlied(a)linux.ie> Cc: Jean-Christophe Plagniol-Villard <plagnioj(a)jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen(… [View More]a)ti.com> Cc: dri-devel(a)lists.freedesktop.org Cc: linux-kernel(a)vger.kernel.org Cc: linux-fbdev(a)vger.kernel.org Signed-off-by: vkorjani <vikas.korjani(a)intel.com> --- drivers/gpu/drm/drm_mipi_dsi.c | 29 +++++++++++++++++++++++++++++ include/drm/drm_mipi_dsi.h | 4 +++- include/video/mipi_display.h | 3 +++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 2d5ca8ee..cd536d1 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -521,6 +521,35 @@ ssize_t mipi_dsi_dcs_write_buffer(struct mipi_dsi_device *dsi, EXPORT_SYMBOL(mipi_dsi_dcs_write_buffer); /** + * mipi_dsi_dsc_pps_write_buffer() - transmit a DSC command with payload + * @dsi: DSI peripheral device + * @data: buffer containing data to be transmitted + * @len: size of transmission buffer + * + * function will automatically choose the right data type depending on + * the command payload length. + * + * Return: The number of bytes successfully transmitted or a negative error + * code on failure.*/ +ssize_t mipi_dsi_dsc_pps_write_buffer(struct mipi_dsi_device *dsi, + const void *data, size_t len) +{ + struct mipi_dsi_msg msg = { + .channel = dsi->channel, + .tx_buf = data, + .tx_len = len + }; + + if (len == 0) + msg.type = MIPI_DSI_DCS_COMPRESSION_MODE; + else + msg.type = MIPI_DSI_PPS_LONG_WRITE; + + return mipi_dsi_device_transfer(dsi, &msg); +} +EXPORT_SYMBOL(mipi_dsi_dsc_pps_write_buffer); + +/** * mipi_dsi_dcs_write() - send DCS write command * @dsi: DSI peripheral device * @cmd: DCS command diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index f1d8d0d..2aa5120 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -197,7 +197,9 @@ ssize_t mipi_dsi_dcs_write_buffer(struct mipi_dsi_device *dsi, ssize_t mipi_dsi_dcs_write(struct mipi_dsi_device *dsi, u8 cmd, const void *data, size_t len); ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *dsi, u8 cmd, void *data, - size_t len); + size_t len); +ssize_t mipi_dsi_dsc_pps_write_buffer(struct mipi_dsi_device *dsi, + const void *data, size_t len); int mipi_dsi_dcs_nop(struct mipi_dsi_device *dsi); int mipi_dsi_dcs_soft_reset(struct mipi_dsi_device *dsi); int mipi_dsi_dcs_get_power_mode(struct mipi_dsi_device *dsi, u8 *mode); diff --git a/include/video/mipi_display.h b/include/video/mipi_display.h index ddcc8ca..880e6e6 100644 --- a/include/video/mipi_display.h +++ b/include/video/mipi_display.h @@ -38,6 +38,9 @@ enum { MIPI_DSI_DCS_READ = 0x06, + MIPI_DSI_DCS_COMPRESSION_MODE = 0x07, + MIPI_DSI_PPS_LONG_WRITE = 0x0A, + MIPI_DSI_SET_MAXIMUM_RETURN_PACKET_SIZE = 0x37, MIPI_DSI_END_OF_TRANSMISSION = 0x08, -- 1.7.9.5 [View Less]

1 0

[PATCH] drm: Use raw monotonic clock
by Abhilash Jindal 12 Aug '15

12 Aug '15

Wall time obtained from do_gettimeofday is susceptible to sudden jumps due to user setting the time or due to NTP. Raw monotonic time is constantly increasing time and isn't affected by NTP adjustments better suited for comparing two timestamps in short intervals. Signed-off-by: Abhilash Jindal <klock.android(a)gmail.com> --- drivers/gpu/drm/via/via_drv.h | 2 +- drivers/gpu/drm/via/via_irq.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/… [View More]

2 1

[PATCH] drm/vmwgfx: Fix execbuf locking issues
by Thomas Hellstrom 12 Aug '15

12 Aug '15

This addresses two issues that cause problems with viewperf maya-03 in situation with memory pressure. The first issue causes attempts to unreserve buffers if batched reservation fails due to, for example, a signal pending. While previously the ttm_eu api was resistant against this type of error, it is no longer and the lockdep code will complain about attempting to unreserve buffers that are not reserved. The issue is resolved by avoid calling ttm_eu_backoff_reservation in the buffer reserve … [View More]

1 0

Intel-kms in Linux-4.2rc causes regression due to dithering always on.
by Mario Kleiner 12 Aug '15

12 Aug '15

Hi Daniel and all, since Linux 4.2 (tested with rc4), i think this commit d328c9d78d64ca11e744fe227096990430a88477 "drm/i915: Select starting pipe bpp irrespective or the primary plane" causes trouble for me and my users, as tested on Intel HD Ironlake and Ivy Bridge with MiniDP->Singlelink-DVI adapter -> Measurement device. Afaics it causes dithering to always be enabled on a regular 8bpc framebuffer, even when outputting to a 8 bpc DVI-D output, and that dithering causes my … [View More]display measurement equipment and other special display devices used for neuro-science and medical applications to fail. This equipment requires an identity passthrough of 8 bpc framebuffer pixels to the digital outputs, iow. dithering off. Log output on Linux 4.1 (good): Aug 1 06:39:26 twisty kernel: [ 154.175394] [drm:connected_sink_compute_bpp] [CONNECTOR:35:HDMI-A-1] checking for sink bpp constrains Aug 1 06:39:26 twisty kernel: [ 154.175396] [drm:intel_hdmi_compute_config] picking bpc to 8 for HDMI output Aug 1 06:39:26 twisty kernel: [ 154.175397] [drm:intel_hdmi_compute_config] forcing pipe bpc to 24 for HDMI Aug 1 06:39:26 twisty kernel: [ 154.175400] [drm:ironlake_check_fdi_lanes] checking fdi config on pipe A, lanes 1 Aug 1 06:39:26 twisty kernel: [ 154.175402] [drm:intel_modeset_pipe_config] plane bpp: 24, pipe bpp: 24, dithering: 0 Aug 1 06:39:26 twisty kernel: [ 154.175403] [drm:intel_dump_pipe_config] [CRTC:20][modeset] config for pipe A Aug 1 06:39:26 twisty kernel: [ 154.175404] [drm:intel_dump_pipe_config] cpu_transcoder: A Aug 1 06:39:26 twisty kernel: [ 154.175405] [drm:intel_dump_pipe_config] pipe bpp: 24, dithering: 0 Log output on Linux 4.2-rc4 (bad): Aug 1 06:21:31 twisty kernel: [ 200.924831] [drm:connected_sink_compute_bpp] [CONNECTOR:36:HDMI-A-1] checking for sink bpp constrains Aug 1 06:21:31 twisty kernel: [ 200.924832] [drm:connected_sink_compute_bpp] clamping display bpp (was 36) to default limit of 24 Aug 1 06:21:31 twisty kernel: [ 200.924834] [drm:intel_hdmi_compute_config] picking bpc to 8 for HDMI output Aug 1 06:21:31 twisty kernel: [ 200.924835] [drm:intel_hdmi_compute_config] forcing pipe bpc to 24 for HDMI Aug 1 06:21:31 twisty kernel: [ 200.924838] [drm:ironlake_check_fdi_lanes] checking fdi config on pipe A, lanes 1 Aug 1 06:21:31 twisty kernel: [ 200.924840] [drm:intel_modeset_pipe_config] plane bpp: 36, pipe bpp: 24, dithering: 1 Aug 1 06:21:31 twisty kernel: [ 200.924841] [drm:intel_dump_pipe_config] [CRTC:21][modeset] config ffff880131a5c800 for pipe A Aug 1 06:21:31 twisty kernel: [ 200.924842] [drm:intel_dump_pipe_config] cpu_transcoder: A Aug 1 06:21:31 twisty kernel: [ 200.924843] [drm:intel_dump_pipe_config] pipe bpp: 24, dithering: 1 Ideas what to do about this? thanks, -mario [View Less]

3 4

[Bug 91580] mesa (git version) fails to build
by bugzilla-daemon＠freedesktop.org 11 Aug '15

11 Aug '15

https://bugs.freedesktop.org/show_bug.cgi?id=91580 Bug ID: 91580 Summary: mesa (git version) fails to build Product: Mesa Version: git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 Assignee: dri-devel(a)lists.freedesktop.org Reporter: wolput(a)onsneteindhoven.nl QA Contact: dri-devel(… [View More]

1 3

[PATCH v2] drm/atomic: fix null pointer access to mode_fixup callback
by Inki Dae 11 Aug '15

11 Aug '15

This patch fixes null pointer access incurred when encoder driver didn't set its own mode_fixup callback. mode_fixup callback shoudn't be called if the callback of drm_encoder_helper_funcs is NULL. Changelog v2: - change it to else if Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/… [View More]

2 1

[PATCH 1/2] drm: sti: fix sub-components bind
by Benjamin Gaignard 11 Aug '15

11 Aug '15

Fix misunderstanding in how use component framework. drm_platform_init() is now call only when all the sub-components are register themselves instead of the previous broken two stages mechanism. Update bindings documentation. Signed-off-by: Benjamin Gaignard <benjamin.gaignard(a)linaro.org> --- .../devicetree/bindings/gpu/st,stih4xx.txt | 72 +++++++++++----------- drivers/gpu/drm/sti/sti_drm_drv.c | 45 ++------------ drivers/gpu/drm/sti/sti_hdmi.c … [View More] | 25 ++++---- drivers/gpu/drm/sti/sti_tvout.c | 46 ++------------ 4 files changed, 57 insertions(+), 131 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt index 6b1d75f..a36dfce 100644 --- a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt +++ b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt @@ -52,10 +52,9 @@ STMicroelectronics stih4xx platforms See ../reset/reset.txt for details. - reset-names: names of the resets listed in resets property in the same order. - - ranges: to allow probing of subdevices - sti-hdmi: hdmi output block - must be a child of sti-tvout + must be a child of sti-display-subsystem Required properties: - compatible: "st,stih<chip>-hdmi"; - reg: Physical base address of the IP registers and length of memory mapped region. @@ -72,7 +71,7 @@ STMicroelectronics stih4xx platforms sti-hda: Required properties: - must be a child of sti-tvout + must be a child of sti-display-subsystem - compatible: "st,stih<chip>-hda" - reg: Physical base address of the IP registers and length of memory mapped region. - reg-names: names of the mapped memory regions listed in regs property in @@ -85,7 +84,7 @@ sti-hda: sti-dvo: Required properties: - must be a child of sti-tvout + must be a child of sti-display-subsystem - compatible: "st,stih<chip>-dvo" - reg: Physical base address of the IP registers and length of memory mapped region. - reg-names: names of the mapped memory regions listed in regs property in @@ -195,38 +194,37 @@ Example: reg-names = "tvout-reg", "hda-reg", "syscfg"; reset-names = "tvout"; resets = <&softreset STIH416_HDTVOUT_SOFTRESET>; - ranges; - - sti-hdmi@fe85c000 { - compatible = "st,stih416-hdmi"; - reg = <0xfe85c000 0x1000>, <0xfe830000 0x10000>; - reg-names = "hdmi-reg", "syscfg"; - interrupts = <GIC_SPI 173 IRQ_TYPE_NONE>; - interrupt-names = "irq"; - clock-names = "pix", "tmds", "phy", "audio"; - clocks = <&clockgen_c_vcc CLK_S_PIX_HDMI>, <&clockgen_c_vcc CLK_S_TMDS_HDMI>, <&clockgen_c_vcc CLK_S_HDMI_REJECT_PLL>, <&clockgen_b1 CLK_S_PCM_0>; - }; - - sti-hda@fe85a000 { - compatible = "st,stih416-hda"; - reg = <0xfe85a000 0x400>, <0xfe83085c 0x4>; - reg-names = "hda-reg", "video-dacs-ctrl"; - clock-names = "pix", "hddac"; - clocks = <&clockgen_c_vcc CLK_S_PIX_HD>, <&clockgen_c_vcc CLK_S_HDDAC>; - }; - - sti-dvo@8d00400 { - compatible = "st,stih407-dvo"; - reg = <0x8d00400 0x200>; - reg-names = "dvo-reg"; - clock-names = "dvo_pix", "dvo", - "main_parent", "aux_parent"; - clocks = <&clk_s_d2_flexgen CLK_PIX_DVO>, <&clk_s_d2_flexgen CLK_DVO>, - <&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 1>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_dvo>; - sti,panel = <&panel_dvo>; - }; + }; + + sti-hdmi@fe85c000 { + compatible = "st,stih416-hdmi"; + reg = <0xfe85c000 0x1000>, <0xfe830000 0x10000>; + reg-names = "hdmi-reg", "syscfg"; + interrupts = <GIC_SPI 173 IRQ_TYPE_NONE>; + interrupt-names = "irq"; + clock-names = "pix", "tmds", "phy", "audio"; + clocks = <&clockgen_c_vcc CLK_S_PIX_HDMI>, <&clockgen_c_vcc CLK_S_TMDS_HDMI>, <&clockgen_c_vcc CLK_S_HDMI_REJECT_PLL>, <&clockgen_b1 CLK_S_PCM_0>; + }; + + sti-hda@fe85a000 { + compatible = "st,stih416-hda"; + reg = <0xfe85a000 0x400>, <0xfe83085c 0x4>; + reg-names = "hda-reg", "video-dacs-ctrl"; + clock-names = "pix", "hddac"; + clocks = <&clockgen_c_vcc CLK_S_PIX_HD>, <&clockgen_c_vcc CLK_S_HDDAC>; + }; + + sti-dvo@8d00400 { + compatible = "st,stih407-dvo"; + reg = <0x8d00400 0x200>; + reg-names = "dvo-reg"; + clock-names = "dvo_pix", "dvo", + "main_parent", "aux_parent"; + clocks = <&clk_s_d2_flexgen CLK_PIX_DVO>, <&clk_s_d2_flexgen CLK_DVO>, + <&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_dvo>; + sti,panel = <&panel_dvo>; }; sti-hqvdp@9c000000 { @@ -237,7 +235,7 @@ Example: reset-names = "hqvdp"; resets = <&softreset STIH407_HDQVDP_SOFTRESET>; st,vtg = <&vtg_main>; - }; + }; }; ... }; diff --git a/drivers/gpu/drm/sti/sti_drm_drv.c b/drivers/gpu/drm/sti/sti_drm_drv.c index d0fb54a..60be6cd 100644 --- a/drivers/gpu/drm/sti/sti_drm_drv.c +++ b/drivers/gpu/drm/sti/sti_drm_drv.c @@ -245,15 +245,17 @@ static const struct component_master_ops sti_drm_ops = { .unbind = sti_drm_unbind, }; -static int sti_drm_master_probe(struct platform_device *pdev) +static int sti_drm_platform_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *node = dev->parent->of_node; + struct device_node *node = dev->of_node; struct device_node *child_np; struct component_match *match = NULL; dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + of_platform_populate(node, NULL, NULL, dev); + child_np = of_get_next_available_child(node, NULL); while (child_np) { @@ -265,46 +267,11 @@ static int sti_drm_master_probe(struct platform_device *pdev) return component_master_add_with_match(dev, &sti_drm_ops, match); } -static int sti_drm_master_remove(struct platform_device *pdev) -{ - component_master_del(&pdev->dev, &sti_drm_ops); - return 0; -} - -static struct platform_driver sti_drm_master_driver = { - .probe = sti_drm_master_probe, - .remove = sti_drm_master_remove, - .driver = { - .name = DRIVER_NAME "__master", - }, -}; - -static int sti_drm_platform_probe(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct device_node *node = dev->of_node; - struct platform_device *master; - - of_platform_populate(node, NULL, NULL, dev); - - platform_driver_register(&sti_drm_master_driver); - master = platform_device_register_resndata(dev, - DRIVER_NAME "__master", -1, - NULL, 0, NULL, 0); - if (IS_ERR(master)) - return PTR_ERR(master); - - platform_set_drvdata(pdev, master); - return 0; -} - static int sti_drm_platform_remove(struct platform_device *pdev) { - struct platform_device *master = platform_get_drvdata(pdev); - + component_master_del(&pdev->dev, &sti_drm_ops); of_platform_depopulate(&pdev->dev); - platform_device_unregister(master); - platform_driver_unregister(&sti_drm_master_driver); + return 0; } diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index f28a4d5..06595e9 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c @@ -693,21 +693,8 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data) struct sti_hdmi_connector *connector; struct drm_connector *drm_connector; struct drm_bridge *bridge; - struct device_node *ddc; int err; - ddc = of_parse_phandle(dev->of_node, "ddc", 0); - if (ddc) { - hdmi->ddc_adapt = of_find_i2c_adapter_by_node(ddc); - if (!hdmi->ddc_adapt) { - err = -EPROBE_DEFER; - of_node_put(ddc); - return err; - } - - of_node_put(ddc); - } - /* Set the drm device handle */ hdmi->drm_dev = drm_dev; @@ -796,6 +783,7 @@ static int sti_hdmi_probe(struct platform_device *pdev) struct sti_hdmi *hdmi; struct device_node *np = dev->of_node; struct resource *res; + struct device_node *ddc; int ret; DRM_INFO("%s\n", __func__); @@ -804,6 +792,17 @@ static int sti_hdmi_probe(struct platform_device *pdev) if (!hdmi) return -ENOMEM; + ddc = of_parse_phandle(pdev->dev.of_node, "ddc", 0); + if (ddc) { + hdmi->ddc_adapt = of_find_i2c_adapter_by_node(ddc); + if (!hdmi->ddc_adapt) { + of_node_put(ddc); + return -EPROBE_DEFER; + } + + of_node_put(ddc); + } + hdmi->dev = pdev->dev; /* Get resources */ diff --git a/drivers/gpu/drm/sti/sti_tvout.c b/drivers/gpu/drm/sti/sti_tvout.c index 5cc5311..576b5be 100644 --- a/drivers/gpu/drm/sti/sti_tvout.c +++ b/drivers/gpu/drm/sti/sti_tvout.c @@ -644,7 +644,6 @@ static int sti_tvout_bind(struct device *dev, struct device *master, void *data) struct sti_tvout *tvout = dev_get_drvdata(dev); struct drm_device *drm_dev = data; unsigned int i; - int ret; tvout->drm_dev = drm_dev; @@ -658,17 +657,15 @@ static int sti_tvout_bind(struct device *dev, struct device *master, void *data) sti_tvout_create_encoders(drm_dev, tvout); - ret = component_bind_all(dev, drm_dev); - if (ret) - sti_tvout_destroy_encoders(tvout); - - return ret; + return 0; } static void sti_tvout_unbind(struct device *dev, struct device *master, void *data) { - /* do nothing */ + struct sti_tvout *tvout = dev_get_drvdata(dev); + + sti_tvout_destroy_encoders(tvout); } static const struct component_ops sti_tvout_ops = { @@ -676,34 +673,12 @@ static const struct component_ops sti_tvout_ops = { .unbind = sti_tvout_unbind, }; -static int compare_of(struct device *dev, void *data) -{ - return dev->of_node == data; -} - -static int sti_tvout_master_bind(struct device *dev) -{ - return 0; -} - -static void sti_tvout_master_unbind(struct device *dev) -{ - /* do nothing */ -} - -static const struct component_master_ops sti_tvout_master_ops = { - .bind = sti_tvout_master_bind, - .unbind = sti_tvout_master_unbind, -}; - static int sti_tvout_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct device_node *node = dev->of_node; struct sti_tvout *tvout; struct resource *res; - struct device_node *child_np; - struct component_match *match = NULL; DRM_INFO("%s\n", __func__); @@ -734,24 +709,11 @@ static int sti_tvout_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tvout); - of_platform_populate(node, NULL, NULL, dev); - - child_np = of_get_next_available_child(node, NULL); - - while (child_np) { - component_match_add(dev, &match, compare_of, child_np); - of_node_put(child_np); - child_np = of_get_next_available_child(node, child_np); - } - - component_master_add_with_match(dev, &sti_tvout_master_ops, match); - return component_add(dev, &sti_tvout_ops); } static int sti_tvout_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &sti_tvout_master_ops); component_del(&pdev->dev, &sti_tvout_ops); return 0; } -- 1.9.1 [View Less]

2 3

[GIT PULL] exynos-drm-fixes
by Inki Dae 11 Aug '15

11 Aug '15

Hi Dave, This pull request fixes memory leak and some issues related to mixer and gscaler driver issues. Please kindly let me know if there is any problem. Thanks, Inki Dae The following changes since commit bdce3e7c729907e303396690b2b23b972c6717be: Merge branch 'msm-fixes-4.2' of git://people.freedesktop.org/~robclark/linux into drm-fixes (2015-07-30 12:41:44 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos … [View More]

1 0

[PATCH 00/25] drm: fb emulation: Step 1: Create new drm_fb_helper wrapper funcs
by Archit Taneja 11 Aug '15

11 Aug '15

DRM drivers using drm_fb_helpers still call some fbdev core functions. This makes the driver depend on CONFIG_FB, resulting in complicated Kconfig options, and preventing us from creating a top level drm config option to enable/disable FBDEV emulation. Create new drm_fb_helper functions that replace these fbdev functions. In most cases, the new helper funcs simply wrap around the original fbdev functions. For a few (like framebufer_alloc), we actually do some work that is currently redundant … [View More]across multiple drivers. With these patches, the drivers don't call any fbdev functions directly. They are now called through functions in drm_fb_helper.c. We will later create a fbdev emulation config option to stub out the fb helpers. The only exception is vmwgfx driver. This doesn't use drm_fb_helper. It creates a fb device how a driver in drivers/video/fbdev would. Maybe this needs to be converted to use drm_fb_helpers. For more info, have a look at the threads: http://lists.freedesktop.org/archives/dri-devel/2015-March/078729.html http://lists.freedesktop.org/archives/dri-devel/2015-March/078975.html Archit Taneja (25): drm/fb_helper: Add drm_fb_helper functions to manage fb_info creation drm/fb_helper: Create a wrapper for unlink_framebuffer drm/fb_helper: Create wrappers for fb_sys_read/write funcs drm/fb_helper: Create wrappers for blit, copyarea and fillrect funcs drm/fb_helper: Create a wrapper for fb_set_suspend drm/fb_helper: Create a wrapper for remove_conflicting_framebuffers drm/cirrus: Use new drm_fb_helper functions drm/rockchip: Use new drm_fb_helper functions drm/armada: Use new drm_fb_helper functions drm/ast: Use new drm_fb_helper functions drm/omap: Use new drm_fb_helper functions drm/tegra: Use new drm_fb_helper functions drm/msm: Use new drm_fb_helper functions drm/exynos: Use new drm_fb_helper functions drm/gma500: Use new drm_fb_helper functions drm/mgag200: Use new drm_fb_helper functions drm/radeon: Use new drm_fb_helper functions drm/qxl: Use new drm_fb_helper functions drm/i915: Use new drm_fb_helper functions drm/nouveau: Use new drm_fb_helper functions drm/udl: Use new drm_fb_helper functions drm/boschs: Use new drm_fb_helper functions drm/amdgpu: Use new drm_fb_helper functions drm/virtio: Use new drm_fb_helper functions drm/fb_cma_helper: Use new drm_fb_helper functions drivers/gpu/drm/Kconfig | 7 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 43 +++----- drivers/gpu/drm/armada/armada_fbdev.c | 33 ++---- drivers/gpu/drm/ast/ast_fb.c | 47 +++------ drivers/gpu/drm/bochs/bochs_drv.c | 6 +- drivers/gpu/drm/bochs/bochs_fbdev.c | 34 ++---- drivers/gpu/drm/cirrus/cirrus_drv.c | 7 +- drivers/gpu/drm/cirrus/cirrus_fbdev.c | 39 ++----- drivers/gpu/drm/drm_fb_cma_helper.c | 45 ++------ drivers/gpu/drm/drm_fb_helper.c | 142 ++++++++++++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 45 +++----- drivers/gpu/drm/gma500/accel_2d.c | 6 +- drivers/gpu/drm/gma500/framebuffer.c | 47 +++------ drivers/gpu/drm/i915/i915_dma.c | 3 +- drivers/gpu/drm/i915/intel_fbdev.c | 40 +++----- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 36 ++----- drivers/gpu/drm/mgag200/mgag200_main.c | 2 +- drivers/gpu/drm/msm/msm_fbdev.c | 34 ++---- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 38 +++---- drivers/gpu/drm/omapdrm/omap_fbdev.c | 34 ++---- drivers/gpu/drm/qxl/qxl_fb.c | 40 +++----- drivers/gpu/drm/radeon/radeon_drv.c | 4 +- drivers/gpu/drm/radeon/radeon_fb.c | 41 +++----- drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 47 +++------ drivers/gpu/drm/tegra/fb.c | 40 +++----- drivers/gpu/drm/udl/udl_fb.c | 40 +++----- drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 3 +- drivers/gpu/drm/virtio/virtgpu_fb.c | 30 ++---- include/drm/drm_fb_helper.h | 30 ++++++ 32 files changed, 426 insertions(+), 547 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation [View Less]

5 67

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2015