dri-devel August 2013

dri-devel@lists.freedesktop.org

154 participants
881 discussions

[git pull] drm build fix
by Dave Airlie 04 Aug '13

04 Aug '13

Hi Linus, just a quick fix that a few people have reported, be nice to have in asap. Dave. The following changes since commit 72a67a94bcba71a5fddd6b3596a20604d2b5dcd6: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2013-08-03 15:00:23 -0700) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to adfb8e51332153016857194b85309150ac560286: drm/radeon: fix 64 bit divide in SI spm code (2013-08-04 11:… [View More]

2 1

[Bug 67690] New: Segfault when starting Xorg with radeonsi
by bugzilla-daemon＠freedesktop.org 03 Aug '13

03 Aug '13

https://bugs.freedesktop.org/show_bug.cgi?id=67690 Priority: medium Bug ID: 67690 Assignee: dri-devel(a)lists.freedesktop.org Summary: Segfault when starting Xorg with radeonsi Severity: major Classification: Unclassified OS: Linux (All) Reporter: mthowe(a)gmail.com Hardware: x86-64 (AMD64) Status: NEW Version: git Component: Drivers/Gallium/radeonsi Product: … [View More]Mesa Created attachment 83559 --> https://bugs.freedesktop.org/attachment.cgi?id=83559&action=edit Xorg log Hit this problem with the latest version of radeonsi in Mesa with Fedora 19. Pulled the latest from git and built myself, and still hit the same issue. Removing radeonsi_dri.so and using radeon_dri.so allows me to work around the problem. Relevant lspci: 00:01.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Device 9900 (prog-if 00 [VGA controller]) Subsystem: ASUSTeK Computer Inc. Device 1527 Flags: bus master, fast devsel, latency 0, IRQ 52 Memory at b0000000 (32-bit, prefetchable) [size=256M] I/O ports at f000 [size=256] Memory at feb00000 (32-bit, non-prefetchable) [size=256K] Expansion ROM at <unassigned> [disabled] Capabilities: [50] Power Management version 3 Capabilities: [58] Express Root Complex Integrated Endpoint, MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ Capabilities: [100] Vendor Specific Information: ID=0001 Rev=1 Len=010 <?> 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Chelsea LP [Radeon HD 7730M] (prog-if 00 [VGA controller]) Subsystem: ASUSTeK Computer Inc. Device 1527 Physical Slot: 0 Flags: bus master, fast devsel, latency 0, IRQ 53 Memory at c0000000 (64-bit, prefetchable) [size=256M] Memory at fea00000 (64-bit, non-prefetchable) [size=256K] I/O ports at e000 [size=256] Expansion ROM at fea40000 [disabled] [size=128K] Capabilities: [50] Power Management version 3 Capabilities: [58] Express Legacy Endpoint, MSI 00 Capabilities: [a0] MSI: Enable+ Count=1/1 Maskable- 64bit+ The stack trace: [ 72427.843] (EE) Backtrace: [ 72427.843] (EE) 0: /usr/bin/Xorg (OsLookupColor+0x129) [0x46edb9] [ 72427.844] (EE) 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x34e180ef9f] [ 72427.844] (EE) 2: /usr/lib64/dri/radeonsi_dri.so (radeon_drm_winsys_create+0xb9) [0x7fbab6804019] [ 72427.845] (EE) 3: /usr/lib64/dri/radeonsi_dri.so (create_screen+0x9) [0x7fbab652b3d9] [ 72427.846] (EE) 4: /usr/lib64/dri/radeonsi_dri.so (dri2_init_screen+0x45) [0x7fbab67fff75] [ 72427.846] (EE) 5: /usr/lib64/dri/swrast_dri.so (driIndexConfigAttrib+0x57d) [0x7fbab3f9a7cd] [ 72427.847] (EE) 6: /usr/lib64/xorg/modules/extensions/libglx.so (_glthread_GetID+0x71d1) [0x7fbab8162cb1] [ 72427.848] (EE) 7: /usr/lib64/xorg/modules/extensions/libglx.so (_glthread_GetID+0x679a) [0x7fbab816180a] [ 72427.848] (EE) 8: /usr/bin/Xorg (InitExtensions+0x41) [0x4ba101] [ 72427.848] (EE) 9: /usr/bin/Xorg (_init+0x38e0) [0x429980] [ 72427.848] (EE) 10: /lib64/libc.so.6 (__libc_start_main+0xf5) [0x34e1021b75] [ 72427.849] (EE) 11: /usr/bin/Xorg (_start+0x29) [0x4267b1] [ 72427.849] (EE) 12: ? (?+0x29) [0x29] [ 72427.849] (EE) [ 72427.849] (EE) Segmentation fault at address 0x0 Full Xorg log including the stack trace attached. -- You are receiving this mail because: You are the assignee for the bug. [View Less]

1 1

[Bug 67043] New: Atombios stuck in a look during resume
by bugzilla-daemon＠freedesktop.org 03 Aug '13

03 Aug '13

https://bugs.freedesktop.org/show_bug.cgi?id=67043 Priority: medium Bug ID: 67043 Assignee: dri-devel(a)lists.freedesktop.org Summary: Atombios stuck in a look during resume Severity: normal Classification: Unclassified OS: Linux (All) Reporter: parag.warudkar(a)gmail.com Hardware: x86-64 (AMD64) Status: NEW Version: unspecified Component: DRM/Radeon Product: … [View More]

1 17

[Bug 64503] New: audio glitches when running at 24hz/24p
by bugzilla-daemon＠freedesktop.org 03 Aug '13

03 Aug '13

https://bugs.freedesktop.org/show_bug.cgi?id=64503 Priority: medium Bug ID: 64503 Assignee: dri-devel(a)lists.freedesktop.org Summary: audio glitches when running at 24hz/24p Severity: normal Classification: Unclassified OS: All Reporter: pierre-bugzilla(a)ossman.eu Hardware: Other Status: NEW Version: unspecified Component: DRM/Radeon Product: DRI (… [View More]

1 23

[Bug 59761] New: Kernel fails to reset AMD HD5770 GPU properly and encounters OOPS. GPU reset fails - system remains in unusable state.
by bugzilla-daemon＠bugzilla.kernel.org 02 Aug '13

02 Aug '13

https://bugzilla.kernel.org/show_bug.cgi?id=59761 Summary: Kernel fails to reset AMD HD5770 GPU properly and encounters OOPS. GPU reset fails - system remains in unusable state. Product: Drivers Version: 2.5 Kernel Version: 3.10 RC5 Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: blocking Priority: P1 Component: Video(DRI - … [View More]non Intel) AssignedTo: drivers_video-dri(a)kernel-bugs.osdl.org ReportedBy: t3st3r(a)mail.ru Regression: No Intro: This is really tricky bug. Probably GPU lockup itself is provoked by MESA and is out of scope. However, GPU lockup recovery is kernel work and that's where kernel fails in this case. Configuration: Xubuntu 13.04 64 bit running 3.10 RC5 Linux kernel. Though similar problems occurs with some older kernels as well (recent GPU reset handling rework not seems to help much). MESA should be recent 9.1 or 9.2 git to provoke GPU lockup condition. GPU is AMD HD5770, 512Mb GDDR5. libtxc-dxtn-s2tc is installed to handle To reproduce: It's enough to run Ryzom RPG (www.ryzom.com) with 128Mb textures setting. I'm using 64-bit version from launchpad PPA (https://launchpad.net/~kervala/+archive/ppa) Basically it's looks like following: 1) Launch game and let it run for some time using best (128Mb) textures on GPU like my one. 2) You can notice that on some objects textures are grabled/broken and don't display properly. Maybe data transfer error or so. Note: MESA before 9.1 lacks this bug and it will not occur. 3) After some run time GPU would encounter lockup (CP stall). Probably MESA does something wrong at code genreation. 4) Then kernel attempts to reset GPU but it never works properly. 5) All graphic output locks up since GPU driver has failed to reset GPU properly This condition is quite fatal: system responds to alt-sysrq stuff but becomes completely unusable due to lack of any graphic output. Expected: GPU is properly reset and system recovers to usable state. No kernel errors should happen during this process. One of logs with crash data follows: Jun 15 04:47:12 compname kernel: [17564.696695] radeon 0000:01:00.0: GPU lockup CP stall for more than 10000msec Jun 15 04:47:12 compname kernel: [17564.696706] radeon 0000:01:00.0: GPU lockup (waiting for 0x00000000004ae9a1 last fence id 0x00000000004ae9a0) Jun 15 04:47:12 compname kernel: [17564.697787] radeon 0000:01:00.0: Saved 119 dwords of commands on ring 0. Jun 15 04:47:12 compname kernel: [17564.697812] BUG: unable to handle kernel paging request at ffffc90012a9c418 Jun 15 04:47:12 compname kernel: [17564.697885] IP: [<ffffffffa03a2ace>] radeon_fence_process+0x8e/0x160 [radeon] Jun 15 04:47:12 compname kernel: [17564.697985] PGD 41f00f067 PUD 41f020067 PMD 417586067 PTE 0 Jun 15 04:47:12 compname kernel: [17564.698045] Oops: 0000 [#1] SMP Jun 15 04:47:12 compname kernel: [17564.698080] Modules linked in: parport_pc ppdev bnep rfcomm bluetooth snd_hda_codec_hdmi kvm_amd kvm crc32_pclmul ghash_clmulni_intel mxm_wmi aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd snd_hda_codec_realtek microcode fam15h_power snd_hda_intel serio_raw snd_ca0106 amd64_edac_mod edac_core snd_ac97_codec edac_mce_amd snd_hda_codec k10temp ac97_bus snd_hwdep snd_pcm snd_seq_midi radeon snd_page_alloc joydev sp5100_tco snd_seq_midi_event i2c_piix4 snd_rawmidi snd_seq snd_seq_device snd_timer ttm drm_kms_helper drm snd i2c_algo_bit soundcore mac_hid wmi xfs it87 hwmon_vid lp parport btrfs xor zlib_deflate hid_generic usbhid hid raid6_pq libcrc32c usb_storage firewire_ohci firewire_core pata_acpi crc_itu_t r8169 ahci pata_atiixp libahci Jun 15 04:47:12 compname kernel: [17564.698840] CPU: 6 PID: 2925 Comm: ryzom_client Not tainted 3.10.0-031000rc5-generic #201306082135 Jun 15 04:47:12 compname kernel: [17564.698914] Hardware name: Gigabyte Technology Co., Ltd. Jun 15 04:47:12 compname kernel: [17564.698991] task: ffff880414908000 ti: ffff880403afc000 task.ti: ffff880403afc000 Jun 15 04:47:12 compname kernel: [17564.699053] RIP: 0010:[<ffffffffa03a2ace>] [<ffffffffa03a2ace>] radeon_fence_process+0x8e/0x160 [radeon] Jun 15 04:47:12 compname kernel: [17564.699160] RSP: 0018:ffff880403afdc18 EFLAGS: 00010246 Jun 15 04:47:12 compname kernel: [17564.699205] RAX: ffffc90012a9c418 RBX: 0000000000000002 RCX: ffff880415134dc0 Jun 15 04:47:12 compname kernel: [17564.699264] RDX: 0000000000000041 RSI: 0000000000000000 RDI: ffff880415134000 Jun 15 04:47:12 compname kernel: [17564.699323] RBP: ffff880403afdc78 R08: ffffffff00000000 R09: ffff880415134208 Jun 15 04:47:12 compname kernel: [17564.699382] R10: 0000000000000000 R11: 0000000000000005 R12: 000000000000000c Jun 15 04:47:12 compname kernel: [17564.699441] R13: ffff880415134e08 R14: 0000000000000002 R15: ffff880415134000 Jun 15 04:47:12 compname kernel: [17564.699501] FS: 00007f6231639780(0000) GS:ffff88042fd80000(0000) knlGS:0000000000000000 Jun 15 04:47:12 compname kernel: [17564.699567] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b Jun 15 04:47:12 compname kernel: [17564.699615] CR2: ffffc90012a9c418 CR3: 00000003d049d000 CR4: 00000000000407e0 Jun 15 04:47:12 compname kernel: [17564.699674] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 Jun 15 04:47:12 compname kernel: [17564.699734] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Jun 15 04:47:12 compname kernel: [17564.699792] Stack: Jun 15 04:47:12 compname kernel: [17564.699811] ffff880417a9c848 ffffffffa042b3d0 ffff88041918b8a0 ffff880403afdc98 Jun 15 04:47:12 compname kernel: [17564.699886] ffff880403afdc68 ffffffff8143357f 0000000000000001 ffff880415134000 Jun 15 04:47:12 compname kernel: [17564.699960] 0000000000000005 ffff880415134000 ffff880415134e38 ffff8804151345f8 Jun 15 04:47:12 compname kernel: [17564.700034] Call Trace: Jun 15 04:47:12 compname kernel: [17564.700067] [<ffffffff8143357f>] ? __dev_printk+0x5f/0xa0 Jun 15 04:47:12 compname kernel: [17564.700141] [<ffffffffa03a38c3>] radeon_fence_count_emitted+0x23/0x70 [radeon] Jun 15 04:47:12 compname kernel: [17564.700234] [<ffffffffa03b9fcb>] radeon_ring_backup+0x4b/0x130 [radeon] Jun 15 04:47:12 compname kernel: [17564.700314] [<ffffffffa038e560>] radeon_gpu_reset+0x90/0x220 [radeon] Jun 15 04:47:12 compname kernel: [17564.700402] [<ffffffffa03b8d36>] radeon_gem_wait_idle_ioctl+0xd6/0x100 [radeon] Jun 15 04:47:12 compname kernel: [17564.700486] [<ffffffffa02c658a>] drm_ioctl+0x50a/0x650 [drm] Jun 15 04:47:12 compname kernel: [17564.700568] [<ffffffffa03b8c60>] ? radeon_gem_busy_ioctl+0x120/0x120 [radeon] Jun 15 04:47:12 compname kernel: [17564.700632] [<ffffffff81082401>] ? update_curr+0x141/0x1f0 Jun 15 04:47:12 compname kernel: [17564.700684] [<ffffffff810810dd>] ? set_next_entity+0xad/0xd0 Jun 15 04:47:12 compname kernel: [17564.700738] [<ffffffff811987c7>] do_vfs_ioctl+0x87/0x330 Jun 15 04:47:12 compname kernel: [17564.700787] [<ffffffff816cab14>] ? __schedule+0x3d4/0x6b0 Jun 15 04:47:12 compname kernel: [17564.700837] [<ffffffff81198b01>] SyS_ioctl+0x91/0xb0 Jun 15 04:47:12 compname kernel: [17564.700885] [<ffffffff816d5506>] system_call_fastpath+0x1a/0x1f Jun 15 04:47:12 compname kernel: [17564.700936] Code: 49 87 55 00 48 39 d0 73 50 48 89 c3 41 ba 01 00 00 00 41 80 bf a0 16 00 00 00 4d 8b b1 f8 0b 00 00 0f 84 8a 00 00 00 48 8b 41 10 <8b> 00 48 89 da 89 c0 4c 21 c2 48 09 d0 48 39 c3 76 0c 4c 89 f2 Jun 15 04:47:12 compname kernel: [17564.701288] RIP [<ffffffffa03a2ace>] radeon_fence_process+0x8e/0x160 [radeon] Jun 15 04:47:12 compname kernel: [17564.701375] RSP <ffff880403afdc18> Jun 15 04:47:12 compname kernel: [17564.701406] CR2: ffffc90012a9c418 Jun 15 04:47:12 compname kernel: [17564.735862] ---[ end trace 5017208705d52fa8 ]--- Jun 15 04:47:17 compname kernel: [17570.145204] SysRq : Emergency Sync Jun 15 04:47:17 compname kernel: [17570.153481] Emergency Sync complete -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug. [View Less]

1 3

[PATCH] radeon: si_dpm.c: avoid a signed 64-bit divide
by Kyle McMartin 02 Aug '13

02 Aug '13

Hit a compile failure here referencing divdi3 on i686. Signed-off-by: Kyle McMartin <kyle(a)redhat.com> --- a/drivers/gpu/drm/radeon/si_dpm.c +++ b/drivers/gpu/drm/radeon/si_dpm.c @@ -1767,7 +1767,7 @@ static void si_calculate_leakage_for_v_and_t_formula(const struct ni_leakage_coe s64 temperature, t_slope, t_intercept, av, bv, t_ref; s64 tmp; - i_leakage = drm_int2fixp(ileakage) / 100; + i_leakage = div64_s64(drm_int2fixp(ileakage), 100); vddc = div64_s64(drm_int2fixp(v), 1000);… [View More]

2 2

[PATCH] drm: don't push static constants on stack for %*ph
by Andy Shevchenko 02 Aug '13

02 Aug '13

There is no need to pass constants via stack. The width may be explicitly specified in the format. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/gpu/drm/nouveau/core/engine/disp/dport.c | 2 +- drivers/gpu/drm/radeon/atombios_dp.c | 2 +- drivers/gpu/drm/udl/udl_main.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dport.c b/drivers/gpu/drm/nouveau/core/… [View More]

2 1

Regression introduced by 31f731a drm/radeon/dpm: fix calculations in si_calculate_leakage_for_v_and_t_formula
by Konrad Rzeszutek Wilk 02 Aug '13

02 Aug '13

Hey Alex, Your recent patch "31f731a drm/radeon/dpm: fix calculations in si_calculate_leakage_for_v_and_t_formula" causes a build regression: drivers/built-in.o: In function `si_calculate_leakage_for_v_and_t_formula': /home/build/linux-linus/drivers/gpu/drm/radeon/si_dpm.c:1770: undefined reference to `__divdi3' Which I think is due to the misplace parentheses.

2 1

[PATCH] drm/radeon: add very basic support for audio block on DCE6
by Rafał Miłecki 02 Aug '13

02 Aug '13

It doesn't allow playing anything yet, but was the most tricky part to RE (it's indirect access, so couldn't trace it by dumping registers). Now we just need to implement support for HDMI blocks. Signed-off-by: Rafał Miłecki <zajec5(a)gmail.com> --- drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/dce6_afmt.c | 88 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_asic.h | 2 + drivers/gpu/drm/radeon/si.c | 7 +++ drivers/gpu/drm/… [View More]radeon/sid.h | 5 ++ 5 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/radeon/dce6_afmt.c diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index c3df52c..6510fc4 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -79,7 +79,7 @@ radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ si_blit_shaders.o radeon_prime.o radeon_uvd.o cik.o cik_blit_shaders.o \ r600_dpm.o rs780_dpm.o rv6xx_dpm.o rv770_dpm.o rv730_dpm.o rv740_dpm.o \ rv770_smc.o cypress_dpm.o btc_dpm.o sumo_dpm.o sumo_smc.o trinity_dpm.o \ - trinity_smc.o ni_dpm.o si_smc.o si_dpm.o + trinity_smc.o ni_dpm.o si_smc.o si_dpm.o dce6_afmt.o radeon-$(CONFIG_COMPAT) += radeon_ioc32.o radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o diff --git a/drivers/gpu/drm/radeon/dce6_afmt.c b/drivers/gpu/drm/radeon/dce6_afmt.c new file mode 100644 index 0000000..0d98143 --- /dev/null +++ b/drivers/gpu/drm/radeon/dce6_afmt.c @@ -0,0 +1,88 @@ +/* + * Copyright © 2013 Rafał Miłecki <zajec5(a)gmail.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Authors: Rafał Miłecki + */ +#include <drm/drmP.h> +#include <drm/radeon_drm.h> +#include "radeon.h" +#include "radeon_asic.h" +#include "sid.h" + +static u32 dce6_audio_read(struct radeon_device *rdev, u32 reg) +{ + WREG32(SI_AUDIO_ADDR, reg); + return RREG32(SI_AUDIO_DATA); +} + +static void dce6_audio_write(struct radeon_device *rdev, u32 reg, u32 v) +{ + reg |= SI_AUDIO_ADDR_WRITE; + WREG32(SI_AUDIO_ADDR, reg); + WREG32(SI_AUDIO_DATA, v); +} + +static void dce6_audio_maskset(struct radeon_device *rdev, u32 reg, u32 mask, + u32 set) +{ + u32 tmp = dce6_audio_read(rdev, reg); + tmp &= mask; + tmp |= set & ~mask; + dce6_audio_write(rdev, reg, tmp); +} + +static void dce6_audio_enable(struct radeon_device *rdev, bool enable) +{ + DRM_INFO("%s audio support\n", enable ? "Enabling" : "Disabling"); + + if (enable) { + dce6_audio_maskset(rdev, 0x54, ~0x80000000, 0x80000000); + } else { + dce6_audio_maskset(rdev, 0x54, ~0x80000000, 0); + /* TODO: clear some bit(s) in reg 0x36 */ + } + + rdev->audio_enabled = enable; +} + +int dce6_audio_init(struct radeon_device *rdev) +{ + if (!radeon_audio) + return 0; + + dce6_audio_enable(rdev, true); + + rdev->audio_status.channels = -1; + rdev->audio_status.rate = -1; + rdev->audio_status.bits_per_sample = -1; + rdev->audio_status.status_bits = 0; + rdev->audio_status.category_code = 0; + + return 0; +} + +void dce6_audio_fini(struct radeon_device *rdev) +{ + if (!rdev->audio_enabled) + return; + + dce6_audio_enable(rdev, false); +} diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index ca18957..48674ca 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h @@ -698,6 +698,8 @@ void si_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev, struct seq_file *m); int si_dpm_force_performance_level(struct radeon_device *rdev, enum radeon_dpm_forced_level level); +int dce6_audio_init(struct radeon_device *rdev); +void dce6_audio_fini(struct radeon_device *rdev); /* DCE8 - CIK */ void dce8_bandwidth_update(struct radeon_device *rdev); diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index d71037f..e7890bf 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -6590,6 +6590,12 @@ static int si_startup(struct radeon_device *rdev) return r; } + r = dce6_audio_init(rdev); + if (r) { + dev_err(rdev->dev, "Audio init failed (%d).\n", r); + return r; + } + return 0; } @@ -6621,6 +6627,7 @@ int si_resume(struct radeon_device *rdev) int si_suspend(struct radeon_device *rdev) { + dce6_audio_fini(rdev); radeon_vm_manager_fini(rdev); si_cp_enable(rdev, false); cayman_dma_stop(rdev); diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h index 2c8da27..ddf3818 100644 --- a/drivers/gpu/drm/radeon/sid.h +++ b/drivers/gpu/drm/radeon/sid.h @@ -618,6 +618,11 @@ # define MC_WR_CLEAN_CNT(x) ((x) << 20) # define MC_VMID(x) ((x) << 25) +#define SI_AUDIO_ADDR 0x5e00 +# define SI_AUDIO_ADDR_REG_MASK 0xff +# define SI_AUDIO_ADDR_WRITE (1 << 8) +#define SI_AUDIO_DATA 0x5e04 + #define CONFIG_MEMSIZE 0x5428 #define INTERRUPT_CNTL 0x5468 -- 1.7.10.4 [View Less]

2 6

[PATCH] drm: const'ify ioctls table
by Rob Clark 02 Aug '13

02 Aug '13

Because, there is no reason for it not to be const. Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- drivers/gpu/drm/gma500/psb_drv.c | 2 +- drivers/gpu/drm/i810/i810_dma.c | 2 +- drivers/gpu/drm/i810/i810_drv.h | 2 +- drivers/gpu/drm/i915/i915_dma.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/mga/mga_drv.h | 2 +- drivers/gpu/drm/mga/mga_state.c | 2 +- … [View More]drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.h | 2 +- drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +- drivers/gpu/drm/r128/r128_drv.h | 2 +- drivers/gpu/drm/r128/r128_state.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_kms.c | 2 +- drivers/gpu/drm/savage/savage_bci.c | 2 +- drivers/gpu/drm/savage/savage_drv.h | 2 +- drivers/gpu/drm/sis/sis_drv.h | 2 +- drivers/gpu/drm/sis/sis_mm.c | 2 +- drivers/gpu/drm/via/via_dma.c | 2 +- drivers/gpu/drm/via/via_drv.h | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- drivers/gpu/host1x/drm/drm.c | 2 +- drivers/staging/imx-drm/imx-drm-core.c | 2 +- include/drm/drmP.h | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index ca2729a..053cdd0 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -213,7 +213,7 @@ static const struct vm_operations_struct exynos_drm_gem_vm_ops = { .close = drm_gem_vm_close, }; -static struct drm_ioctl_desc exynos_ioctls[] = { +static const struct drm_ioctl_desc exynos_ioctls[] = { DRM_IOCTL_DEF_DRV(EXYNOS_GEM_CREATE, exynos_drm_gem_create_ioctl, DRM_UNLOCKED | DRM_AUTH), DRM_IOCTL_DEF_DRV(EXYNOS_GEM_MAP_OFFSET, diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index bddea58..ffc9e25 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -131,7 +131,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data, static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); -static struct drm_ioctl_desc psb_ioctls[] = { +static const struct drm_ioctl_desc psb_ioctls[] = { DRM_IOCTL_DEF_DRV(GMA_ADB, psb_adb_ioctl, DRM_AUTH), DRM_IOCTL_DEF_DRV(GMA_MODE_OPERATION, psb_mode_operation_ioctl, DRM_AUTH), diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index ada49ed..eac755b 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c @@ -1241,7 +1241,7 @@ int i810_driver_dma_quiescent(struct drm_device *dev) return 0; } -struct drm_ioctl_desc i810_ioctls[] = { +const struct drm_ioctl_desc i810_ioctls[] = { DRM_IOCTL_DEF_DRV(I810_INIT, i810_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY|DRM_UNLOCKED), DRM_IOCTL_DEF_DRV(I810_VERTEX, i810_dma_vertex, DRM_AUTH|DRM_UNLOCKED), DRM_IOCTL_DEF_DRV(I810_CLEAR, i810_clear_bufs, DRM_AUTH|DRM_UNLOCKED), diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h index 6e0acad..d4d16ed 100644 --- a/drivers/gpu/drm/i810/i810_drv.h +++ b/drivers/gpu/drm/i810/i810_drv.h @@ -125,7 +125,7 @@ extern void i810_driver_preclose(struct drm_device *dev, extern int i810_driver_device_is_agp(struct drm_device *dev); extern long i810_ioctl(struct file *file, unsigned int cmd, unsigned long arg); -extern struct drm_ioctl_desc i810_ioctls[]; +extern const struct drm_ioctl_desc i810_ioctls[]; extern int i810_max_ioctl; #define I810_BASE(reg) ((unsigned long) \ diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 6ce9033..78ad4dc 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1834,7 +1834,7 @@ void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) kfree(file_priv); } -struct drm_ioctl_desc i915_ioctls[] = { +const struct drm_ioctl_desc i915_ioctls[] = { DRM_IOCTL_DEF_DRV(I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(I915_FLUSH, i915_flush_ioctl, DRM_AUTH), DRM_IOCTL_DEF_DRV(I915_FLIP, i915_flip_bufs, DRM_AUTH), diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index cef35d3..37d8c92 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1566,7 +1566,7 @@ struct drm_i915_file_private { #define INTEL_RC6p_ENABLE (1<<1) #define INTEL_RC6pp_ENABLE (1<<2) -extern struct drm_ioctl_desc i915_ioctls[]; +extern const struct drm_ioctl_desc i915_ioctls[]; extern int i915_max_ioctl; extern unsigned int i915_fbpercrtc __always_unused; extern int i915_panel_ignore_lid __read_mostly; diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h index 54558a0..ca4bc54 100644 --- a/drivers/gpu/drm/mga/mga_drv.h +++ b/drivers/gpu/drm/mga/mga_drv.h @@ -149,7 +149,7 @@ typedef struct drm_mga_private { unsigned int agp_size; } drm_mga_private_t; -extern struct drm_ioctl_desc mga_ioctls[]; +extern const struct drm_ioctl_desc mga_ioctls[]; extern int mga_max_ioctl; /* mga_dma.c */ diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index 9c14514..37cc2fb 100644 --- a/drivers/gpu/drm/mga/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c @@ -1083,7 +1083,7 @@ file_priv) return 0; } -struct drm_ioctl_desc mga_ioctls[] = { +const struct drm_ioctl_desc mga_ioctls[] = { DRM_IOCTL_DEF_DRV(MGA_INIT, mga_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(MGA_FLUSH, mga_dma_flush, DRM_AUTH), DRM_IOCTL_DEF_DRV(MGA_RESET, mga_dma_reset, DRM_AUTH), diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index e990327..7f2d3ce 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -640,7 +640,7 @@ nouveau_drm_postclose(struct drm_device *dev, struct drm_file *fpriv) nouveau_cli_destroy(cli); } -static struct drm_ioctl_desc +static const struct drm_ioctl_desc nouveau_ioctls[] = { DRM_IOCTL_DEF_DRV(NOUVEAU_GETPARAM, nouveau_abi16_ioctl_getparam, DRM_UNLOCKED|DRM_AUTH), DRM_IOCTL_DEF_DRV(NOUVEAU_SETPARAM, nouveau_abi16_ioctl_setparam, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index a3004f1..22a9a5f 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -419,7 +419,7 @@ static int ioctl_gem_info(struct drm_device *dev, void *data, return ret; } -static struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = { +static const struct drm_ioctl_desc ioctls[DRM_COMMAND_END - DRM_COMMAND_BASE] = { DRM_IOCTL_DEF_DRV(OMAP_GET_PARAM, ioctl_get_param, DRM_UNLOCKED|DRM_AUTH), DRM_IOCTL_DEF_DRV(OMAP_SET_PARAM, ioctl_set_param, DRM_UNLOCKED|DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(OMAP_GEM_NEW, ioctl_gem_new, DRM_UNLOCKED|DRM_AUTH), diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index aacb791..bb489c4 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -319,7 +319,7 @@ struct qxl_device { /* forward declaration for QXL_INFO_IO */ void qxl_io_log(struct qxl_device *qdev, const char *fmt, ...); -extern struct drm_ioctl_desc qxl_ioctls[]; +extern const struct drm_ioctl_desc qxl_ioctls[]; extern int qxl_max_ioctl; int qxl_driver_load(struct drm_device *dev, unsigned long flags); diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index 27f45e4..6cd7273 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c @@ -402,7 +402,7 @@ static int qxl_alloc_surf_ioctl(struct drm_device *dev, void *data, return ret; } -struct drm_ioctl_desc qxl_ioctls[] = { +const struct drm_ioctl_desc qxl_ioctls[] = { DRM_IOCTL_DEF_DRV(QXL_ALLOC, qxl_alloc_ioctl, DRM_AUTH|DRM_UNLOCKED), DRM_IOCTL_DEF_DRV(QXL_MAP, qxl_map_ioctl, DRM_AUTH|DRM_UNLOCKED), diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h index 930c71b..56eb5e3 100644 --- a/drivers/gpu/drm/r128/r128_drv.h +++ b/drivers/gpu/drm/r128/r128_drv.h @@ -131,7 +131,7 @@ typedef struct drm_r128_buf_priv { drm_r128_freelist_t *list_entry; } drm_r128_buf_priv_t; -extern struct drm_ioctl_desc r128_ioctls[]; +extern const struct drm_ioctl_desc r128_ioctls[]; extern int r128_max_ioctl; /* r128_cce.c */ diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c index 19bb7e6..01dd9ae 100644 --- a/drivers/gpu/drm/r128/r128_state.c +++ b/drivers/gpu/drm/r128/r128_state.c @@ -1643,7 +1643,7 @@ void r128_driver_lastclose(struct drm_device *dev) r128_do_cleanup_cce(dev); } -struct drm_ioctl_desc r128_ioctls[] = { +const struct drm_ioctl_desc r128_ioctls[] = { DRM_IOCTL_DEF_DRV(R128_INIT, r128_cce_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(R128_CCE_START, r128_cce_start, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(R128_CCE_STOP, r128_cce_stop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index cb7f1a8..e2df2e9 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -109,7 +109,7 @@ void radeon_gem_object_close(struct drm_gem_object *obj, struct drm_file *file_priv); extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, int *vpos, int *hpos); -extern struct drm_ioctl_desc radeon_ioctls_kms[]; +extern const struct drm_ioctl_desc radeon_ioctls_kms[]; extern int radeon_max_kms_ioctl; int radeon_mmap(struct file *filp, struct vm_area_struct *vma); int radeon_mode_dumb_mmap(struct drm_file *filp, diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 07b0236..866c2b7 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c @@ -722,7 +722,7 @@ KMS_INVALID_IOCTL(radeon_surface_alloc_kms) KMS_INVALID_IOCTL(radeon_surface_free_kms) -struct drm_ioctl_desc radeon_ioctls_kms[] = { +const struct drm_ioctl_desc radeon_ioctls_kms[] = { DRM_IOCTL_DEF_DRV(RADEON_CP_INIT, radeon_cp_init_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(RADEON_CP_START, radeon_cp_start_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(RADEON_CP_STOP, radeon_cp_stop_kms, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index bd6b2cf..b17d071 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c @@ -1072,7 +1072,7 @@ void savage_reclaim_buffers(struct drm_device *dev, struct drm_file *file_priv) drm_idlelock_release(&file_priv->master->lock); } -struct drm_ioctl_desc savage_ioctls[] = { +const struct drm_ioctl_desc savage_ioctls[] = { DRM_IOCTL_DEF_DRV(SAVAGE_BCI_INIT, savage_bci_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY), DRM_IOCTL_DEF_DRV(SAVAGE_BCI_CMDBUF, savage_bci_cmdbuf, DRM_AUTH), DRM_IOCTL_DEF_DRV(SAVAGE_BCI_EVENT_EMIT, savage_bci_event_emit, DRM_AUTH), diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h index c05082a..335f8fc 100644 --- a/drivers/gpu/drm/savage/savage_drv.h +++ b/drivers/gpu/drm/savage/savage_drv.h @@ -104,7 +104,7 @@ enum savage_family { S3_LAST }; -extern struct drm_ioctl_desc savage_ioctls[]; +extern const struct drm_ioctl_desc savage_ioctls[]; extern int savage_max_ioctl; #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h index 13b527b..c31c025 100644 --- a/drivers/gpu/drm/sis/sis_drv.h +++ b/drivers/gpu/drm/sis/sis_drv.h @@ -70,7 +70,7 @@ extern void sis_reclaim_buffers_locked(struct drm_device *dev, struct drm_file *file_priv); extern void sis_lastclose(struct drm_device *dev); -extern struct drm_ioctl_desc sis_ioctls[]; +extern const struct drm_ioctl_desc sis_ioctls[]; extern int sis_max_ioctl; #endif diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index 9a43d98..0f8b7eb 100644 --- a/drivers/gpu/drm/sis/sis_mm.c +++ b/drivers/gpu/drm/sis/sis_mm.c @@ -348,7 +348,7 @@ void sis_reclaim_buffers_locked(struct drm_device *dev, return; } -struct drm_ioctl_desc sis_ioctls[] = { +const struct drm_ioctl_desc sis_ioctls[] = { DRM_IOCTL_DEF_DRV(SIS_FB_ALLOC, sis_fb_alloc, DRM_AUTH), DRM_IOCTL_DEF_DRV(SIS_FB_FREE, sis_drm_free, DRM_AUTH), DRM_IOCTL_DEF_DRV(SIS_AGP_INIT, sis_ioctl_agp_init, DRM_AUTH | DRM_MASTER | DRM_ROOT_ONLY), diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c index 13558f5..652f9b4 100644 --- a/drivers/gpu/drm/via/via_dma.c +++ b/drivers/gpu/drm/via/via_dma.c @@ -720,7 +720,7 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file * return ret; } -struct drm_ioctl_desc via_ioctls[] = { +const struct drm_ioctl_desc via_ioctls[] = { DRM_IOCTL_DEF_DRV(VIA_ALLOCMEM, via_mem_alloc, DRM_AUTH), DRM_IOCTL_DEF_DRV(VIA_FREEMEM, via_mem_free, DRM_AUTH), DRM_IOCTL_DEF_DRV(VIA_AGP_INIT, via_agp_init, DRM_AUTH|DRM_MASTER), diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h index 893a650..a811ef2 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h @@ -114,7 +114,7 @@ enum via_family { #define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg) #define VIA_WRITE8(reg, val) DRM_WRITE8(VIA_BASE, reg, val) -extern struct drm_ioctl_desc via_ioctls[]; +extern const struct drm_ioctl_desc via_ioctls[]; extern int via_max_ioctl; extern int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 78e2164..eaf86e0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -124,7 +124,7 @@ * Ioctl definitions. */ -static struct drm_ioctl_desc vmw_ioctls[] = { +static const struct drm_ioctl_desc vmw_ioctls[] = { VMW_IOCTL_DEF(VMW_GET_PARAM, vmw_getparam_ioctl, DRM_AUTH | DRM_UNLOCKED), VMW_IOCTL_DEF(VMW_ALLOC_DMABUF, vmw_dmabuf_alloc_ioctl, diff --git a/drivers/gpu/host1x/drm/drm.c b/drivers/gpu/host1x/drm/drm.c index e184b00..7a3c9f2 100644 --- a/drivers/gpu/host1x/drm/drm.c +++ b/drivers/gpu/host1x/drm/drm.c @@ -487,7 +487,7 @@ static int tegra_submit(struct drm_device *drm, void *data, } #endif -static struct drm_ioctl_desc tegra_drm_ioctls[] = { +static const struct drm_ioctl_desc tegra_drm_ioctls[] = { #ifdef CONFIG_DRM_TEGRA_STAGING DRM_IOCTL_DEF_DRV(TEGRA_GEM_CREATE, tegra_gem_create, DRM_UNLOCKED | DRM_AUTH), DRM_IOCTL_DEF_DRV(TEGRA_GEM_MMAP, tegra_gem_mmap, DRM_UNLOCKED), diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 9854a1d..9610229 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -783,7 +783,7 @@ int imx_drm_remove_connector(struct imx_drm_connector *imx_drm_connector) } EXPORT_SYMBOL_GPL(imx_drm_remove_connector); -static struct drm_ioctl_desc imx_drm_ioctls[] = { +static const struct drm_ioctl_desc imx_drm_ioctls[] = { /* none so far */ }; diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 4b518e0..1cc765a 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -965,7 +965,7 @@ struct drm_driver { u32 driver_features; int dev_priv_size; - struct drm_ioctl_desc *ioctls; + const struct drm_ioctl_desc *ioctls; int num_ioctls; const struct file_operations *fops; union { -- 1.8.3.1 [View Less]

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2013