diff options
Diffstat (limited to 'drivers')
404 files changed, 1367 insertions, 1047 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 6e210802c37b..e85763de928f 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
@@ -21,18 +21,85 @@ | |||
21 | #include <linux/firmware.h> | 21 | #include <linux/firmware.h> |
22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | #include <linux/file.h> | ||
24 | #include <linux/list.h> | 25 | #include <linux/list.h> |
25 | #include <linux/async.h> | 26 | #include <linux/async.h> |
26 | #include <linux/pm.h> | 27 | #include <linux/pm.h> |
27 | #include <linux/suspend.h> | 28 | #include <linux/suspend.h> |
28 | #include <linux/syscore_ops.h> | 29 | #include <linux/syscore_ops.h> |
29 | 30 | ||
31 | #include <generated/utsrelease.h> | ||
32 | |||
30 | #include "base.h" | 33 | #include "base.h" |
31 | 34 | ||
32 | MODULE_AUTHOR("Manuel Estrada Sainz"); | 35 | MODULE_AUTHOR("Manuel Estrada Sainz"); |
33 | MODULE_DESCRIPTION("Multi purpose firmware loading support"); | 36 | MODULE_DESCRIPTION("Multi purpose firmware loading support"); |
34 | MODULE_LICENSE("GPL"); | 37 | MODULE_LICENSE("GPL"); |
35 | 38 | ||
39 | static const char *fw_path[] = { | ||
40 | "/lib/firmware/updates/" UTS_RELEASE, | ||
41 | "/lib/firmware/updates", | ||
42 | "/lib/firmware/" UTS_RELEASE, | ||
43 | "/lib/firmware" | ||
44 | }; | ||
45 | |||
46 | /* Don't inline this: 'struct kstat' is biggish */ | ||
47 | static noinline long fw_file_size(struct file *file) | ||
48 | { | ||
49 | struct kstat st; | ||
50 | if (vfs_getattr(file->f_path.mnt, file->f_path.dentry, &st)) | ||
51 | return -1; | ||
52 | if (!S_ISREG(st.mode)) | ||
53 | return -1; | ||
54 | if (st.size != (long)st.size) | ||
55 | return -1; | ||
56 | return st.size; | ||
57 | } | ||
58 | |||
59 | static bool fw_read_file_contents(struct file *file, struct firmware *fw) | ||
60 | { | ||
61 | loff_t pos; | ||
62 | long size; | ||
63 | char *buf; | ||
64 | |||
65 | size = fw_file_size(file); | ||
66 | if (size < 0) | ||
67 | return false; | ||
68 | buf = vmalloc(size); | ||
69 | if (!buf) | ||
70 | return false; | ||
71 | pos = 0; | ||
72 | if (vfs_read(file, buf, size, &pos) != size) { | ||
73 | vfree(buf); | ||
74 | return false; | ||
75 | } | ||
76 | fw->data = buf; | ||
77 | fw->size = size; | ||
78 | return true; | ||
79 | } | ||
80 | |||
81 | static bool fw_get_filesystem_firmware(struct firmware *fw, const char *name) | ||
82 | { | ||
83 | int i; | ||
84 | bool success = false; | ||
85 | char *path = __getname(); | ||
86 | |||
87 | for (i = 0; i < ARRAY_SIZE(fw_path); i++) { | ||
88 | struct file *file; | ||
89 | snprintf(path, PATH_MAX, "%s/%s", fw_path[i], name); | ||
90 | |||
91 | file = filp_open(path, O_RDONLY, 0); | ||
92 | if (IS_ERR(file)) | ||
93 | continue; | ||
94 | success = fw_read_file_contents(file, fw); | ||
95 | fput(file); | ||
96 | if (success) | ||
97 | break; | ||
98 | } | ||
99 | __putname(path); | ||
100 | return success; | ||
101 | } | ||
102 | |||
36 | /* Builtin firmware support */ | 103 | /* Builtin firmware support */ |
37 | 104 | ||
38 | #ifdef CONFIG_FW_LOADER | 105 | #ifdef CONFIG_FW_LOADER |
@@ -346,7 +413,11 @@ static ssize_t firmware_loading_show(struct device *dev, | |||
346 | /* firmware holds the ownership of pages */ | 413 | /* firmware holds the ownership of pages */ |
347 | static void firmware_free_data(const struct firmware *fw) | 414 | static void firmware_free_data(const struct firmware *fw) |
348 | { | 415 | { |
349 | WARN_ON(!fw->priv); | 416 | /* Loaded directly? */ |
417 | if (!fw->priv) { | ||
418 | vfree(fw->data); | ||
419 | return; | ||
420 | } | ||
350 | fw_free_buf(fw->priv); | 421 | fw_free_buf(fw->priv); |
351 | } | 422 | } |
352 | 423 | ||
@@ -709,6 +780,11 @@ _request_firmware_prepare(const struct firmware **firmware_p, const char *name, | |||
709 | return NULL; | 780 | return NULL; |
710 | } | 781 | } |
711 | 782 | ||
783 | if (fw_get_filesystem_firmware(firmware, name)) { | ||
784 | dev_dbg(device, "firmware: direct-loading firmware %s\n", name); | ||
785 | return NULL; | ||
786 | } | ||
787 | |||
712 | ret = fw_lookup_and_allocate_buf(name, &fw_cache, &buf); | 788 | ret = fw_lookup_and_allocate_buf(name, &fw_cache, &buf); |
713 | if (!ret) | 789 | if (!ret) |
714 | fw_priv = fw_create_instance(firmware, name, device, | 790 | fw_priv = fw_create_instance(firmware, name, device, |
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index 7a05fd24d68b..3873d535b28d 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/mod_devicetable.h> | 32 | #include <linux/mod_devicetable.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
35 | #include <linux/random.h> | ||
35 | #include <linux/rwsem.h> | 36 | #include <linux/rwsem.h> |
36 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
37 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
@@ -1066,6 +1067,8 @@ static void fw_device_init(struct work_struct *work) | |||
1066 | device->config_rom_retries = 0; | 1067 | device->config_rom_retries = 0; |
1067 | 1068 | ||
1068 | set_broadcast_channel(device, device->generation); | 1069 | set_broadcast_channel(device, device->generation); |
1070 | |||
1071 | add_device_randomness(&device->config_rom[3], 8); | ||
1069 | } | 1072 | } |
1070 | 1073 | ||
1071 | /* | 1074 | /* |
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index 87d6f2d2f02d..28a94c7ec6e5 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
32 | #include <linux/list.h> | 32 | #include <linux/list.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include <linux/rculist.h> | ||
34 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
35 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
36 | #include <linux/string.h> | 37 | #include <linux/string.h> |
@@ -489,7 +490,7 @@ static struct fw_address_handler *lookup_overlapping_address_handler( | |||
489 | { | 490 | { |
490 | struct fw_address_handler *handler; | 491 | struct fw_address_handler *handler; |
491 | 492 | ||
492 | list_for_each_entry(handler, list, link) { | 493 | list_for_each_entry_rcu(handler, list, link) { |
493 | if (handler->offset < offset + length && | 494 | if (handler->offset < offset + length && |
494 | offset < handler->offset + handler->length) | 495 | offset < handler->offset + handler->length) |
495 | return handler; | 496 | return handler; |
@@ -510,7 +511,7 @@ static struct fw_address_handler *lookup_enclosing_address_handler( | |||
510 | { | 511 | { |
511 | struct fw_address_handler *handler; | 512 | struct fw_address_handler *handler; |
512 | 513 | ||
513 | list_for_each_entry(handler, list, link) { | 514 | list_for_each_entry_rcu(handler, list, link) { |
514 | if (is_enclosing_handler(handler, offset, length)) | 515 | if (is_enclosing_handler(handler, offset, length)) |
515 | return handler; | 516 | return handler; |
516 | } | 517 | } |
@@ -518,7 +519,7 @@ static struct fw_address_handler *lookup_enclosing_address_handler( | |||
518 | return NULL; | 519 | return NULL; |
519 | } | 520 | } |
520 | 521 | ||
521 | static DEFINE_SPINLOCK(address_handler_lock); | 522 | static DEFINE_SPINLOCK(address_handler_list_lock); |
522 | static LIST_HEAD(address_handler_list); | 523 | static LIST_HEAD(address_handler_list); |
523 | 524 | ||
524 | const struct fw_address_region fw_high_memory_region = | 525 | const struct fw_address_region fw_high_memory_region = |
@@ -555,6 +556,7 @@ static bool is_in_fcp_region(u64 offset, size_t length) | |||
555 | * the specified callback is invoked. The parameters passed to the callback | 556 | * the specified callback is invoked. The parameters passed to the callback |
556 | * give the details of the particular request. | 557 | * give the details of the particular request. |
557 | * | 558 | * |
559 | * To be called in process context. | ||
558 | * Return value: 0 on success, non-zero otherwise. | 560 | * Return value: 0 on success, non-zero otherwise. |
559 | * | 561 | * |
560 | * The start offset of the handler's address region is determined by | 562 | * The start offset of the handler's address region is determined by |
@@ -575,7 +577,7 @@ int fw_core_add_address_handler(struct fw_address_handler *handler, | |||
575 | handler->length == 0) | 577 | handler->length == 0) |
576 | return -EINVAL; | 578 | return -EINVAL; |
577 | 579 | ||
578 | spin_lock_bh(&address_handler_lock); | 580 | spin_lock(&address_handler_list_lock); |
579 | 581 | ||
580 | handler->offset = region->start; | 582 | handler->offset = region->start; |
581 | while (handler->offset + handler->length <= region->end) { | 583 | while (handler->offset + handler->length <= region->end) { |
@@ -588,13 +590,13 @@ int fw_core_add_address_handler(struct fw_address_handler *handler, | |||
588 | if (other != NULL) { | 590 | if (other != NULL) { |
589 | handler->offset += other->length; | 591 | handler->offset += other->length; |
590 | } else { | 592 | } else { |
591 | list_add_tail(&handler->link, &address_handler_list); | 593 | list_add_tail_rcu(&handler->link, &address_handler_list); |
592 | ret = 0; | 594 | ret = 0; |
593 | break; | 595 | break; |
594 | } | 596 | } |
595 | } | 597 | } |
596 | 598 | ||
597 | spin_unlock_bh(&address_handler_lock); | 599 | spin_unlock(&address_handler_list_lock); |
598 | 600 | ||
599 | return ret; | 601 | return ret; |
600 | } | 602 | } |
@@ -603,14 +605,17 @@ EXPORT_SYMBOL(fw_core_add_address_handler); | |||
603 | /** | 605 | /** |
604 | * fw_core_remove_address_handler() - unregister an address handler | 606 | * fw_core_remove_address_handler() - unregister an address handler |
605 | * | 607 | * |
608 | * To be called in process context. | ||
609 | * | ||
606 | * When fw_core_remove_address_handler() returns, @handler->callback() is | 610 | * When fw_core_remove_address_handler() returns, @handler->callback() is |
607 | * guaranteed to not run on any CPU anymore. | 611 | * guaranteed to not run on any CPU anymore. |
608 | */ | 612 | */ |
609 | void fw_core_remove_address_handler(struct fw_address_handler *handler) | 613 | void fw_core_remove_address_handler(struct fw_address_handler *handler) |
610 | { | 614 | { |
611 | spin_lock_bh(&address_handler_lock); | 615 | spin_lock(&address_handler_list_lock); |
612 | list_del(&handler->link); | 616 | list_del_rcu(&handler->link); |
613 | spin_unlock_bh(&address_handler_lock); | 617 | spin_unlock(&address_handler_list_lock); |
618 | synchronize_rcu(); | ||
614 | } | 619 | } |
615 | EXPORT_SYMBOL(fw_core_remove_address_handler); | 620 | EXPORT_SYMBOL(fw_core_remove_address_handler); |
616 | 621 | ||
@@ -844,7 +849,7 @@ static void handle_exclusive_region_request(struct fw_card *card, | |||
844 | if (tcode == TCODE_LOCK_REQUEST) | 849 | if (tcode == TCODE_LOCK_REQUEST) |
845 | tcode = 0x10 + HEADER_GET_EXTENDED_TCODE(p->header[3]); | 850 | tcode = 0x10 + HEADER_GET_EXTENDED_TCODE(p->header[3]); |
846 | 851 | ||
847 | spin_lock_bh(&address_handler_lock); | 852 | rcu_read_lock(); |
848 | handler = lookup_enclosing_address_handler(&address_handler_list, | 853 | handler = lookup_enclosing_address_handler(&address_handler_list, |
849 | offset, request->length); | 854 | offset, request->length); |
850 | if (handler) | 855 | if (handler) |
@@ -853,7 +858,7 @@ static void handle_exclusive_region_request(struct fw_card *card, | |||
853 | p->generation, offset, | 858 | p->generation, offset, |
854 | request->data, request->length, | 859 | request->data, request->length, |
855 | handler->callback_data); | 860 | handler->callback_data); |
856 | spin_unlock_bh(&address_handler_lock); | 861 | rcu_read_unlock(); |
857 | 862 | ||
858 | if (!handler) | 863 | if (!handler) |
859 | fw_send_response(card, request, RCODE_ADDRESS_ERROR); | 864 | fw_send_response(card, request, RCODE_ADDRESS_ERROR); |
@@ -886,8 +891,8 @@ static void handle_fcp_region_request(struct fw_card *card, | |||
886 | return; | 891 | return; |
887 | } | 892 | } |
888 | 893 | ||
889 | spin_lock_bh(&address_handler_lock); | 894 | rcu_read_lock(); |
890 | list_for_each_entry(handler, &address_handler_list, link) { | 895 | list_for_each_entry_rcu(handler, &address_handler_list, link) { |
891 | if (is_enclosing_handler(handler, offset, request->length)) | 896 | if (is_enclosing_handler(handler, offset, request->length)) |
892 | handler->address_callback(card, NULL, tcode, | 897 | handler->address_callback(card, NULL, tcode, |
893 | destination, source, | 898 | destination, source, |
@@ -896,7 +901,7 @@ static void handle_fcp_region_request(struct fw_card *card, | |||
896 | request->length, | 901 | request->length, |
897 | handler->callback_data); | 902 | handler->callback_data); |
898 | } | 903 | } |
899 | spin_unlock_bh(&address_handler_lock); | 904 | rcu_read_unlock(); |
900 | 905 | ||
901 | fw_send_response(card, request, RCODE_COMPLETE); | 906 | fw_send_response(card, request, RCODE_COMPLETE); |
902 | } | 907 | } |
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index c788dbdaf3bc..834e71d2324d 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
@@ -1777,11 +1777,35 @@ static int get_self_id_pos(struct fw_ohci *ohci, u32 self_id, | |||
1777 | return i; | 1777 | return i; |
1778 | } | 1778 | } |
1779 | 1779 | ||
1780 | static int initiated_reset(struct fw_ohci *ohci) | ||
1781 | { | ||
1782 | int reg; | ||
1783 | int ret = 0; | ||
1784 | |||
1785 | mutex_lock(&ohci->phy_reg_mutex); | ||
1786 | reg = write_phy_reg(ohci, 7, 0xe0); /* Select page 7 */ | ||
1787 | if (reg >= 0) { | ||
1788 | reg = read_phy_reg(ohci, 8); | ||
1789 | reg |= 0x40; | ||
1790 | reg = write_phy_reg(ohci, 8, reg); /* set PMODE bit */ | ||
1791 | if (reg >= 0) { | ||
1792 | reg = read_phy_reg(ohci, 12); /* read register 12 */ | ||
1793 | if (reg >= 0) { | ||
1794 | if ((reg & 0x08) == 0x08) { | ||
1795 | /* bit 3 indicates "initiated reset" */ | ||
1796 | ret = 0x2; | ||
1797 | } | ||
1798 | } | ||
1799 | } | ||
1800 | } | ||
1801 | mutex_unlock(&ohci->phy_reg_mutex); | ||
1802 | return ret; | ||
1803 | } | ||
1804 | |||
1780 | /* | 1805 | /* |
1781 | * TI TSB82AA2B and TSB12LV26 do not receive the selfID of a locally | 1806 | * TI TSB82AA2B and TSB12LV26 do not receive the selfID of a locally |
1782 | * attached TSB41BA3D phy; see http://www.ti.com/litv/pdf/sllz059. | 1807 | * attached TSB41BA3D phy; see http://www.ti.com/litv/pdf/sllz059. |
1783 | * Construct the selfID from phy register contents. | 1808 | * Construct the selfID from phy register contents. |
1784 | * FIXME: How to determine the selfID.i flag? | ||
1785 | */ | 1809 | */ |
1786 | static int find_and_insert_self_id(struct fw_ohci *ohci, int self_id_count) | 1810 | static int find_and_insert_self_id(struct fw_ohci *ohci, int self_id_count) |
1787 | { | 1811 | { |
@@ -1814,6 +1838,8 @@ static int find_and_insert_self_id(struct fw_ohci *ohci, int self_id_count) | |||
1814 | self_id |= ((status & 0x3) << (6 - (i * 2))); | 1838 | self_id |= ((status & 0x3) << (6 - (i * 2))); |
1815 | } | 1839 | } |
1816 | 1840 | ||
1841 | self_id |= initiated_reset(ohci); | ||
1842 | |||
1817 | pos = get_self_id_pos(ohci, self_id, self_id_count); | 1843 | pos = get_self_id_pos(ohci, self_id, self_id_count); |
1818 | if (pos >= 0) { | 1844 | if (pos >= 0) { |
1819 | memmove(&(ohci->self_id_buffer[pos+1]), | 1845 | memmove(&(ohci->self_id_buffer[pos+1]), |
diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 36164806b9d4..31123b6a0be5 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c | |||
@@ -28,9 +28,8 @@ | |||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | #include <linux/console.h> | 29 | #include <linux/console.h> |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | #include "drm_crtc_helper.h" | ||
34 | 33 | ||
35 | #include "ast_drv.h" | 34 | #include "ast_drv.h" |
36 | 35 | ||
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index d4af9edcbb97..aea439760b60 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h | |||
@@ -28,13 +28,13 @@ | |||
28 | #ifndef __AST_DRV_H__ | 28 | #ifndef __AST_DRV_H__ |
29 | #define __AST_DRV_H__ | 29 | #define __AST_DRV_H__ |
30 | 30 | ||
31 | #include "drm_fb_helper.h" | 31 | #include <drm/drm_fb_helper.h> |
32 | 32 | ||
33 | #include "ttm/ttm_bo_api.h" | 33 | #include <drm/ttm/ttm_bo_api.h> |
34 | #include "ttm/ttm_bo_driver.h" | 34 | #include <drm/ttm/ttm_bo_driver.h> |
35 | #include "ttm/ttm_placement.h" | 35 | #include <drm/ttm/ttm_placement.h> |
36 | #include "ttm/ttm_memory.h" | 36 | #include <drm/ttm/ttm_memory.h> |
37 | #include "ttm/ttm_module.h" | 37 | #include <drm/ttm/ttm_module.h> |
38 | 38 | ||
39 | #include <linux/i2c.h> | 39 | #include <linux/i2c.h> |
40 | #include <linux/i2c-algo-bit.h> | 40 | #include <linux/i2c-algo-bit.h> |
diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c index 2fc8e9e860b1..d9ec77959dff 100644 --- a/drivers/gpu/drm/ast/ast_fb.c +++ b/drivers/gpu/drm/ast/ast_fb.c | |||
@@ -37,10 +37,9 @@ | |||
37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
38 | 38 | ||
39 | 39 | ||
40 | #include "drmP.h" | 40 | #include <drm/drmP.h> |
41 | #include "drm.h" | 41 | #include <drm/drm_crtc.h> |
42 | #include "drm_crtc.h" | 42 | #include <drm/drm_fb_helper.h> |
43 | #include "drm_fb_helper.h" | ||
44 | #include "ast_drv.h" | 43 | #include "ast_drv.h" |
45 | 44 | ||
46 | static void ast_dirty_update(struct ast_fbdev *afbdev, | 45 | static void ast_dirty_update(struct ast_fbdev *afbdev, |
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 95ae55b8214b..f668e6cc0f7a 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c | |||
@@ -25,12 +25,12 @@ | |||
25 | /* | 25 | /* |
26 | * Authors: Dave Airlie <airlied@redhat.com> | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "ast_drv.h" | 29 | #include "ast_drv.h" |
30 | 30 | ||
31 | 31 | ||
32 | #include "drm_fb_helper.h" | 32 | #include <drm/drm_fb_helper.h> |
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/drm_crtc_helper.h> |
34 | 34 | ||
35 | #include "ast_dram_tables.h" | 35 | #include "ast_dram_tables.h" |
36 | 36 | ||
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c index a712cafcfa1d..a6982b86df9b 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c | |||
@@ -28,9 +28,9 @@ | |||
28 | * Authors: Dave Airlie <airlied@redhat.com> | 28 | * Authors: Dave Airlie <airlied@redhat.com> |
29 | */ | 29 | */ |
30 | #include <linux/export.h> | 30 | #include <linux/export.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm_crtc.h" | 32 | #include <drm/drm_crtc.h> |
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/drm_crtc_helper.h> |
34 | #include "ast_drv.h" | 34 | #include "ast_drv.h" |
35 | 35 | ||
36 | #include "ast_tables.h" | 36 | #include "ast_tables.h" |
diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c index 6edbee63b0cb..977cfb35837a 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Authors: Dave Airlie <airlied@redhat.com> | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "ast_drv.h" | 30 | #include "ast_drv.h" |
31 | 31 | ||
32 | #include "ast_dram_tables.h" | 32 | #include "ast_dram_tables.h" |
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c index 6cf2adea66bc..1a026ac2dfb4 100644 --- a/drivers/gpu/drm/ast/ast_ttm.c +++ b/drivers/gpu/drm/ast/ast_ttm.c | |||
@@ -25,7 +25,7 @@ | |||
25 | /* | 25 | /* |
26 | * Authors: Dave Airlie <airlied@redhat.com> | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "ast_drv.h" | 29 | #include "ast_drv.h" |
30 | #include <ttm/ttm_page_alloc.h> | 30 | #include <ttm/ttm_page_alloc.h> |
31 | 31 | ||
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index 9afe495c12c7..c399dea27a3b 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c | |||
@@ -32,7 +32,7 @@ | |||
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include <linux/export.h> | 34 | #include <linux/export.h> |
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | 36 | ||
37 | # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ | 37 | # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ |
38 | 38 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.c b/drivers/gpu/drm/cirrus/cirrus_drv.c index b83a2d7ddd1a..101e423c8991 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.c +++ b/drivers/gpu/drm/cirrus/cirrus_drv.c | |||
@@ -10,8 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm.h" | ||
15 | 14 | ||
16 | #include "cirrus_drv.h" | 15 | #include "cirrus_drv.h" |
17 | 16 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h index 64ea597cb6d3..7f0d71ffba3f 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.h +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h | |||
@@ -15,11 +15,11 @@ | |||
15 | 15 | ||
16 | #include <drm/drm_fb_helper.h> | 16 | #include <drm/drm_fb_helper.h> |
17 | 17 | ||
18 | #include "ttm/ttm_bo_api.h" | 18 | #include <drm/ttm/ttm_bo_api.h> |
19 | #include "ttm/ttm_bo_driver.h" | 19 | #include <drm/ttm/ttm_bo_driver.h> |
20 | #include "ttm/ttm_placement.h" | 20 | #include <drm/ttm/ttm_placement.h> |
21 | #include "ttm/ttm_memory.h" | 21 | #include <drm/ttm/ttm_memory.h> |
22 | #include "ttm/ttm_module.h" | 22 | #include <drm/ttm/ttm_module.h> |
23 | 23 | ||
24 | #define DRIVER_AUTHOR "Matthew Garrett" | 24 | #define DRIVER_AUTHOR "Matthew Garrett" |
25 | 25 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c index 9a276a536992..6c6b4c87d309 100644 --- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c +++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c | |||
@@ -9,9 +9,8 @@ | |||
9 | * Dave Airlie | 9 | * Dave Airlie |
10 | */ | 10 | */ |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include "drmP.h" | 12 | #include <drm/drmP.h> |
13 | #include "drm.h" | 13 | #include <drm/drm_fb_helper.h> |
14 | #include "drm_fb_helper.h" | ||
15 | 14 | ||
16 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
17 | 16 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c index e3c122578417..6a9b12e88d46 100644 --- a/drivers/gpu/drm/cirrus/cirrus_main.c +++ b/drivers/gpu/drm/cirrus/cirrus_main.c | |||
@@ -8,9 +8,8 @@ | |||
8 | * Authors: Matthew Garrett | 8 | * Authors: Matthew Garrett |
9 | * Dave Airlie | 9 | * Dave Airlie |
10 | */ | 10 | */ |
11 | #include "drmP.h" | 11 | #include <drm/drmP.h> |
12 | #include "drm.h" | 12 | #include <drm/drm_crtc_helper.h> |
13 | #include "drm_crtc_helper.h" | ||
14 | 13 | ||
15 | #include "cirrus_drv.h" | 14 | #include "cirrus_drv.h" |
16 | 15 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c index a44d31aa4e3c..60685b21cc36 100644 --- a/drivers/gpu/drm/cirrus/cirrus_mode.c +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c | |||
@@ -14,9 +14,8 @@ | |||
14 | * | 14 | * |
15 | * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com> | 15 | * Copyright 1999-2001 Jeff Garzik <jgarzik@pobox.com> |
16 | */ | 16 | */ |
17 | #include "drmP.h" | 17 | #include <drm/drmP.h> |
18 | #include "drm.h" | 18 | #include <drm/drm_crtc_helper.h> |
19 | #include "drm_crtc_helper.h" | ||
20 | 19 | ||
21 | #include <video/cirrus.h> | 20 | #include <video/cirrus.h> |
22 | 21 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c index 50e170f879de..bc83f835c830 100644 --- a/drivers/gpu/drm/cirrus/cirrus_ttm.c +++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c | |||
@@ -25,7 +25,7 @@ | |||
25 | /* | 25 | /* |
26 | * Authors: Dave Airlie <airlied@redhat.com> | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "cirrus_drv.h" | 29 | #include "cirrus_drv.h" |
30 | #include <ttm/ttm_page_alloc.h> | 30 | #include <ttm/ttm_page_alloc.h> |
31 | 31 | ||
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index 0cb2ba50af53..3d8fed179797 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c | |||
@@ -31,7 +31,7 @@ | |||
31 | * OTHER DEALINGS IN THE SOFTWARE. | 31 | * OTHER DEALINGS IN THE SOFTWARE. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
37 | 37 | ||
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index ba23790450e9..3cedae12b3c1 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * Find the file with the given magic number. | 39 | * Find the file with the given magic number. |
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c index 08ccefedb327..39a718340319 100644 --- a/drivers/gpu/drm/drm_buffer.c +++ b/drivers/gpu/drm/drm_buffer.c | |||
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include <linux/export.h> | 35 | #include <linux/export.h> |
36 | #include "drm_buffer.h" | 36 | #include <drm/drm_buffer.h> |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * Allocate the drm buffer object. | 39 | * Allocate the drm buffer object. |
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index b356c719f2f1..0128147265f3 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <linux/log2.h> | 38 | #include <linux/log2.h> |
39 | #include <linux/export.h> | 39 | #include <linux/export.h> |
40 | #include <asm/shmparam.h> | 40 | #include <asm/shmparam.h> |
41 | #include "drmP.h" | 41 | #include <drm/drmP.h> |
42 | 42 | ||
43 | static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, | 43 | static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, |
44 | struct drm_local_map *map) | 44 | struct drm_local_map *map) |
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c index 08758e061478..ec4698246213 100644 --- a/drivers/gpu/drm/drm_cache.c +++ b/drivers/gpu/drm/drm_cache.c | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/export.h> | 31 | #include <linux/export.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | 33 | ||
34 | #if defined(CONFIG_X86) | 34 | #if defined(CONFIG_X86) |
35 | static void | 35 | static void |
diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index affa629589ac..45adf97e678f 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c | |||
@@ -40,7 +40,7 @@ | |||
40 | * needed by SiS driver's memory management. | 40 | * needed by SiS driver's memory management. |
41 | */ | 41 | */ |
42 | 42 | ||
43 | #include "drmP.h" | 43 | #include <drm/drmP.h> |
44 | 44 | ||
45 | /******************************************************************/ | 45 | /******************************************************************/ |
46 | /** \name Context bitmap support */ | 46 | /** \name Context bitmap support */ |
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 6fbfc244748f..271ffa4fdb47 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -32,11 +32,10 @@ | |||
32 | #include <linux/list.h> | 32 | #include <linux/list.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/export.h> | 34 | #include <linux/export.h> |
35 | #include "drm.h" | 35 | #include <drm/drmP.h> |
36 | #include "drmP.h" | 36 | #include <drm/drm_crtc.h> |
37 | #include "drm_crtc.h" | 37 | #include <drm/drm_edid.h> |
38 | #include "drm_edid.h" | 38 | #include <drm/drm_fourcc.h> |
39 | #include "drm_fourcc.h" | ||
40 | 39 | ||
41 | /* Avoid boilerplate. I'm tired of typing. */ | 40 | /* Avoid boilerplate. I'm tired of typing. */ |
42 | #define DRM_ENUM_NAME_FN(fnname, list) \ | 41 | #define DRM_ENUM_NAME_FN(fnname, list) \ |
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 8fa9d52820d9..1227adf74dbc 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
@@ -32,12 +32,12 @@ | |||
32 | #include <linux/export.h> | 32 | #include <linux/export.h> |
33 | #include <linux/moduleparam.h> | 33 | #include <linux/moduleparam.h> |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm_crtc.h" | 36 | #include <drm/drm_crtc.h> |
37 | #include "drm_fourcc.h" | 37 | #include <drm/drm_fourcc.h> |
38 | #include "drm_crtc_helper.h" | 38 | #include <drm/drm_crtc_helper.h> |
39 | #include "drm_fb_helper.h" | 39 | #include <drm/drm_fb_helper.h> |
40 | #include "drm_edid.h" | 40 | #include <drm/drm_edid.h> |
41 | 41 | ||
42 | static bool drm_kms_helper_poll = true; | 42 | static bool drm_kms_helper_poll = true; |
43 | module_param_named(poll, drm_kms_helper_poll, bool, 0600); | 43 | module_param_named(poll, drm_kms_helper_poll, bool, 0600); |
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 70b13fc19396..a05087cf846d 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include <linux/export.h> | 36 | #include <linux/export.h> |
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | 38 | ||
39 | #if defined(CONFIG_DEBUG_FS) | 39 | #if defined(CONFIG_DEBUG_FS) |
40 | 40 | ||
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index 08f5e5309b22..495b5fd2787c 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c | |||
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/export.h> | 36 | #include <linux/export.h> |
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * Initialize the DMA data. | 40 | * Initialize the DMA data. |
diff --git a/drivers/gpu/drm/drm_dp_i2c_helper.c b/drivers/gpu/drm/drm_dp_i2c_helper.c index f7eba0a0973a..7f246f212457 100644 --- a/drivers/gpu/drm/drm_dp_i2c_helper.c +++ b/drivers/gpu/drm/drm_dp_i2c_helper.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
28 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include "drm_dp_helper.h" | 30 | #include <drm/drm_dp_helper.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | 32 | ||
33 | /* Run a single AUX_CH I2C transaction, writing/reading data as necessary */ | 33 | /* Run a single AUX_CH I2C transaction, writing/reading data as necessary */ |
34 | static int | 34 | static int |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 9238de4009fa..c8fdf03f32c2 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
@@ -49,8 +49,8 @@ | |||
49 | #include <linux/debugfs.h> | 49 | #include <linux/debugfs.h> |
50 | #include <linux/slab.h> | 50 | #include <linux/slab.h> |
51 | #include <linux/export.h> | 51 | #include <linux/export.h> |
52 | #include "drmP.h" | 52 | #include <drm/drmP.h> |
53 | #include "drm_core.h" | 53 | #include <drm/drm_core.h> |
54 | 54 | ||
55 | 55 | ||
56 | static int drm_version(struct drm_device *dev, void *data, | 56 | static int drm_version(struct drm_device *dev, void *data, |
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index b7ee230572b7..a2e54769344a 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm_edid.h" | 35 | #include <drm/drm_edid.h> |
36 | #include "drm_edid_modes.h" | 36 | #include "drm_edid_modes.h" |
37 | 37 | ||
38 | #define version_greater(edid, maj, min) \ | 38 | #define version_greater(edid, maj, min) \ |
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 0303935d10e2..9d53e6503f9a 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c | |||
@@ -21,10 +21,10 @@ | |||
21 | 21 | ||
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/firmware.h> | 23 | #include <linux/firmware.h> |
24 | #include "drmP.h" | 24 | #include <drm/drmP.h> |
25 | #include "drm_crtc.h" | 25 | #include <drm/drm_crtc.h> |
26 | #include "drm_crtc_helper.h" | 26 | #include <drm/drm_crtc_helper.h> |
27 | #include "drm_edid.h" | 27 | #include <drm/drm_edid.h> |
28 | 28 | ||
29 | static char edid_firmware[PATH_MAX]; | 29 | static char edid_firmware[PATH_MAX]; |
30 | module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644); | 30 | module_param_string(edid_firmware, edid_firmware, sizeof(edid_firmware), 0644); |
diff --git a/drivers/gpu/drm/drm_edid_modes.h b/drivers/gpu/drm/drm_edid_modes.h index ff98a7eb38dd..fbd354c1f1f4 100644 --- a/drivers/gpu/drm/drm_edid_modes.h +++ b/drivers/gpu/drm/drm_edid_modes.h | |||
@@ -24,8 +24,8 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_edid.h" | 28 | #include <drm/drm_edid.h> |
29 | 29 | ||
30 | /* | 30 | /* |
31 | * Autogenerated from the DMT spec. | 31 | * Autogenerated from the DMT spec. |
diff --git a/drivers/gpu/drm/drm_encoder_slave.c b/drivers/gpu/drm/drm_encoder_slave.c index fb943551060e..63e733408b6d 100644 --- a/drivers/gpu/drm/drm_encoder_slave.c +++ b/drivers/gpu/drm/drm_encoder_slave.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | 28 | ||
29 | #include "drm_encoder_slave.h" | 29 | #include <drm/drm_encoder_slave.h> |
30 | 30 | ||
31 | /** | 31 | /** |
32 | * drm_i2c_encoder_init - Initialize an I2C slave encoder | 32 | * drm_i2c_encoder_init - Initialize an I2C slave encoder |
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f546d1e8af82..dde5c345e75f 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
@@ -32,10 +32,10 @@ | |||
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/fb.h> | 33 | #include <linux/fb.h> |
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm_crtc.h" | 36 | #include <drm/drm_crtc.h> |
37 | #include "drm_fb_helper.h" | 37 | #include <drm/drm_fb_helper.h> |
38 | #include "drm_crtc_helper.h" | 38 | #include <drm/drm_crtc_helper.h> |
39 | 39 | ||
40 | MODULE_AUTHOR("David Airlie, Jesse Barnes"); | 40 | MODULE_AUTHOR("David Airlie, Jesse Barnes"); |
41 | MODULE_DESCRIPTION("DRM KMS helper"); | 41 | MODULE_DESCRIPTION("DRM KMS helper"); |
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 433d2fad1fe6..7ef1b673e1be 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
@@ -34,7 +34,7 @@ | |||
34 | * OTHER DEALINGS IN THE SOFTWARE. | 34 | * OTHER DEALINGS IN THE SOFTWARE. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include <linux/poll.h> | 38 | #include <linux/poll.h> |
39 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index fbe0842038b5..92177d5aedee 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #include <linux/pagemap.h> | 36 | #include <linux/pagemap.h> |
37 | #include <linux/shmem_fs.h> | 37 | #include <linux/shmem_fs.h> |
38 | #include <linux/dma-buf.h> | 38 | #include <linux/dma-buf.h> |
39 | #include "drmP.h" | 39 | #include <drm/drmP.h> |
40 | 40 | ||
41 | /** @file drm_gem.c | 41 | /** @file drm_gem.c |
42 | * | 42 | * |
diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c index c87dc96444de..f7311162a61d 100644 --- a/drivers/gpu/drm/drm_global.c +++ b/drivers/gpu/drm/drm_global.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | #include "drm_global.h" | 34 | #include <drm/drm_global.h> |
35 | 35 | ||
36 | struct drm_global_item { | 36 | struct drm_global_item { |
37 | struct mutex mutex; | 37 | struct mutex mutex; |
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index 68dc8744b630..c3745c4d46d8 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c | |||
@@ -32,8 +32,8 @@ | |||
32 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 32 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm_hashtab.h" | 36 | #include <drm/drm_hashtab.h> |
37 | #include <linux/hash.h> | 37 | #include <linux/hash.h> |
38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
39 | #include <linux/export.h> | 39 | #include <linux/export.h> |
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index eb0af393e6e2..cdf8b1e7602d 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c | |||
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/seq_file.h> | 36 | #include <linux/seq_file.h> |
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | 38 | ||
39 | /** | 39 | /** |
40 | * Called when "/proc/dri/.../name" is read. | 40 | * Called when "/proc/dri/.../name" is read. |
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 637fcc3766c7..2f4c4343dfa3 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/ratelimit.h> | 31 | #include <linux/ratelimit.h> |
32 | #include <linux/export.h> | 32 | #include <linux/export.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm_core.h" | 35 | #include <drm/drm_core.h> |
36 | 36 | ||
37 | #define DRM_IOCTL_VERSION32 DRM_IOWR(0x00, drm_version32_t) | 37 | #define DRM_IOCTL_VERSION32 DRM_IOWR(0x00, drm_version32_t) |
38 | #define DRM_IOCTL_GET_UNIQUE32 DRM_IOWR(0x01, drm_unique32_t) | 38 | #define DRM_IOCTL_GET_UNIQUE32 DRM_IOWR(0x01, drm_unique32_t) |
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 39a43834cef9..23dd97506f28 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c | |||
@@ -33,11 +33,11 @@ | |||
33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | #include "drm_core.h" | 37 | #include <drm/drm_core.h> |
38 | 38 | ||
39 | #include "linux/pci.h" | 39 | #include <linux/pci.h> |
40 | #include "linux/export.h" | 40 | #include <linux/export.h> |
41 | 41 | ||
42 | /** | 42 | /** |
43 | * Get the bus id. | 43 | * Get the bus id. |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 03f16f352fe2..09975ba1a8f7 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | #include "drm_trace.h" | 37 | #include "drm_trace.h" |
38 | 38 | ||
39 | #include <linux/interrupt.h> /* For task queue support */ | 39 | #include <linux/interrupt.h> /* For task queue support */ |
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 32039553e172..d752c96d6090 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c | |||
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include <linux/export.h> | 36 | #include <linux/export.h> |
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | 38 | ||
39 | static int drm_notifier(void *priv); | 39 | static int drm_notifier(void *priv); |
40 | 40 | ||
diff --git a/drivers/gpu/drm/drm_memory.c b/drivers/gpu/drm/drm_memory.c index c86a0f1a435c..126d50ea181f 100644 --- a/drivers/gpu/drm/drm_memory.c +++ b/drivers/gpu/drm/drm_memory.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include <linux/highmem.h> | 36 | #include <linux/highmem.h> |
37 | #include <linux/export.h> | 37 | #include <linux/export.h> |
38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
39 | 39 | ||
40 | #if __OS_HAS_AGP | 40 | #if __OS_HAS_AGP |
41 | static void *agp_remap(unsigned long offset, unsigned long size, | 41 | static void *agp_remap(unsigned long offset, unsigned long size, |
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 9bb82f7f0061..0761a03cdbb2 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c | |||
@@ -41,8 +41,8 @@ | |||
41 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 41 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "drmP.h" | 44 | #include <drm/drmP.h> |
45 | #include "drm_mm.h" | 45 | #include <drm/drm_mm.h> |
46 | #include <linux/slab.h> | 46 | #include <linux/slab.h> |
47 | #include <linux/seq_file.h> | 47 | #include <linux/seq_file.h> |
48 | #include <linux/export.h> | 48 | #include <linux/export.h> |
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 28637c181b15..59450f39bf96 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c | |||
@@ -33,9 +33,8 @@ | |||
33 | #include <linux/list.h> | 33 | #include <linux/list.h> |
34 | #include <linux/list_sort.h> | 34 | #include <linux/list_sort.h> |
35 | #include <linux/export.h> | 35 | #include <linux/export.h> |
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | #include "drm.h" | 37 | #include <drm/drm_crtc.h> |
38 | #include "drm_crtc.h" | ||
39 | 38 | ||
40 | /** | 39 | /** |
41 | * drm_mode_debug_printmodeline - debug print a mode | 40 | * drm_mode_debug_printmodeline - debug print a mode |
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 5320364582ce..ba33144257e5 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <linux/slab.h> | 40 | #include <linux/slab.h> |
41 | #include <linux/dma-mapping.h> | 41 | #include <linux/dma-mapping.h> |
42 | #include <linux/export.h> | 42 | #include <linux/export.h> |
43 | #include "drmP.h" | 43 | #include <drm/drmP.h> |
44 | 44 | ||
45 | /**********************************************************************/ | 45 | /**********************************************************************/ |
46 | /** \name PCI memory */ | 46 | /** \name PCI memory */ |
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c index 82431dcae37b..aaeb6f8d69ce 100644 --- a/drivers/gpu/drm/drm_platform.c +++ b/drivers/gpu/drm/drm_platform.c | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <linux/export.h> | 28 | #include <linux/export.h> |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | 30 | ||
31 | /** | 31 | /** |
32 | * Register. | 32 | * Register. |
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index f546ff98a114..7f125738f44e 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
30 | #include <linux/dma-buf.h> | 30 | #include <linux/dma-buf.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * DMA-BUF/GEM Object references and lifetime overview: | 34 | * DMA-BUF/GEM Object references and lifetime overview: |
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index da457b18eaaf..ff5456b7df72 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <linux/seq_file.h> | 40 | #include <linux/seq_file.h> |
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
42 | #include <linux/export.h> | 42 | #include <linux/export.h> |
43 | #include "drmP.h" | 43 | #include <drm/drmP.h> |
44 | 44 | ||
45 | /*************************************************** | 45 | /*************************************************** |
46 | * Initialization, etc. | 46 | * Initialization, etc. |
diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index 7525e0311e59..d87f60bbc330 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | 37 | ||
38 | #define DEBUG_SCATTER 0 | 38 | #define DEBUG_SCATTER 0 |
39 | 39 | ||
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index 21bcd4a555d8..c236fd27eba6 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
@@ -34,8 +34,8 @@ | |||
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include "drm_core.h" | 38 | #include <drm/drm_core.h> |
39 | 39 | ||
40 | unsigned int drm_debug = 0; /* 1 to enable debug output */ | 40 | unsigned int drm_debug = 0; /* 1 to enable debug output */ |
41 | EXPORT_SYMBOL(drm_debug); | 41 | EXPORT_SYMBOL(drm_debug); |
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 45ac8d6c92b7..05cd8fe062af 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
@@ -18,9 +18,9 @@ | |||
18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
19 | #include <linux/export.h> | 19 | #include <linux/export.h> |
20 | 20 | ||
21 | #include "drm_sysfs.h" | 21 | #include <drm/drm_sysfs.h> |
22 | #include "drm_core.h" | 22 | #include <drm/drm_core.h> |
23 | #include "drmP.h" | 23 | #include <drm/drmP.h> |
24 | 24 | ||
25 | #define to_drm_minor(d) container_of(d, struct drm_minor, kdev) | 25 | #define to_drm_minor(d) container_of(d, struct drm_minor, kdev) |
26 | #define to_drm_connector(d) container_of(d, struct drm_connector, kdev) | 26 | #define to_drm_connector(d) container_of(d, struct drm_connector, kdev) |
diff --git a/drivers/gpu/drm/drm_trace_points.c b/drivers/gpu/drm/drm_trace_points.c index 0d0eb90864ae..3bbc4deb4dbc 100644 --- a/drivers/gpu/drm/drm_trace_points.c +++ b/drivers/gpu/drm/drm_trace_points.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | 2 | ||
3 | #define CREATE_TRACE_POINTS | 3 | #define CREATE_TRACE_POINTS |
4 | #include "drm_trace.h" | 4 | #include "drm_trace.h" |
diff --git a/drivers/gpu/drm/drm_usb.c b/drivers/gpu/drm/drm_usb.c index 37c9a523dd1c..3cec30611417 100644 --- a/drivers/gpu/drm/drm_usb.c +++ b/drivers/gpu/drm/drm_usb.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include <linux/usb.h> | 2 | #include <linux/usb.h> |
3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
4 | 4 | ||
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 961ee08927fe..85a8fa6e09fe 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * OTHER DEALINGS IN THE SOFTWARE. | 33 | * OTHER DEALINGS IN THE SOFTWARE. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | #include <linux/export.h> | 37 | #include <linux/export.h> |
38 | #if defined(__ia64__) | 38 | #if defined(__ia64__) |
39 | #include <linux/efi.h> | 39 | #include <linux/efi.h> |
diff --git a/drivers/gpu/drm/exynos/exynos_ddc.c b/drivers/gpu/drm/exynos/exynos_ddc.c index 7e1051d07f1f..961a1806a246 100644 --- a/drivers/gpu/drm/exynos/exynos_ddc.c +++ b/drivers/gpu/drm/exynos/exynos_ddc.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | 15 | ||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_buf.c b/drivers/gpu/drm/exynos/exynos_drm_buf.c index b3cb0a69fbf2..118c117b3226 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_buf.c +++ b/drivers/gpu/drm/exynos/exynos_drm_buf.c | |||
@@ -23,9 +23,8 @@ | |||
23 | * OTHER DEALINGS IN THE SOFTWARE. | 23 | * OTHER DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm.h" | 27 | #include <drm/exynos_drm.h> |
28 | #include "exynos_drm.h" | ||
29 | 28 | ||
30 | #include "exynos_drm_drv.h" | 29 | #include "exynos_drm_drv.h" |
31 | #include "exynos_drm_gem.h" | 30 | #include "exynos_drm_gem.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index d9568198c300..ad01d3a09c11 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * OTHER DEALINGS IN THE SOFTWARE. | 25 | * OTHER DEALINGS IN THE SOFTWARE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm_crtc_helper.h" | 29 | #include <drm/drm_crtc_helper.h> |
30 | 30 | ||
31 | #include <drm/exynos_drm.h> | 31 | #include <drm/exynos_drm.h> |
32 | #include "exynos_drm_drv.h" | 32 | #include "exynos_drm_drv.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_core.c b/drivers/gpu/drm/exynos/exynos_drm_core.c index 84dd099eae3b..19bdf0a194eb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_core.c +++ b/drivers/gpu/drm/exynos/exynos_drm_core.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * OTHER DEALINGS IN THE SOFTWARE. | 26 | * OTHER DEALINGS IN THE SOFTWARE. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "exynos_drm_drv.h" | 30 | #include "exynos_drm_drv.h" |
31 | #include "exynos_drm_encoder.h" | 31 | #include "exynos_drm_encoder.h" |
32 | #include "exynos_drm_connector.h" | 32 | #include "exynos_drm_connector.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index abb1e2f8227f..df1e34f0f091 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c | |||
@@ -26,8 +26,8 @@ | |||
26 | * OTHER DEALINGS IN THE SOFTWARE. | 26 | * OTHER DEALINGS IN THE SOFTWARE. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm_crtc_helper.h" | 30 | #include <drm/drm_crtc_helper.h> |
31 | 31 | ||
32 | #include "exynos_drm_drv.h" | 32 | #include "exynos_drm_drv.h" |
33 | #include "exynos_drm_encoder.h" | 33 | #include "exynos_drm_encoder.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c index ae13febe0eaa..fae1f2ec886c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | |||
@@ -23,9 +23,8 @@ | |||
23 | * OTHER DEALINGS IN THE SOFTWARE. | 23 | * OTHER DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm.h" | 27 | #include <drm/exynos_drm.h> |
28 | #include "exynos_drm.h" | ||
29 | #include "exynos_drm_drv.h" | 28 | #include "exynos_drm_drv.h" |
30 | #include "exynos_drm_gem.h" | 29 | #include "exynos_drm_gem.h" |
31 | 30 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index d07071937453..1de7baafddd0 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c | |||
@@ -25,9 +25,8 @@ | |||
25 | * OTHER DEALINGS IN THE SOFTWARE. | 25 | * OTHER DEALINGS IN THE SOFTWARE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/drm_crtc_helper.h> |
30 | #include "drm_crtc_helper.h" | ||
31 | 30 | ||
32 | #include <drm/exynos_drm.h> | 31 | #include <drm/exynos_drm.h> |
33 | 32 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index e22704b249d7..a4ab98b52dd8 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h | |||
@@ -30,7 +30,6 @@ | |||
30 | #define _EXYNOS_DRM_DRV_H_ | 30 | #define _EXYNOS_DRM_DRV_H_ |
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include "drm.h" | ||
34 | 33 | ||
35 | #define MAX_CRTC 3 | 34 | #define MAX_CRTC 3 |
36 | #define MAX_PLANE 5 | 35 | #define MAX_PLANE 5 |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index 2c037cd7d2d4..39bd8abff3f1 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c | |||
@@ -26,8 +26,8 @@ | |||
26 | * OTHER DEALINGS IN THE SOFTWARE. | 26 | * OTHER DEALINGS IN THE SOFTWARE. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm_crtc_helper.h" | 30 | #include <drm/drm_crtc_helper.h> |
31 | 31 | ||
32 | #include "exynos_drm_drv.h" | 32 | #include "exynos_drm_drv.h" |
33 | #include "exynos_drm_encoder.h" | 33 | #include "exynos_drm_encoder.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c index 4ccfe4328fab..53afcc5f0945 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c | |||
@@ -26,10 +26,10 @@ | |||
26 | * OTHER DEALINGS IN THE SOFTWARE. | 26 | * OTHER DEALINGS IN THE SOFTWARE. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm_crtc.h" | 30 | #include <drm/drm_crtc.h> |
31 | #include "drm_crtc_helper.h" | 31 | #include <drm/drm_crtc_helper.h> |
32 | #include "drm_fb_helper.h" | 32 | #include <drm/drm_fb_helper.h> |
33 | 33 | ||
34 | #include "exynos_drm_drv.h" | 34 | #include "exynos_drm_drv.h" |
35 | #include "exynos_drm_fb.h" | 35 | #include "exynos_drm_fb.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index d5586cc75163..be879c079346 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c | |||
@@ -26,10 +26,10 @@ | |||
26 | * OTHER DEALINGS IN THE SOFTWARE. | 26 | * OTHER DEALINGS IN THE SOFTWARE. |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm_crtc.h" | 30 | #include <drm/drm_crtc.h> |
31 | #include "drm_fb_helper.h" | 31 | #include <drm/drm_fb_helper.h> |
32 | #include "drm_crtc_helper.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | 33 | ||
34 | #include "exynos_drm_drv.h" | 34 | #include "exynos_drm_drv.h" |
35 | #include "exynos_drm_fb.h" | 35 | #include "exynos_drm_fb.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index b19cd93e7047..58d50e368a58 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * option) any later version. | 11 | * option) any later version. |
12 | * | 12 | * |
13 | */ | 13 | */ |
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | 15 | ||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c index 2526e82bea32..bc2a2e9be8eb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c +++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c | |||
@@ -18,8 +18,8 @@ | |||
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
20 | 20 | ||
21 | #include "drmP.h" | 21 | #include <drm/drmP.h> |
22 | #include "exynos_drm.h" | 22 | #include <drm/exynos_drm.h> |
23 | #include "exynos_drm_drv.h" | 23 | #include "exynos_drm_drv.h" |
24 | #include "exynos_drm_gem.h" | 24 | #include "exynos_drm_gem.h" |
25 | 25 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index a38051c95ec4..fcdbe46914f7 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c | |||
@@ -23,8 +23,7 @@ | |||
23 | * OTHER DEALINGS IN THE SOFTWARE. | 23 | * OTHER DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm.h" | ||
28 | 27 | ||
29 | #include <linux/shmem_fs.h> | 28 | #include <linux/shmem_fs.h> |
30 | #include <drm/exynos_drm.h> | 29 | #include <drm/exynos_drm.h> |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c index 3fdf0b65f47e..c3d3a5e4f109 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | 15 | ||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/wait.h> | 17 | #include <linux/wait.h> |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c index e1f94b746bd7..03b472b43013 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c | |||
@@ -9,9 +9,9 @@ | |||
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "drmP.h" | 12 | #include <drm/drmP.h> |
13 | 13 | ||
14 | #include "exynos_drm.h" | 14 | #include <drm/exynos_drm.h> |
15 | #include "exynos_drm_drv.h" | 15 | #include "exynos_drm_drv.h" |
16 | #include "exynos_drm_encoder.h" | 16 | #include "exynos_drm_encoder.h" |
17 | #include "exynos_drm_fb.h" | 17 | #include "exynos_drm_fb.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index 537027a74fd5..3e933c911017 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * option) any later version. | 10 | * option) any later version. |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | 14 | ||
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
@@ -18,8 +18,8 @@ | |||
18 | 18 | ||
19 | #include <drm/exynos_drm.h> | 19 | #include <drm/exynos_drm.h> |
20 | 20 | ||
21 | #include "drm_edid.h" | 21 | #include <drm/drm_edid.h> |
22 | #include "drm_crtc_helper.h" | 22 | #include <drm/drm_crtc_helper.h> |
23 | 23 | ||
24 | #include "exynos_drm_drv.h" | 24 | #include "exynos_drm_drv.h" |
25 | #include "exynos_drm_crtc.h" | 25 | #include "exynos_drm_crtc.h" |
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index a6aea6f3ea1a..e1c53956aa27 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c | |||
@@ -14,9 +14,9 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "drmP.h" | 17 | #include <drm/drmP.h> |
18 | #include "drm_edid.h" | 18 | #include <drm/drm_edid.h> |
19 | #include "drm_crtc_helper.h" | 19 | #include <drm/drm_crtc_helper.h> |
20 | 20 | ||
21 | #include "regs-hdmi.h" | 21 | #include "regs-hdmi.h" |
22 | 22 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_hdmiphy.c b/drivers/gpu/drm/exynos/exynos_hdmiphy.c index 9fe2995ab9f9..0a8162b7de3d 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmiphy.c +++ b/drivers/gpu/drm/exynos/exynos_hdmiphy.c | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | 15 | ||
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 25b97d5e5fcb..e6098f247a5d 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * | 14 | * |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "drmP.h" | 17 | #include <drm/drmP.h> |
18 | 18 | ||
19 | #include "regs-mixer.h" | 19 | #include "regs-mixer.h" |
20 | #include "regs-vp.h" | 20 | #include "regs-vp.h" |
diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c index b7e7b49d8f62..7db0e3bf5a5b 100644 --- a/drivers/gpu/drm/gma500/cdv_device.c +++ b/drivers/gpu/drm/gma500/cdv_device.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/backlight.h> | 20 | #include <linux/backlight.h> |
21 | #include <drm/drmP.h> | 21 | #include <drm/drmP.h> |
22 | #include <drm/drm.h> | 22 | #include <drm/drm.h> |
23 | #include "gma_drm.h" | 23 | #include <drm/gma_drm.h> |
24 | #include "psb_drv.h" | 24 | #include "psb_drv.h" |
25 | #include "psb_reg.h" | 25 | #include "psb_reg.h" |
26 | #include "psb_intel_reg.h" | 26 | #include "psb_intel_reg.h" |
diff --git a/drivers/gpu/drm/gma500/gem.c b/drivers/gpu/drm/gma500/gem.c index fc7d144bc2d3..f3a1ae8eb77b 100644 --- a/drivers/gpu/drm/gma500/gem.c +++ b/drivers/gpu/drm/gma500/gem.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <drm/drmP.h> | 26 | #include <drm/drmP.h> |
27 | #include <drm/drm.h> | 27 | #include <drm/drm.h> |
28 | #include "gma_drm.h" | 28 | #include <drm/gma_drm.h> |
29 | #include "psb_drv.h" | 29 | #include "psb_drv.h" |
30 | 30 | ||
31 | int psb_gem_init_object(struct drm_gem_object *obj) | 31 | int psb_gem_init_object(struct drm_gem_object *obj) |
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c index 8d7caf0f363e..a837ee97787c 100644 --- a/drivers/gpu/drm/gma500/intel_bios.c +++ b/drivers/gpu/drm/gma500/intel_bios.c | |||
@@ -20,7 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | #include <drm/drmP.h> | 21 | #include <drm/drmP.h> |
22 | #include <drm/drm.h> | 22 | #include <drm/drm.h> |
23 | #include "gma_drm.h" | 23 | #include <drm/gma_drm.h> |
24 | #include "psb_drv.h" | 24 | #include "psb_drv.h" |
25 | #include "psb_intel_drv.h" | 25 | #include "psb_intel_drv.h" |
26 | #include "psb_intel_reg.h" | 26 | #include "psb_intel_reg.h" |
diff --git a/drivers/gpu/drm/gma500/intel_gmbus.c b/drivers/gpu/drm/gma500/intel_gmbus.c index 9db90527bf0f..62cd42e88f28 100644 --- a/drivers/gpu/drm/gma500/intel_gmbus.c +++ b/drivers/gpu/drm/gma500/intel_gmbus.c | |||
@@ -29,10 +29,9 @@ | |||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/i2c.h> | 30 | #include <linux/i2c.h> |
31 | #include <linux/i2c-algo-bit.h> | 31 | #include <linux/i2c-algo-bit.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | ||
34 | #include "psb_intel_drv.h" | 33 | #include "psb_intel_drv.h" |
35 | #include "gma_drm.h" | 34 | #include <drm/gma_drm.h> |
36 | #include "psb_drv.h" | 35 | #include "psb_drv.h" |
37 | #include "psb_intel_reg.h" | 36 | #include "psb_intel_reg.h" |
38 | 37 | ||
diff --git a/drivers/gpu/drm/gma500/mid_bios.c b/drivers/gpu/drm/gma500/mid_bios.c index b2a790bd9899..64d18a37da40 100644 --- a/drivers/gpu/drm/gma500/mid_bios.c +++ b/drivers/gpu/drm/gma500/mid_bios.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <drm/drmP.h> | 26 | #include <drm/drmP.h> |
27 | #include <drm/drm.h> | 27 | #include <drm/drm.h> |
28 | #include "gma_drm.h" | 28 | #include <drm/gma_drm.h> |
29 | #include "psb_drv.h" | 29 | #include "psb_drv.h" |
30 | #include "mid_bios.h" | 30 | #include "mid_bios.h" |
31 | 31 | ||
diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c index cf49ba5a54bf..010b820744a5 100644 --- a/drivers/gpu/drm/gma500/oaktrail_device.c +++ b/drivers/gpu/drm/gma500/oaktrail_device.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/dmi.h> | 22 | #include <linux/dmi.h> |
23 | #include <drm/drmP.h> | 23 | #include <drm/drmP.h> |
24 | #include <drm/drm.h> | 24 | #include <drm/drm.h> |
25 | #include "gma_drm.h" | 25 | #include <drm/gma_drm.h> |
26 | #include "psb_drv.h" | 26 | #include "psb_drv.h" |
27 | #include "psb_reg.h" | 27 | #include "psb_reg.h" |
28 | #include "psb_intel_reg.h" | 28 | #include "psb_intel_reg.h" |
diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c index 5971bc82b765..7563cd51851a 100644 --- a/drivers/gpu/drm/gma500/psb_device.c +++ b/drivers/gpu/drm/gma500/psb_device.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/backlight.h> | 20 | #include <linux/backlight.h> |
21 | #include <drm/drmP.h> | 21 | #include <drm/drmP.h> |
22 | #include <drm/drm.h> | 22 | #include <drm/drm.h> |
23 | #include "gma_drm.h" | 23 | #include <drm/gma_drm.h> |
24 | #include "psb_drv.h" | 24 | #include "psb_drv.h" |
25 | #include "psb_reg.h" | 25 | #include "psb_reg.h" |
26 | #include "psb_intel_reg.h" | 26 | #include "psb_intel_reg.h" |
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 0c4737438530..dd1fbfa7e467 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | #include <drm/drmP.h> | 22 | #include <drm/drmP.h> |
23 | #include <drm/drm.h> | 23 | #include <drm/drm.h> |
24 | #include "gma_drm.h" | 24 | #include <drm/gma_drm.h> |
25 | #include "psb_drv.h" | 25 | #include "psb_drv.h" |
26 | #include "framebuffer.h" | 26 | #include "framebuffer.h" |
27 | #include "psb_reg.h" | 27 | #include "psb_reg.h" |
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h index 1bd115ecefe1..b15282fdbf97 100644 --- a/drivers/gpu/drm/gma500/psb_drv.h +++ b/drivers/gpu/drm/gma500/psb_drv.h | |||
@@ -23,9 +23,9 @@ | |||
23 | #include <linux/kref.h> | 23 | #include <linux/kref.h> |
24 | 24 | ||
25 | #include <drm/drmP.h> | 25 | #include <drm/drmP.h> |
26 | #include "drm_global.h" | 26 | #include <drm/drm_global.h> |
27 | #include "gem_glue.h" | 27 | #include "gem_glue.h" |
28 | #include "gma_drm.h" | 28 | #include <drm/gma_drm.h> |
29 | #include "psb_reg.h" | 29 | #include "psb_reg.h" |
30 | #include "psb_intel_drv.h" | 30 | #include "psb_intel_drv.h" |
31 | #include "gtt.h" | 31 | #include "gtt.h" |
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c index 0466c7b985f8..c148d92229fd 100644 --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c | |||
@@ -29,12 +29,11 @@ | |||
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/drm_crtc.h> |
34 | #include "drm_crtc.h" | 34 | #include <drm/drm_edid.h> |
35 | #include "drm_edid.h" | ||
36 | #include "psb_intel_drv.h" | 35 | #include "psb_intel_drv.h" |
37 | #include "gma_drm.h" | 36 | #include <drm/gma_drm.h> |
38 | #include "psb_drv.h" | 37 | #include "psb_drv.h" |
39 | #include "psb_intel_sdvo_regs.h" | 38 | #include "psb_intel_sdvo_regs.h" |
40 | #include "psb_intel_reg.h" | 39 | #include "psb_intel_reg.h" |
diff --git a/drivers/gpu/drm/i2c/ch7006_priv.h b/drivers/gpu/drm/i2c/ch7006_priv.h index 09599f4c0c9a..ce577841f931 100644 --- a/drivers/gpu/drm/i2c/ch7006_priv.h +++ b/drivers/gpu/drm/i2c/ch7006_priv.h | |||
@@ -27,10 +27,10 @@ | |||
27 | #ifndef __DRM_I2C_CH7006_PRIV_H__ | 27 | #ifndef __DRM_I2C_CH7006_PRIV_H__ |
28 | #define __DRM_I2C_CH7006_PRIV_H__ | 28 | #define __DRM_I2C_CH7006_PRIV_H__ |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm_crtc_helper.h" | 31 | #include <drm/drm_crtc_helper.h> |
32 | #include "drm_encoder_slave.h" | 32 | #include <drm/drm_encoder_slave.h> |
33 | #include "i2c/ch7006.h" | 33 | #include <drm/i2c/ch7006.h> |
34 | 34 | ||
35 | typedef int64_t fixed; | 35 | typedef int64_t fixed; |
36 | #define fixed1 (1LL << 32) | 36 | #define fixed1 (1LL << 32) |
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c index 30b8ae5e5c4a..002ce7874332 100644 --- a/drivers/gpu/drm/i2c/sil164_drv.c +++ b/drivers/gpu/drm/i2c/sil164_drv.c | |||
@@ -26,10 +26,10 @@ | |||
26 | 26 | ||
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm_crtc_helper.h" | 30 | #include <drm/drm_crtc_helper.h> |
31 | #include "drm_encoder_slave.h" | 31 | #include <drm/drm_encoder_slave.h> |
32 | #include "i2c/sil164.h" | 32 | #include <drm/i2c/sil164.h> |
33 | 33 | ||
34 | struct sil164_priv { | 34 | struct sil164_priv { |
35 | struct sil164_encoder_params config; | 35 | struct sil164_encoder_params config; |
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index 463ec6871fe9..004ecdfe1b55 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c | |||
@@ -30,9 +30,8 @@ | |||
30 | * | 30 | * |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | 34 | #include <drm/i810_drm.h> |
35 | #include "i810_drm.h" | ||
36 | #include "i810_drv.h" | 35 | #include "i810_drv.h" |
37 | #include <linux/interrupt.h> /* For task queue support */ | 36 | #include <linux/interrupt.h> /* For task queue support */ |
38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index 48cfcca2b350..2e91fc3580b4 100644 --- a/drivers/gpu/drm/i810/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c | |||
@@ -32,12 +32,11 @@ | |||
32 | 32 | ||
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm.h" | 36 | #include <drm/i810_drm.h> |
37 | #include "i810_drm.h" | ||
38 | #include "i810_drv.h" | 37 | #include "i810_drv.h" |
39 | 38 | ||
40 | #include "drm_pciids.h" | 39 | #include <drm/drm_pciids.h> |
41 | 40 | ||
42 | static struct pci_device_id pciidlist[] = { | 41 | static struct pci_device_id pciidlist[] = { |
43 | i810_PCI_IDS | 42 | i810_PCI_IDS |
diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h index 58914691a77b..573de82c9f5a 100644 --- a/drivers/gpu/drm/i915/dvo.h +++ b/drivers/gpu/drm/i915/dvo.h | |||
@@ -24,9 +24,8 @@ | |||
24 | #define _INTEL_DVO_H | 24 | #define _INTEL_DVO_H |
25 | 25 | ||
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | 28 | #include <drm/drm_crtc.h> |
29 | #include "drm_crtc.h" | ||
30 | #include "intel_drv.h" | 29 | #include "intel_drv.h" |
31 | 30 | ||
32 | struct intel_dvo_device { | 31 | struct intel_dvo_device { |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 359f6e8b9b00..63f01e29c1fa 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -30,11 +30,10 @@ | |||
30 | #include <linux/debugfs.h> | 30 | #include <linux/debugfs.h> |
31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
32 | #include <linux/export.h> | 32 | #include <linux/export.h> |
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | ||
35 | #include "intel_drv.h" | 34 | #include "intel_drv.h" |
36 | #include "intel_ringbuffer.h" | 35 | #include "intel_ringbuffer.h" |
37 | #include "i915_drm.h" | 36 | #include <drm/i915_drm.h> |
38 | #include "i915_drv.h" | 37 | #include "i915_drv.h" |
39 | 38 | ||
40 | #define DRM_I915_RING_DEBUG 1 | 39 | #define DRM_I915_RING_DEBUG 1 |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 914c0dfabe60..804f1c98e279 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -28,12 +28,11 @@ | |||
28 | 28 | ||
29 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | 29 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/drm_fb_helper.h> |
34 | #include "drm_fb_helper.h" | ||
35 | #include "intel_drv.h" | 34 | #include "intel_drv.h" |
36 | #include "i915_drm.h" | 35 | #include <drm/i915_drm.h> |
37 | #include "i915_drv.h" | 36 | #include "i915_drv.h" |
38 | #include "i915_trace.h" | 37 | #include "i915_trace.h" |
39 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index a24ffbe97c01..f6825324e72d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -28,16 +28,15 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | 32 | #include <drm/i915_drm.h> |
33 | #include "i915_drm.h" | ||
34 | #include "i915_drv.h" | 33 | #include "i915_drv.h" |
35 | #include "i915_trace.h" | 34 | #include "i915_trace.h" |
36 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
37 | 36 | ||
38 | #include <linux/console.h> | 37 | #include <linux/console.h> |
39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
40 | #include "drm_crtc_helper.h" | 39 | #include <drm/drm_crtc_helper.h> |
41 | 40 | ||
42 | static int i915_modeset __read_mostly = -1; | 41 | static int i915_modeset __read_mostly = -1; |
43 | module_param_named(modeset, i915_modeset, int, 0400); | 42 | module_param_named(modeset, i915_modeset, int, 0400); |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 274d25de521e..e2c93f7be8ed 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -25,9 +25,8 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/i915_drm.h> |
30 | #include "i915_drm.h" | ||
31 | #include "i915_drv.h" | 30 | #include "i915_drv.h" |
32 | #include "i915_trace.h" | 31 | #include "i915_trace.h" |
33 | #include "intel_drv.h" | 32 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index a9d58d72bb4d..a21c3dccf436 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c | |||
@@ -85,8 +85,8 @@ | |||
85 | * | 85 | * |
86 | */ | 86 | */ |
87 | 87 | ||
88 | #include "drmP.h" | 88 | #include <drm/drmP.h> |
89 | #include "i915_drm.h" | 89 | #include <drm/i915_drm.h> |
90 | #include "i915_drv.h" | 90 | #include "i915_drv.h" |
91 | 91 | ||
92 | /* This is a HW constraint. The value below is the largest known requirement | 92 | /* This is a HW constraint. The value below is the largest known requirement |
diff --git a/drivers/gpu/drm/i915/i915_gem_debug.c b/drivers/gpu/drm/i915/i915_gem_debug.c index bddf7bed183f..582e6a5f3dac 100644 --- a/drivers/gpu/drm/i915/i915_gem_debug.c +++ b/drivers/gpu/drm/i915/i915_gem_debug.c | |||
@@ -25,9 +25,8 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/i915_drm.h> |
30 | #include "i915_drm.h" | ||
31 | #include "i915_drv.h" | 30 | #include "i915_drv.h" |
32 | 31 | ||
33 | #if WATCH_LISTS | 32 | #if WATCH_LISTS |
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index aa308e1337db..af199596e792 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * Authors: | 23 | * Authors: |
24 | * Dave Airlie <airlied@redhat.com> | 24 | * Dave Airlie <airlied@redhat.com> |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "i915_drv.h" | 27 | #include "i915_drv.h" |
28 | #include <linux/dma-buf.h> | 28 | #include <linux/dma-buf.h> |
29 | 29 | ||
diff --git a/drivers/gpu/drm/i915/i915_gem_evict.c b/drivers/gpu/drm/i915/i915_gem_evict.c index eba0308f10e3..fd408995a783 100644 --- a/drivers/gpu/drm/i915/i915_gem_evict.c +++ b/drivers/gpu/drm/i915/i915_gem_evict.c | |||
@@ -26,10 +26,9 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm.h" | ||
31 | #include "i915_drv.h" | 30 | #include "i915_drv.h" |
32 | #include "i915_drm.h" | 31 | #include <drm/i915_drm.h> |
33 | #include "i915_trace.h" | 32 | #include "i915_trace.h" |
34 | 33 | ||
35 | static bool | 34 | static bool |
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index ff2819ea0813..8dd9a6f47db8 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
@@ -26,9 +26,8 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm.h" | 30 | #include <drm/i915_drm.h> |
31 | #include "i915_drm.h" | ||
32 | #include "i915_drv.h" | 31 | #include "i915_drv.h" |
33 | #include "i915_trace.h" | 32 | #include "i915_trace.h" |
34 | #include "intel_drv.h" | 33 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 60815b861ec2..69261acb94b3 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c | |||
@@ -22,9 +22,8 @@ | |||
22 | * | 22 | * |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | 26 | #include <drm/i915_drm.h> |
27 | #include "i915_drm.h" | ||
28 | #include "i915_drv.h" | 27 | #include "i915_drv.h" |
29 | #include "i915_trace.h" | 28 | #include "i915_trace.h" |
30 | #include "intel_drv.h" | 29 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c index ada2e90a2a60..8e91083b126f 100644 --- a/drivers/gpu/drm/i915/i915_gem_stolen.c +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c | |||
@@ -26,9 +26,8 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm.h" | 30 | #include <drm/i915_drm.h> |
31 | #include "i915_drm.h" | ||
32 | #include "i915_drv.h" | 31 | #include "i915_drv.h" |
33 | 32 | ||
34 | /* | 33 | /* |
diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c index b964df51cec7..c2b7b67e410d 100644 --- a/drivers/gpu/drm/i915/i915_gem_tiling.c +++ b/drivers/gpu/drm/i915/i915_gem_tiling.c | |||
@@ -25,11 +25,10 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "linux/string.h" | 28 | #include <linux/string.h> |
29 | #include "linux/bitops.h" | 29 | #include <linux/bitops.h> |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | 31 | #include <drm/i915_drm.h> |
32 | #include "i915_drm.h" | ||
33 | #include "i915_drv.h" | 32 | #include "i915_drv.h" |
34 | 33 | ||
35 | /** @file i915_gem_tiling.c | 34 | /** @file i915_gem_tiling.c |
diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c index 0e72abb9f701..3c59584161c2 100644 --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c | |||
@@ -31,9 +31,8 @@ | |||
31 | */ | 31 | */ |
32 | #include <linux/compat.h> | 32 | #include <linux/compat.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/i915_drm.h> |
36 | #include "i915_drm.h" | ||
37 | #include "i915_drv.h" | 36 | #include "i915_drv.h" |
38 | 37 | ||
39 | typedef struct _drm_i915_batchbuffer32 { | 38 | typedef struct _drm_i915_batchbuffer32 { |
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 5249640cce13..505357886bbb 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -30,9 +30,8 @@ | |||
30 | 30 | ||
31 | #include <linux/sysrq.h> | 31 | #include <linux/sysrq.h> |
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | 34 | #include <drm/i915_drm.h> |
35 | #include "i915_drm.h" | ||
36 | #include "i915_drv.h" | 35 | #include "i915_drv.h" |
37 | #include "i915_trace.h" | 36 | #include "i915_trace.h" |
38 | #include "intel_drv.h" | 37 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 4776ccf1b3cd..5854bddb1e9f 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
@@ -24,9 +24,8 @@ | |||
24 | * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 24 | * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | 28 | #include <drm/i915_drm.h> |
29 | #include "i915_drm.h" | ||
30 | #include "intel_drv.h" | 29 | #include "intel_drv.h" |
31 | #include "i915_reg.h" | 30 | #include "i915_reg.h" |
32 | 31 | ||
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index f413899475e9..bcbbaea2a78e 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c | |||
@@ -8,7 +8,7 @@ | |||
8 | #include <linux/vga_switcheroo.h> | 8 | #include <linux/vga_switcheroo.h> |
9 | #include <acpi/acpi_drivers.h> | 9 | #include <acpi/acpi_drivers.h> |
10 | 10 | ||
11 | #include "drmP.h" | 11 | #include <drm/drmP.h> |
12 | #include "i915_drv.h" | 12 | #include "i915_drv.h" |
13 | 13 | ||
14 | #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ | 14 | #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */ |
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 8c6074154bf6..0ed6baff4b0c 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
@@ -26,9 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | #include <linux/dmi.h> | 27 | #include <linux/dmi.h> |
28 | #include <drm/drm_dp_helper.h> | 28 | #include <drm/drm_dp_helper.h> |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm.h" | 30 | #include <drm/i915_drm.h> |
31 | #include "i915_drm.h" | ||
32 | #include "i915_drv.h" | 31 | #include "i915_drv.h" |
33 | #include "intel_bios.h" | 32 | #include "intel_bios.h" |
34 | 33 | ||
diff --git a/drivers/gpu/drm/i915/intel_bios.h b/drivers/gpu/drm/i915/intel_bios.h index 31c2107e7825..36e57f934373 100644 --- a/drivers/gpu/drm/i915/intel_bios.h +++ b/drivers/gpu/drm/i915/intel_bios.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #ifndef _I830_BIOS_H_ | 28 | #ifndef _I830_BIOS_H_ |
29 | #define _I830_BIOS_H_ | 29 | #define _I830_BIOS_H_ |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | 32 | ||
33 | struct vbt_header { | 33 | struct vbt_header { |
34 | u8 signature[20]; /**< Always starts with 'VBT$' */ | 34 | u8 signature[20]; /**< Always starts with 'VBT$' */ |
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index 23bdc8cd1458..c8f1c0db446d 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
@@ -27,13 +27,12 @@ | |||
27 | #include <linux/dmi.h> | 27 | #include <linux/dmi.h> |
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | 31 | #include <drm/drm_crtc.h> |
32 | #include "drm_crtc.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/drm_edid.h> |
34 | #include "drm_edid.h" | ||
35 | #include "intel_drv.h" | 34 | #include "intel_drv.h" |
36 | #include "i915_drm.h" | 35 | #include <drm/i915_drm.h> |
37 | #include "i915_drv.h" | 36 | #include "i915_drv.h" |
38 | 37 | ||
39 | /* Here's the desired hotplug mode */ | 38 | /* Here's the desired hotplug mode */ |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c040aee1341c..7ea9a3ceb269 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -32,13 +32,13 @@ | |||
32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
33 | #include <linux/vgaarb.h> | 33 | #include <linux/vgaarb.h> |
34 | #include <drm/drm_edid.h> | 34 | #include <drm/drm_edid.h> |
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "intel_drv.h" | 36 | #include "intel_drv.h" |
37 | #include "i915_drm.h" | 37 | #include <drm/i915_drm.h> |
38 | #include "i915_drv.h" | 38 | #include "i915_drv.h" |
39 | #include "i915_trace.h" | 39 | #include "i915_trace.h" |
40 | #include "drm_dp_helper.h" | 40 | #include <drm/drm_dp_helper.h> |
41 | #include "drm_crtc_helper.h" | 41 | #include <drm/drm_crtc_helper.h> |
42 | #include <linux/dma_remapping.h> | 42 | #include <linux/dma_remapping.h> |
43 | 43 | ||
44 | #define HAS_eDP (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) | 44 | #define HAS_eDP (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ace757af9133..f1bd4f4cd667 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -28,15 +28,14 @@ | |||
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/export.h> | 30 | #include <linux/export.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | 32 | #include <drm/drm_crtc.h> |
33 | #include "drm_crtc.h" | 33 | #include <drm/drm_crtc_helper.h> |
34 | #include "drm_crtc_helper.h" | 34 | #include <drm/drm_edid.h> |
35 | #include "drm_edid.h" | ||
36 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
37 | #include "i915_drm.h" | 36 | #include <drm/i915_drm.h> |
38 | #include "i915_drv.h" | 37 | #include "i915_drv.h" |
39 | #include "drm_dp_helper.h" | 38 | #include <drm/drm_dp_helper.h> |
40 | 39 | ||
41 | #define DP_RECEIVER_CAP_SIZE 0xf | 40 | #define DP_RECEIVER_CAP_SIZE 0xf |
42 | #define DP_LINK_STATUS_SIZE 6 | 41 | #define DP_LINK_STATUS_SIZE 6 |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index cd54cf88a28f..7db849052a98 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -26,11 +26,11 @@ | |||
26 | #define __INTEL_DRV_H__ | 26 | #define __INTEL_DRV_H__ |
27 | 27 | ||
28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
29 | #include "i915_drm.h" | 29 | #include <drm/i915_drm.h> |
30 | #include "i915_drv.h" | 30 | #include "i915_drv.h" |
31 | #include "drm_crtc.h" | 31 | #include <drm/drm_crtc.h> |
32 | #include "drm_crtc_helper.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | #include "drm_fb_helper.h" | 33 | #include <drm/drm_fb_helper.h> |
34 | 34 | ||
35 | #define _wait_for(COND, MS, W) ({ \ | 35 | #define _wait_for(COND, MS, W) ({ \ |
36 | unsigned long timeout__ = jiffies + msecs_to_jiffies(MS); \ | 36 | unsigned long timeout__ = jiffies + msecs_to_jiffies(MS); \ |
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index 36c542e5036b..ac9f2dd5648a 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c | |||
@@ -26,11 +26,10 @@ | |||
26 | */ | 26 | */ |
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm.h" | 30 | #include <drm/drm_crtc.h> |
31 | #include "drm_crtc.h" | ||
32 | #include "intel_drv.h" | 31 | #include "intel_drv.h" |
33 | #include "i915_drm.h" | 32 | #include <drm/i915_drm.h> |
34 | #include "i915_drv.h" | 33 | #include "i915_drv.h" |
35 | #include "dvo.h" | 34 | #include "dvo.h" |
36 | 35 | ||
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 97f673523b97..7b30b5c2c4ee 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -36,12 +36,11 @@ | |||
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <linux/vga_switcheroo.h> | 37 | #include <linux/vga_switcheroo.h> |
38 | 38 | ||
39 | #include "drmP.h" | 39 | #include <drm/drmP.h> |
40 | #include "drm.h" | 40 | #include <drm/drm_crtc.h> |
41 | #include "drm_crtc.h" | 41 | #include <drm/drm_fb_helper.h> |
42 | #include "drm_fb_helper.h" | ||
43 | #include "intel_drv.h" | 42 | #include "intel_drv.h" |
44 | #include "i915_drm.h" | 43 | #include <drm/i915_drm.h> |
45 | #include "i915_drv.h" | 44 | #include "i915_drv.h" |
46 | 45 | ||
47 | static struct fb_ops intelfb_ops = { | 46 | static struct fb_ops intelfb_ops = { |
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 12dc3308ab8c..025be7dd2a27 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
@@ -29,12 +29,11 @@ | |||
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/drm_crtc.h> |
34 | #include "drm_crtc.h" | 34 | #include <drm/drm_edid.h> |
35 | #include "drm_edid.h" | ||
36 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
37 | #include "i915_drm.h" | 36 | #include <drm/i915_drm.h> |
38 | #include "i915_drv.h" | 37 | #include "i915_drv.h" |
39 | 38 | ||
40 | static void | 39 | static void |
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index b9755f6378d8..c2c6dbc0971c 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c | |||
@@ -29,10 +29,9 @@ | |||
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/i2c-algo-bit.h> | 30 | #include <linux/i2c-algo-bit.h> |
31 | #include <linux/export.h> | 31 | #include <linux/export.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | ||
34 | #include "intel_drv.h" | 33 | #include "intel_drv.h" |
35 | #include "i915_drm.h" | 34 | #include <drm/i915_drm.h> |
36 | #include "i915_drv.h" | 35 | #include "i915_drv.h" |
37 | 36 | ||
38 | struct gmbus_port { | 37 | struct gmbus_port { |
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index e9a6f6aaed85..8552be9f5db1 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
@@ -31,12 +31,11 @@ | |||
31 | #include <linux/dmi.h> | 31 | #include <linux/dmi.h> |
32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/drm_crtc.h> |
36 | #include "drm_crtc.h" | 36 | #include <drm/drm_edid.h> |
37 | #include "drm_edid.h" | ||
38 | #include "intel_drv.h" | 37 | #include "intel_drv.h" |
39 | #include "i915_drm.h" | 38 | #include <drm/i915_drm.h> |
40 | #include "i915_drv.h" | 39 | #include "i915_drv.h" |
41 | #include <linux/acpi.h> | 40 | #include <linux/acpi.h> |
42 | 41 | ||
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index 29b72593fbb2..cc71fd9aaed5 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c | |||
@@ -27,8 +27,8 @@ | |||
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/fb.h> | 28 | #include <linux/fb.h> |
29 | #include <drm/drm_edid.h> | 29 | #include <drm/drm_edid.h> |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm_edid.h" | 31 | #include <drm/drm_edid.h> |
32 | #include "intel_drv.h" | 32 | #include "intel_drv.h" |
33 | #include "i915_drv.h" | 33 | #include "i915_drv.h" |
34 | 34 | ||
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 18bd0af855dc..5cc624eb6133 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/acpi_io.h> | 31 | #include <linux/acpi_io.h> |
32 | #include <acpi/video.h> | 32 | #include <acpi/video.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "i915_drm.h" | 35 | #include <drm/i915_drm.h> |
36 | #include "i915_drv.h" | 36 | #include "i915_drv.h" |
37 | #include "intel_drv.h" | 37 | #include "intel_drv.h" |
38 | 38 | ||
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 830d0dd610e1..10510221d763 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
@@ -25,9 +25,8 @@ | |||
25 | * | 25 | * |
26 | * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c | 26 | * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/i915_drm.h> |
30 | #include "i915_drm.h" | ||
31 | #include "i915_drv.h" | 30 | #include "i915_drv.h" |
32 | #include "i915_reg.h" | 31 | #include "i915_reg.h" |
33 | #include "intel_drv.h" | 32 | #include "intel_drv.h" |
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index e2a73b38abe9..1aef516cc6fa 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -27,10 +27,9 @@ | |||
27 | * | 27 | * |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | ||
32 | #include "i915_drv.h" | 31 | #include "i915_drv.h" |
33 | #include "i915_drm.h" | 32 | #include <drm/i915_drm.h> |
34 | #include "i915_trace.h" | 33 | #include "i915_trace.h" |
35 | #include "intel_drv.h" | 34 | #include "intel_drv.h" |
36 | 35 | ||
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 123afd357611..d251d9d7a06c 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -29,12 +29,11 @@ | |||
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
31 | #include <linux/export.h> | 31 | #include <linux/export.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/drm_crtc.h> |
34 | #include "drm_crtc.h" | 34 | #include <drm/drm_edid.h> |
35 | #include "drm_edid.h" | ||
36 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
37 | #include "i915_drm.h" | 36 | #include <drm/i915_drm.h> |
38 | #include "i915_drv.h" | 37 | #include "i915_drv.h" |
39 | #include "intel_sdvo_regs.h" | 38 | #include "intel_sdvo_regs.h" |
40 | 39 | ||
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 7644f31a3778..82f5e5c7009d 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
@@ -29,11 +29,11 @@ | |||
29 | * registers; newer ones are much simpler and we can use the new DRM plane | 29 | * registers; newer ones are much simpler and we can use the new DRM plane |
30 | * support. | 30 | * support. |
31 | */ | 31 | */ |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm_crtc.h" | 33 | #include <drm/drm_crtc.h> |
34 | #include "drm_fourcc.h" | 34 | #include <drm/drm_fourcc.h> |
35 | #include "intel_drv.h" | 35 | #include "intel_drv.h" |
36 | #include "i915_drm.h" | 36 | #include <drm/i915_drm.h> |
37 | #include "i915_drv.h" | 37 | #include "i915_drv.h" |
38 | 38 | ||
39 | static void | 39 | static void |
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index befce6c49704..ccfb2ff4c31d 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c | |||
@@ -30,12 +30,11 @@ | |||
30 | * Integrated TV-out support for the 915GM and 945GM. | 30 | * Integrated TV-out support for the 915GM and 945GM. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | 34 | #include <drm/drm_crtc.h> |
35 | #include "drm_crtc.h" | 35 | #include <drm/drm_edid.h> |
36 | #include "drm_edid.h" | ||
37 | #include "intel_drv.h" | 36 | #include "intel_drv.h" |
38 | #include "i915_drm.h" | 37 | #include <drm/i915_drm.h> |
39 | #include "i915_drv.h" | 38 | #include "i915_drv.h" |
40 | 39 | ||
41 | enum tv_margin { | 40 | enum tv_margin { |
diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c index 507aa3df0168..cc3166dd445a 100644 --- a/drivers/gpu/drm/mga/mga_dma.c +++ b/drivers/gpu/drm/mga/mga_dma.c | |||
@@ -35,10 +35,8 @@ | |||
35 | * \author Gareth Hughes <gareth@valinux.com> | 35 | * \author Gareth Hughes <gareth@valinux.com> |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
39 | #include "drm.h" | 39 | #include <drm/mga_drm.h> |
40 | #include "drm_sarea.h" | ||
41 | #include "mga_drm.h" | ||
42 | #include "mga_drv.h" | 40 | #include "mga_drv.h" |
43 | 41 | ||
44 | #define MGA_DEFAULT_USEC_TIMEOUT 10000 | 42 | #define MGA_DEFAULT_USEC_TIMEOUT 10000 |
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c index b1bb46de3f5a..17d0a637e4fb 100644 --- a/drivers/gpu/drm/mga/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c | |||
@@ -31,12 +31,11 @@ | |||
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/mga_drm.h> |
36 | #include "mga_drm.h" | ||
37 | #include "mga_drv.h" | 36 | #include "mga_drv.h" |
38 | 37 | ||
39 | #include "drm_pciids.h" | 38 | #include <drm/drm_pciids.h> |
40 | 39 | ||
41 | static int mga_driver_device_is_agp(struct drm_device *dev); | 40 | static int mga_driver_device_is_agp(struct drm_device *dev); |
42 | 41 | ||
diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c index c1f877b7bac1..709e90db8c40 100644 --- a/drivers/gpu/drm/mga/mga_ioc32.c +++ b/drivers/gpu/drm/mga/mga_ioc32.c | |||
@@ -32,9 +32,8 @@ | |||
32 | */ | 32 | */ |
33 | #include <linux/compat.h> | 33 | #include <linux/compat.h> |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm.h" | 36 | #include <drm/mga_drm.h> |
37 | #include "mga_drm.h" | ||
38 | 37 | ||
39 | typedef struct drm32_mga_init { | 38 | typedef struct drm32_mga_init { |
40 | int func; | 39 | int func; |
diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c index 2581202297e4..598c281def0a 100644 --- a/drivers/gpu/drm/mga/mga_irq.c +++ b/drivers/gpu/drm/mga/mga_irq.c | |||
@@ -31,9 +31,8 @@ | |||
31 | * Eric Anholt <anholt@FreeBSD.org> | 31 | * Eric Anholt <anholt@FreeBSD.org> |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/mga_drm.h> |
36 | #include "mga_drm.h" | ||
37 | #include "mga_drv.h" | 36 | #include "mga_drv.h" |
38 | 37 | ||
39 | u32 mga_get_vblank_counter(struct drm_device *dev, int crtc) | 38 | u32 mga_get_vblank_counter(struct drm_device *dev, int crtc) |
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c index 9ce2827f8c00..9c145143ad0f 100644 --- a/drivers/gpu/drm/mga/mga_state.c +++ b/drivers/gpu/drm/mga/mga_state.c | |||
@@ -32,9 +32,8 @@ | |||
32 | * Gareth Hughes <gareth@valinux.com> | 32 | * Gareth Hughes <gareth@valinux.com> |
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm.h" | 36 | #include <drm/mga_drm.h> |
37 | #include "mga_drm.h" | ||
38 | #include "mga_drv.h" | 37 | #include "mga_drv.h" |
39 | 38 | ||
40 | /* ================================================================ | 39 | /* ================================================================ |
diff --git a/drivers/gpu/drm/mga/mga_warp.c b/drivers/gpu/drm/mga/mga_warp.c index 722a91b69b0c..0b76352260a9 100644 --- a/drivers/gpu/drm/mga/mga_warp.c +++ b/drivers/gpu/drm/mga/mga_warp.c | |||
@@ -32,9 +32,8 @@ | |||
32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "drm.h" | 36 | #include <drm/mga_drm.h> |
37 | #include "mga_drm.h" | ||
38 | #include "mga_drv.h" | 37 | #include "mga_drv.h" |
39 | 38 | ||
40 | #define FIRMWARE_G200 "matrox/g200_warp.fw" | 39 | #define FIRMWARE_G200 "matrox/g200_warp.fw" |
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index e5f145d2cb3b..1e910117b0a2 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c | |||
@@ -10,12 +10,11 @@ | |||
10 | */ | 10 | */ |
11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
12 | #include <linux/console.h> | 12 | #include <linux/console.h> |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm.h" | ||
15 | 14 | ||
16 | #include "mgag200_drv.h" | 15 | #include "mgag200_drv.h" |
17 | 16 | ||
18 | #include "drm_pciids.h" | 17 | #include <drm/drm_pciids.h> |
19 | 18 | ||
20 | /* | 19 | /* |
21 | * This is the generic driver code. This binds the driver to the drm core, | 20 | * This is the generic driver code. This binds the driver to the drm core, |
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index 6f13b3563234..73868d0c25ae 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h | |||
@@ -15,12 +15,12 @@ | |||
15 | 15 | ||
16 | #include <video/vga.h> | 16 | #include <video/vga.h> |
17 | 17 | ||
18 | #include "drm/drm_fb_helper.h" | 18 | #include <drm/drm_fb_helper.h> |
19 | #include "ttm/ttm_bo_api.h" | 19 | #include <drm/ttm/ttm_bo_api.h> |
20 | #include "ttm/ttm_bo_driver.h" | 20 | #include <drm/ttm/ttm_bo_driver.h> |
21 | #include "ttm/ttm_placement.h" | 21 | #include <drm/ttm/ttm_placement.h> |
22 | #include "ttm/ttm_memory.h" | 22 | #include <drm/ttm/ttm_memory.h> |
23 | #include "ttm/ttm_module.h" | 23 | #include <drm/ttm/ttm_module.h> |
24 | 24 | ||
25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
26 | #include <linux/i2c-algo-bit.h> | 26 | #include <linux/i2c-algo-bit.h> |
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 880d3369760e..2f486481d79a 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c | |||
@@ -11,9 +11,8 @@ | |||
11 | * Dave Airlie | 11 | * Dave Airlie |
12 | */ | 12 | */ |
13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | #include "drm.h" | 15 | #include <drm/drm_fb_helper.h> |
16 | #include "drm_fb_helper.h" | ||
17 | 16 | ||
18 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
19 | 18 | ||
diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c index dd3568a1b6b0..5a88ec51b513 100644 --- a/drivers/gpu/drm/mgag200/mgag200_i2c.c +++ b/drivers/gpu/drm/mgag200/mgag200_i2c.c | |||
@@ -28,8 +28,7 @@ | |||
28 | #include <linux/export.h> | 28 | #include <linux/export.h> |
29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
30 | #include <linux/i2c-algo-bit.h> | 30 | #include <linux/i2c-algo-bit.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | ||
33 | 32 | ||
34 | #include "mgag200_drv.h" | 33 | #include "mgag200_drv.h" |
35 | 34 | ||
diff --git a/drivers/gpu/drm/mgag200/mgag200_main.c b/drivers/gpu/drm/mgag200/mgag200_main.c index 636a81cd2f37..d6a1aae33701 100644 --- a/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/drivers/gpu/drm/mgag200/mgag200_main.c | |||
@@ -10,9 +10,8 @@ | |||
10 | * Matt Turner | 10 | * Matt Turner |
11 | * Dave Airlie | 11 | * Dave Airlie |
12 | */ | 12 | */ |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm.h" | 14 | #include <drm/drm_crtc_helper.h> |
15 | #include "drm_crtc_helper.h" | ||
16 | #include "mgag200_drv.h" | 15 | #include "mgag200_drv.h" |
17 | 16 | ||
18 | static void mga_user_framebuffer_destroy(struct drm_framebuffer *fb) | 17 | static void mga_user_framebuffer_destroy(struct drm_framebuffer *fb) |
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index b69642d5d850..3d429de0771a 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c | |||
@@ -13,9 +13,8 @@ | |||
13 | 13 | ||
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | 15 | ||
16 | #include "drmP.h" | 16 | #include <drm/drmP.h> |
17 | #include "drm.h" | 17 | #include <drm/drm_crtc_helper.h> |
18 | #include "drm_crtc_helper.h" | ||
19 | 18 | ||
20 | #include "mgag200_drv.h" | 19 | #include "mgag200_drv.h" |
21 | 20 | ||
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c index b223dcb7a710..1504699666c4 100644 --- a/drivers/gpu/drm/mgag200/mgag200_ttm.c +++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c | |||
@@ -25,7 +25,7 @@ | |||
25 | /* | 25 | /* |
26 | * Authors: Dave Airlie <airlied@redhat.com> | 26 | * Authors: Dave Airlie <airlied@redhat.com> |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "mgag200_drv.h" | 29 | #include "mgag200_drv.h" |
30 | #include <ttm/ttm_page_alloc.h> | 30 | #include <ttm/ttm_page_alloc.h> |
31 | 31 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c index 3ca240b4413d..111d9eba7065 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "drmP.h" | 24 | #include <drm/drmP.h> |
25 | 25 | ||
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 26ebffebe710..dea42bc515ec 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c | |||
@@ -7,12 +7,10 @@ | |||
7 | #include <acpi/acpi.h> | 7 | #include <acpi/acpi.h> |
8 | #include <linux/mxm-wmi.h> | 8 | #include <linux/mxm-wmi.h> |
9 | 9 | ||
10 | #include "drmP.h" | 10 | #include <drm/drmP.h> |
11 | #include "drm.h" | 11 | #include <drm/drm_crtc_helper.h> |
12 | #include "drm_sarea.h" | ||
13 | #include "drm_crtc_helper.h" | ||
14 | #include "nouveau_drv.h" | 12 | #include "nouveau_drv.h" |
15 | #include "nouveau_drm.h" | 13 | #include <drm/nouveau_drm.h> |
16 | #include "nv50_display.h" | 14 | #include "nv50_display.h" |
17 | #include "nouveau_connector.h" | 15 | #include "nouveau_connector.h" |
18 | 16 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index fa22b28e8777..2036748e56b4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c | |||
@@ -33,9 +33,9 @@ | |||
33 | #include <linux/backlight.h> | 33 | #include <linux/backlight.h> |
34 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | #include "nouveau_drv.h" | 37 | #include "nouveau_drv.h" |
38 | #include "nouveau_drm.h" | 38 | #include <drm/nouveau_drm.h> |
39 | #include "nouveau_reg.h" | 39 | #include "nouveau_reg.h" |
40 | #include "nouveau_encoder.h" | 40 | #include "nouveau_encoder.h" |
41 | 41 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index a0a3fe3c016b..a84290562ca7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * SOFTWARE. | 22 | * SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #define NV_DEBUG_NOTRACE | 26 | #define NV_DEBUG_NOTRACE |
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_hw.h" | 28 | #include "nouveau_hw.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 7f80ed523562..4ee2e7ff92d2 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
@@ -27,10 +27,10 @@ | |||
27 | * Jeremy Kolb <jkolb@brandeis.edu> | 27 | * Jeremy Kolb <jkolb@brandeis.edu> |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "ttm/ttm_page_alloc.h" | 31 | #include <drm/ttm/ttm_page_alloc.h> |
32 | 32 | ||
33 | #include "nouveau_drm.h" | 33 | #include <drm/nouveau_drm.h> |
34 | #include "nouveau_drv.h" | 34 | #include "nouveau_drv.h" |
35 | #include "nouveau_dma.h" | 35 | #include "nouveau_dma.h" |
36 | #include "nouveau_mm.h" | 36 | #include "nouveau_mm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_calc.c b/drivers/gpu/drm/nouveau/nouveau_calc.c index dad96cce5e39..2c5eb5d8d556 100644 --- a/drivers/gpu/drm/nouveau/nouveau_calc.c +++ b/drivers/gpu/drm/nouveau/nouveau_calc.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * SOFTWARE. | 21 | * SOFTWARE. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "drmP.h" | 24 | #include <drm/drmP.h> |
25 | #include "nouveau_drv.h" | 25 | #include "nouveau_drv.h" |
26 | #include "nouveau_hw.h" | 26 | #include "nouveau_hw.h" |
27 | 27 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index debd90225a88..cd180c678c13 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/drivers/gpu/drm/nouveau/nouveau_channel.c | |||
@@ -22,10 +22,9 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | ||
27 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
28 | #include "nouveau_drm.h" | 27 | #include <drm/nouveau_drm.h> |
29 | #include "nouveau_dma.h" | 28 | #include "nouveau_dma.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 7b11edb077d0..abb92de98573 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
@@ -26,9 +26,9 @@ | |||
26 | 26 | ||
27 | #include <acpi/button.h> | 27 | #include <acpi/button.h> |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "drm_edid.h" | 30 | #include <drm/drm_edid.h> |
31 | #include "drm_crtc_helper.h" | 31 | #include <drm/drm_crtc_helper.h> |
32 | 32 | ||
33 | #include "nouveau_reg.h" | 33 | #include "nouveau_reg.h" |
34 | #include "nouveau_drv.h" | 34 | #include "nouveau_drv.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h index e4857021304c..e1c1567c0c1a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.h +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifndef __NOUVEAU_CONNECTOR_H__ | 27 | #ifndef __NOUVEAU_CONNECTOR_H__ |
28 | #define __NOUVEAU_CONNECTOR_H__ | 28 | #define __NOUVEAU_CONNECTOR_H__ |
29 | 29 | ||
30 | #include "drm_edid.h" | 30 | #include <drm/drm_edid.h> |
31 | #include "nouveau_i2c.h" | 31 | #include "nouveau_i2c.h" |
32 | 32 | ||
33 | enum nouveau_underscan_type { | 33 | enum nouveau_underscan_type { |
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 188c92b327e2..f68cb5e71893 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c | |||
@@ -30,7 +30,7 @@ | |||
30 | 30 | ||
31 | #include <linux/debugfs.h> | 31 | #include <linux/debugfs.h> |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "nouveau_drv.h" | 34 | #include "nouveau_drv.h" |
35 | 35 | ||
36 | #include <ttm/ttm_page_alloc.h> | 36 | #include <ttm/ttm_page_alloc.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 7e16dc5e6467..e4eeeaf20fdf 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
30 | #include "nouveau_fb.h" | 30 | #include "nouveau_fb.h" |
31 | #include "nouveau_fbcon.h" | 31 | #include "nouveau_fbcon.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index 295932e66ac5..47d041269f65 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_dma.h" | 29 | #include "nouveau_dma.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c index 7e289d2ad8e4..898e5e32293c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/drivers/gpu/drm/nouveau/nouveau_dp.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_i2c.h" | 28 | #include "nouveau_i2c.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 9a36f5f39b06..8b5e558d7c73 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
@@ -25,9 +25,8 @@ | |||
25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/drm_crtc_helper.h> |
30 | #include "drm_crtc_helper.h" | ||
31 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
32 | #include "nouveau_abi16.h" | 31 | #include "nouveau_abi16.h" |
33 | #include "nouveau_hw.h" | 32 | #include "nouveau_hw.h" |
@@ -37,7 +36,7 @@ | |||
37 | #include "nouveau_fifo.h" | 36 | #include "nouveau_fifo.h" |
38 | #include "nv50_display.h" | 37 | #include "nv50_display.h" |
39 | 38 | ||
40 | #include "drm_pciids.h" | 39 | #include <drm/drm_pciids.h> |
41 | 40 | ||
42 | MODULE_PARM_DESC(agpmode, "AGP mode (0 to disable AGP)"); | 41 | MODULE_PARM_DESC(agpmode, "AGP mode (0 to disable AGP)"); |
43 | int nouveau_agpmode = -1; | 42 | int nouveau_agpmode = -1; |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 4f2cc95ce264..543c79bd958c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -39,11 +39,11 @@ | |||
39 | #define NOUVEAU_FAMILY 0x0000FFFF | 39 | #define NOUVEAU_FAMILY 0x0000FFFF |
40 | #define NOUVEAU_FLAGS 0xFFFF0000 | 40 | #define NOUVEAU_FLAGS 0xFFFF0000 |
41 | 41 | ||
42 | #include "ttm/ttm_bo_api.h" | 42 | #include <drm/ttm/ttm_bo_api.h> |
43 | #include "ttm/ttm_bo_driver.h" | 43 | #include <drm/ttm/ttm_bo_driver.h> |
44 | #include "ttm/ttm_placement.h" | 44 | #include <drm/ttm/ttm_placement.h> |
45 | #include "ttm/ttm_memory.h" | 45 | #include <drm/ttm/ttm_memory.h> |
46 | #include "ttm/ttm_module.h" | 46 | #include <drm/ttm/ttm_module.h> |
47 | 47 | ||
48 | struct nouveau_fpriv { | 48 | struct nouveau_fpriv { |
49 | spinlock_t lock; | 49 | spinlock_t lock; |
@@ -59,7 +59,7 @@ nouveau_fpriv(struct drm_file *file_priv) | |||
59 | 59 | ||
60 | #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT) | 60 | #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT) |
61 | 61 | ||
62 | #include "nouveau_drm.h" | 62 | #include <drm/nouveau_drm.h> |
63 | #include "nouveau_reg.h" | 63 | #include "nouveau_reg.h" |
64 | #include "nouveau_bios.h" | 64 | #include "nouveau_bios.h" |
65 | #include "nouveau_util.h" | 65 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_encoder.h b/drivers/gpu/drm/nouveau/nouveau_encoder.h index 3dc14a3dcc4c..db07b978946e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_encoder.h +++ b/drivers/gpu/drm/nouveau/nouveau_encoder.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifndef __NOUVEAU_ENCODER_H__ | 27 | #ifndef __NOUVEAU_ENCODER_H__ |
28 | #define __NOUVEAU_ENCODER_H__ | 28 | #define __NOUVEAU_ENCODER_H__ |
29 | 29 | ||
30 | #include "drm_encoder_slave.h" | 30 | #include <drm/drm_encoder_slave.h> |
31 | #include "nouveau_drv.h" | 31 | #include "nouveau_drv.h" |
32 | 32 | ||
33 | #define NV_DPMS_CLEARED 0x80 | 33 | #define NV_DPMS_CLEARED 0x80 |
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 1074bc5dd418..7e41a4006087 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | |||
@@ -38,13 +38,12 @@ | |||
38 | #include <linux/vga_switcheroo.h> | 38 | #include <linux/vga_switcheroo.h> |
39 | #include <linux/console.h> | 39 | #include <linux/console.h> |
40 | 40 | ||
41 | #include "drmP.h" | 41 | #include <drm/drmP.h> |
42 | #include "drm.h" | 42 | #include <drm/drm_crtc.h> |
43 | #include "drm_crtc.h" | 43 | #include <drm/drm_crtc_helper.h> |
44 | #include "drm_crtc_helper.h" | 44 | #include <drm/drm_fb_helper.h> |
45 | #include "drm_fb_helper.h" | ||
46 | #include "nouveau_drv.h" | 45 | #include "nouveau_drv.h" |
47 | #include "nouveau_drm.h" | 46 | #include <drm/nouveau_drm.h> |
48 | #include "nouveau_crtc.h" | 47 | #include "nouveau_crtc.h" |
49 | #include "nouveau_fb.h" | 48 | #include "nouveau_fb.h" |
50 | #include "nouveau_fbcon.h" | 49 | #include "nouveau_fbcon.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index b73c29f87fc3..1f2d27893438 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifndef __NOUVEAU_FBCON_H__ | 27 | #ifndef __NOUVEAU_FBCON_H__ |
28 | #define __NOUVEAU_FBCON_H__ | 28 | #define __NOUVEAU_FBCON_H__ |
29 | 29 | ||
30 | #include "drm_fb_helper.h" | 30 | #include <drm/drm_fb_helper.h> |
31 | 31 | ||
32 | #include "nouveau_fb.h" | 32 | #include "nouveau_fb.h" |
33 | struct nouveau_fbdev { | 33 | struct nouveau_fbdev { |
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 3c180493dab8..614df7b958ca 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | 28 | ||
30 | #include <linux/ktime.h> | 29 | #include <linux/ktime.h> |
31 | #include <linux/hrtimer.h> | 30 | #include <linux/hrtimer.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index af7cfb825716..8461a4f5710f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c | |||
@@ -24,11 +24,10 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | #include <linux/dma-buf.h> | 26 | #include <linux/dma-buf.h> |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | 28 | ||
30 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
31 | #include "nouveau_drm.h" | 30 | #include <drm/nouveau_drm.h> |
32 | #include "nouveau_dma.h" | 31 | #include "nouveau_dma.h" |
33 | #include "nouveau_fence.h" | 32 | #include "nouveau_fence.h" |
34 | 33 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpio.c b/drivers/gpu/drm/nouveau/nouveau_gpio.c index 0fe4e17c461d..ded74e555e5f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gpio.c +++ b/drivers/gpu/drm/nouveau/nouveau_gpio.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_i2c.h" | 27 | #include "nouveau_i2c.h" |
28 | #include "nouveau_gpio.h" | 28 | #include "nouveau_gpio.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c index bd79fedb7054..1af7a39e0350 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c +++ b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c | |||
@@ -30,10 +30,9 @@ | |||
30 | * Ben Skeggs <darktama@iinet.net.au> | 30 | * Ben Skeggs <darktama@iinet.net.au> |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | ||
35 | #include "nouveau_drv.h" | 34 | #include "nouveau_drv.h" |
36 | #include "nouveau_drm.h" | 35 | #include <drm/nouveau_drm.h> |
37 | #include "nouveau_fifo.h" | 36 | #include "nouveau_fifo.h" |
38 | #include "nouveau_ramht.h" | 37 | #include "nouveau_ramht.h" |
39 | #include "nouveau_software.h" | 38 | #include "nouveau_software.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_hdmi.c b/drivers/gpu/drm/nouveau/nouveau_hdmi.c index c3de36384522..1e942cfb9644 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hdmi.c +++ b/drivers/gpu/drm/nouveau/nouveau_hdmi.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_connector.h" | 27 | #include "nouveau_connector.h" |
28 | #include "nouveau_encoder.h" | 28 | #include "nouveau_encoder.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c index b87ad3bd7739..6eabc2ea0c7d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hw.c +++ b/drivers/gpu/drm/nouveau/nouveau_hw.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * SOFTWARE. | 22 | * SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_hw.h" | 27 | #include "nouveau_hw.h" |
28 | 28 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.h b/drivers/gpu/drm/nouveau/nouveau_hw.h index 2989090b9434..06a66bc84a81 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hw.h +++ b/drivers/gpu/drm/nouveau/nouveau_hw.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #ifndef __NOUVEAU_HW_H__ | 23 | #ifndef __NOUVEAU_HW_H__ |
24 | #define __NOUVEAU_HW_H__ | 24 | #define __NOUVEAU_HW_H__ |
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | 28 | ||
29 | #define MASK(field) ( \ | 29 | #define MASK(field) ( \ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.c b/drivers/gpu/drm/nouveau/nouveau_i2c.c index 240cf962c999..baf2fa25d077 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.c +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
29 | #include "nouveau_i2c.h" | 29 | #include "nouveau_i2c.h" |
30 | #include "nouveau_hw.h" | 30 | #include "nouveau_hw.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_i2c.h b/drivers/gpu/drm/nouveau/nouveau_i2c.h index 1d083893a4d7..326bf5e2035a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_i2c.h +++ b/drivers/gpu/drm/nouveau/nouveau_i2c.h | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
27 | #include <linux/i2c-algo-bit.h> | 27 | #include <linux/i2c-algo-bit.h> |
28 | #include "drm_dp_helper.h" | 28 | #include <drm/drm_dp_helper.h> |
29 | 29 | ||
30 | #define NV_I2C_PORT(n) (0x00 + (n)) | 30 | #define NV_I2C_PORT(n) (0x00 + (n)) |
31 | #define NV_I2C_PORT_NUM 0x10 | 31 | #define NV_I2C_PORT_NUM 0x10 |
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c index 475ba810bba3..aa3a067c707b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c | |||
@@ -33,8 +33,7 @@ | |||
33 | 33 | ||
34 | #include <linux/compat.h> | 34 | #include <linux/compat.h> |
35 | 35 | ||
36 | #include "drmP.h" | 36 | #include <drm/drmP.h> |
37 | #include "drm.h" | ||
38 | 37 | ||
39 | #include "nouveau_drv.h" | 38 | #include "nouveau_drv.h" |
40 | 39 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c index b2c2937531a8..6273b7763cd6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_irq.c +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c | |||
@@ -30,9 +30,8 @@ | |||
30 | * Ben Skeggs <darktama@iinet.net.au> | 30 | * Ben Skeggs <darktama@iinet.net.au> |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | 34 | #include <drm/nouveau_drm.h> |
35 | #include "nouveau_drm.h" | ||
36 | #include "nouveau_drv.h" | 35 | #include "nouveau_drv.h" |
37 | #include "nouveau_reg.h" | 36 | #include "nouveau_reg.h" |
38 | #include "nouveau_ramht.h" | 37 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c index 5b498ea32e14..7f0afad13653 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mem.c +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c | |||
@@ -31,9 +31,7 @@ | |||
31 | */ | 31 | */ |
32 | 32 | ||
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | ||
36 | #include "drm_sarea.h" | ||
37 | 35 | ||
38 | #include "nouveau_drv.h" | 36 | #include "nouveau_drv.h" |
39 | #include "nouveau_pm.h" | 37 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_mm.c b/drivers/gpu/drm/nouveau/nouveau_mm.c index b29ffb3d1408..3e98806dd76f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mm.c +++ b/drivers/gpu/drm/nouveau/nouveau_mm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_mm.h" | 27 | #include "nouveau_mm.h" |
28 | 28 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_mxm.c b/drivers/gpu/drm/nouveau/nouveau_mxm.c index 07d0d1e03690..d07f4a3310b9 100644 --- a/drivers/gpu/drm/nouveau/nouveau_mxm.c +++ b/drivers/gpu/drm/nouveau/nouveau_mxm.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/acpi.h> | 25 | #include <linux/acpi.h> |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
29 | 29 | ||
30 | #define MXM_DBG(dev, fmt, args...) NV_DEBUG((dev), "MXM: " fmt, ##args) | 30 | #define MXM_DBG(dev, fmt, args...) NV_DEBUG((dev), "MXM: " fmt, ##args) |
diff --git a/drivers/gpu/drm/nouveau/nouveau_notifier.c b/drivers/gpu/drm/nouveau/nouveau_notifier.c index 69c93b864519..1ad3e6c8c432 100644 --- a/drivers/gpu/drm/nouveau/nouveau_notifier.c +++ b/drivers/gpu/drm/nouveau/nouveau_notifier.c | |||
@@ -25,8 +25,7 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | ||
30 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
32 | 31 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index ea6acf1c4a78..4946d308a362 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index da3e7c3abab7..7cf95b20b7a4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index a25cf2cb931f..aef7181415a8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c | |||
@@ -22,11 +22,10 @@ | |||
22 | * Authors: Dave Airlie | 22 | * Authors: Dave Airlie |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | ||
27 | 26 | ||
28 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
29 | #include "nouveau_drm.h" | 28 | #include <drm/nouveau_drm.h> |
30 | #include "nouveau_dma.h" | 29 | #include "nouveau_dma.h" |
31 | 30 | ||
32 | #include <linux/dma-buf.h> | 31 | #include <linux/dma-buf.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_ramht.c b/drivers/gpu/drm/nouveau/nouveau_ramht.c index a24a81f5a89e..0ebb62f1fc80 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ramht.c +++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index 38483a042bc2..9d76a82d3c90 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
3 | #include <linux/pagemap.h> | 3 | #include <linux/pagemap.h> |
4 | #include <linux/slab.h> | 4 | #include <linux/slab.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index c61014442aa9..30fe9291d17e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c | |||
@@ -25,15 +25,13 @@ | |||
25 | 25 | ||
26 | #include <linux/swab.h> | 26 | #include <linux/swab.h> |
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/drm_crtc_helper.h> |
30 | #include "drm_sarea.h" | ||
31 | #include "drm_crtc_helper.h" | ||
32 | #include <linux/vgaarb.h> | 30 | #include <linux/vgaarb.h> |
33 | #include <linux/vga_switcheroo.h> | 31 | #include <linux/vga_switcheroo.h> |
34 | 32 | ||
35 | #include "nouveau_drv.h" | 33 | #include "nouveau_drv.h" |
36 | #include "nouveau_drm.h" | 34 | #include <drm/nouveau_drm.h> |
37 | #include "nouveau_fbcon.h" | 35 | #include "nouveau_fbcon.h" |
38 | #include "nouveau_ramht.h" | 36 | #include "nouveau_ramht.h" |
39 | #include "nouveau_gpio.h" | 37 | #include "nouveau_gpio.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_temp.c b/drivers/gpu/drm/nouveau/nouveau_temp.c index 0f5a30160556..1ad411dcc57a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_temp.c +++ b/drivers/gpu/drm/nouveau/nouveau_temp.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | 28 | ||
29 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
30 | #include "nouveau_pm.h" | 30 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index bd35f930568c..48de8dd69583 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * USE OR OTHER DEALINGS IN THE SOFTWARE. | 24 | * USE OR OTHER DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | 28 | ||
29 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
30 | 30 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.c b/drivers/gpu/drm/nouveau/nouveau_vm.c index 11edd5e91a0a..4c8d13965dd1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vm.c +++ b/drivers/gpu/drm/nouveau/nouveau_vm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_mm.h" | 27 | #include "nouveau_mm.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_vm.h b/drivers/gpu/drm/nouveau/nouveau_vm.h index a8246e7e4a89..3cdf6001d635 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vm.h +++ b/drivers/gpu/drm/nouveau/nouveau_vm.h | |||
@@ -25,7 +25,7 @@ | |||
25 | #ifndef __NOUVEAU_VM_H__ | 25 | #ifndef __NOUVEAU_VM_H__ |
26 | #define __NOUVEAU_VM_H__ | 26 | #define __NOUVEAU_VM_H__ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | 29 | ||
30 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
31 | #include "nouveau_mm.h" | 31 | #include "nouveau_mm.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_volt.c b/drivers/gpu/drm/nouveau/nouveau_volt.c index b010cb997b34..fbc3a1efd501 100644 --- a/drivers/gpu/drm/nouveau/nouveau_volt.c +++ b/drivers/gpu/drm/nouveau/nouveau_volt.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c index 43accc11102f..37d5b5bf7587 100644 --- a/drivers/gpu/drm/nouveau/nv04_crtc.c +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * DEALINGS IN THE SOFTWARE. | 23 | * DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm_crtc_helper.h" | 27 | #include <drm/drm_crtc_helper.h> |
28 | 28 | ||
29 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
30 | #include "nouveau_encoder.h" | 30 | #include "nouveau_encoder.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_cursor.c b/drivers/gpu/drm/nouveau/nv04_cursor.c index aaf3de3bc816..6463870ef19e 100644 --- a/drivers/gpu/drm/nouveau/nv04_cursor.c +++ b/drivers/gpu/drm/nouveau/nv04_cursor.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm_mode.h" | ||
3 | #include "nouveau_reg.h" | 2 | #include "nouveau_reg.h" |
4 | #include "nouveau_drv.h" | 3 | #include "nouveau_drv.h" |
5 | #include "nouveau_crtc.h" | 4 | #include "nouveau_crtc.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c index 38f19479417c..981e6d4f4c76 100644 --- a/drivers/gpu/drm/nouveau/nv04_dac.c +++ b/drivers/gpu/drm/nouveau/nv04_dac.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | 29 | ||
30 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
31 | #include "nouveau_encoder.h" | 31 | #include "nouveau_encoder.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_dfp.c b/drivers/gpu/drm/nouveau/nv04_dfp.c index c2675623b7cd..55ad2dd653fc 100644 --- a/drivers/gpu/drm/nouveau/nv04_dfp.c +++ b/drivers/gpu/drm/nouveau/nv04_dfp.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * DEALINGS IN THE SOFTWARE. | 24 | * DEALINGS IN THE SOFTWARE. |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | 29 | ||
30 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
31 | #include "nouveau_encoder.h" | 31 | #include "nouveau_encoder.h" |
@@ -34,7 +34,7 @@ | |||
34 | #include "nouveau_hw.h" | 34 | #include "nouveau_hw.h" |
35 | #include "nvreg.h" | 35 | #include "nvreg.h" |
36 | 36 | ||
37 | #include "i2c/sil164.h" | 37 | #include <drm/i2c/sil164.h> |
38 | 38 | ||
39 | #define FP_TG_CONTROL_ON (NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS | \ | 39 | #define FP_TG_CONTROL_ON (NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS | \ |
40 | NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS | \ | 40 | NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS | \ |
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c index 44488e3a257d..ea1e47a34ddf 100644 --- a/drivers/gpu/drm/nouveau/nv04_display.c +++ b/drivers/gpu/drm/nouveau/nv04_display.c | |||
@@ -22,9 +22,8 @@ | |||
22 | * Author: Ben Skeggs | 22 | * Author: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | 26 | #include <drm/drm_crtc_helper.h> |
27 | #include "drm_crtc_helper.h" | ||
28 | 27 | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fb.h" | 29 | #include "nouveau_fb.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_fb.c b/drivers/gpu/drm/nouveau/nv04_fb.c index d5eedd67afe5..375f5533c313 100644 --- a/drivers/gpu/drm/nouveau/nv04_fb.c +++ b/drivers/gpu/drm/nouveau/nv04_fb.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | int | 5 | int |
7 | nv04_fb_vram_init(struct drm_device *dev) | 6 | nv04_fb_vram_init(struct drm_device *dev) |
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c index 7cd7857347ef..fc53a3922bce 100644 --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_fence.c b/drivers/gpu/drm/nouveau/nv04_fence.c index abe89db6de24..aa6859270662 100644 --- a/drivers/gpu/drm/nouveau/nv04_fence.c +++ b/drivers/gpu/drm/nouveau/nv04_fence.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c index a6295cd00ec7..65f966deeee6 100644 --- a/drivers/gpu/drm/nouveau/nv04_fifo.c +++ b/drivers/gpu/drm/nouveau/nv04_fifo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_util.h" | 30 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c index 72f1a62903b3..68cce6023461 100644 --- a/drivers/gpu/drm/nouveau/nv04_graph.c +++ b/drivers/gpu/drm/nouveau/nv04_graph.c | |||
@@ -22,9 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | 26 | #include <drm/nouveau_drm.h> |
27 | #include "nouveau_drm.h" | ||
28 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
29 | #include "nouveau_hw.h" | 28 | #include "nouveau_hw.h" |
30 | #include "nouveau_util.h" | 29 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_instmem.c b/drivers/gpu/drm/nouveau/nv04_instmem.c index ef7a934a499a..a9e380040fea 100644 --- a/drivers/gpu/drm/nouveau/nv04_instmem.c +++ b/drivers/gpu/drm/nouveau/nv04_instmem.c | |||
@@ -1,5 +1,4 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | 2 | ||
4 | #include "nouveau_drv.h" | 3 | #include "nouveau_drv.h" |
5 | #include "nouveau_fifo.h" | 4 | #include "nouveau_fifo.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_mc.c b/drivers/gpu/drm/nouveau/nv04_mc.c index 2af43a1cb2ec..83751e7a3309 100644 --- a/drivers/gpu/drm/nouveau/nv04_mc.c +++ b/drivers/gpu/drm/nouveau/nv04_mc.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | int | 5 | int |
7 | nv04_mc_init(struct drm_device *dev) | 6 | nv04_mc_init(struct drm_device *dev) |
diff --git a/drivers/gpu/drm/nouveau/nv04_pm.c b/drivers/gpu/drm/nouveau/nv04_pm.c index 6e7589918fa9..435b5a832da3 100644 --- a/drivers/gpu/drm/nouveau/nv04_pm.c +++ b/drivers/gpu/drm/nouveau/nv04_pm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_hw.h" | 27 | #include "nouveau_hw.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_software.c b/drivers/gpu/drm/nouveau/nv04_software.c index 0c41abf48774..02509e715693 100644 --- a/drivers/gpu/drm/nouveau/nv04_software.c +++ b/drivers/gpu/drm/nouveau/nv04_software.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv04_timer.c b/drivers/gpu/drm/nouveau/nv04_timer.c index 55c945290e52..71ad319affcb 100644 --- a/drivers/gpu/drm/nouveau/nv04_timer.c +++ b/drivers/gpu/drm/nouveau/nv04_timer.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | #include "nouveau_hw.h" | 4 | #include "nouveau_hw.h" |
6 | 5 | ||
7 | int | 6 | int |
diff --git a/drivers/gpu/drm/nouveau/nv04_tv.c b/drivers/gpu/drm/nouveau/nv04_tv.c index 3eb605ddfd03..7157d403ed59 100644 --- a/drivers/gpu/drm/nouveau/nv04_tv.c +++ b/drivers/gpu/drm/nouveau/nv04_tv.c | |||
@@ -24,15 +24,15 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
29 | #include "nouveau_encoder.h" | 29 | #include "nouveau_encoder.h" |
30 | #include "nouveau_connector.h" | 30 | #include "nouveau_connector.h" |
31 | #include "nouveau_crtc.h" | 31 | #include "nouveau_crtc.h" |
32 | #include "nouveau_hw.h" | 32 | #include "nouveau_hw.h" |
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/drm_crtc_helper.h> |
34 | 34 | ||
35 | #include "i2c/ch7006.h" | 35 | #include <drm/i2c/ch7006.h> |
36 | 36 | ||
37 | static struct i2c_board_info nv04_tv_encoder_info[] = { | 37 | static struct i2c_board_info nv04_tv_encoder_info[] = { |
38 | { | 38 | { |
diff --git a/drivers/gpu/drm/nouveau/nv10_fb.c b/drivers/gpu/drm/nouveau/nv10_fb.c index 420b1608536d..510e90f34482 100644 --- a/drivers/gpu/drm/nouveau/nv10_fb.c +++ b/drivers/gpu/drm/nouveau/nv10_fb.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | void | 5 | void |
7 | nv10_fb_init_tile_region(struct drm_device *dev, int i, uint32_t addr, | 6 | nv10_fb_init_tile_region(struct drm_device *dev, int i, uint32_t addr, |
diff --git a/drivers/gpu/drm/nouveau/nv10_fence.c b/drivers/gpu/drm/nouveau/nv10_fence.c index 8a1b75009185..d30f752464ef 100644 --- a/drivers/gpu/drm/nouveau/nv10_fence.c +++ b/drivers/gpu/drm/nouveau/nv10_fence.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs <bskeggs@redhat.com> | 22 | * Authors: Ben Skeggs <bskeggs@redhat.com> |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv10_fifo.c b/drivers/gpu/drm/nouveau/nv10_fifo.c index f1fe7d758241..05a2499b7a4d 100644 --- a/drivers/gpu/drm/nouveau/nv10_fifo.c +++ b/drivers/gpu/drm/nouveau/nv10_fifo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_util.h" | 30 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c index 9d79180069df..ecc1b62dd751 100644 --- a/drivers/gpu/drm/nouveau/nv10_gpio.c +++ b/drivers/gpu/drm/nouveau/nv10_gpio.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
29 | #include "nouveau_hw.h" | 29 | #include "nouveau_hw.h" |
30 | #include "nouveau_gpio.h" | 30 | #include "nouveau_gpio.h" |
diff --git a/drivers/gpu/drm/nouveau/nv10_graph.c b/drivers/gpu/drm/nouveau/nv10_graph.c index fb1d88a951de..75dd51bbe64d 100644 --- a/drivers/gpu/drm/nouveau/nv10_graph.c +++ b/drivers/gpu/drm/nouveau/nv10_graph.c | |||
@@ -22,9 +22,8 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | 26 | #include <drm/nouveau_drm.h> |
27 | #include "nouveau_drm.h" | ||
28 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
29 | #include "nouveau_util.h" | 28 | #include "nouveau_util.h" |
30 | 29 | ||
diff --git a/drivers/gpu/drm/nouveau/nv17_fifo.c b/drivers/gpu/drm/nouveau/nv17_fifo.c index d9e482e4abee..4ae61aeea741 100644 --- a/drivers/gpu/drm/nouveau/nv17_fifo.c +++ b/drivers/gpu/drm/nouveau/nv17_fifo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_util.h" | 30 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c index 67be5db021f5..6331e79b0124 100644 --- a/drivers/gpu/drm/nouveau/nv17_tv.c +++ b/drivers/gpu/drm/nouveau/nv17_tv.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
30 | #include "nouveau_encoder.h" | 30 | #include "nouveau_encoder.h" |
31 | #include "nouveau_connector.h" | 31 | #include "nouveau_connector.h" |
diff --git a/drivers/gpu/drm/nouveau/nv17_tv_modes.c b/drivers/gpu/drm/nouveau/nv17_tv_modes.c index 4d1d29f60307..96e428641672 100644 --- a/drivers/gpu/drm/nouveau/nv17_tv_modes.c +++ b/drivers/gpu/drm/nouveau/nv17_tv_modes.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
30 | #include "nouveau_encoder.h" | 30 | #include "nouveau_encoder.h" |
31 | #include "nouveau_crtc.h" | 31 | #include "nouveau_crtc.h" |
diff --git a/drivers/gpu/drm/nouveau/nv20_fb.c b/drivers/gpu/drm/nouveau/nv20_fb.c index 19bd64059a66..5fffc2150b8e 100644 --- a/drivers/gpu/drm/nouveau/nv20_fb.c +++ b/drivers/gpu/drm/nouveau/nv20_fb.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | static struct drm_mm_node * | 5 | static struct drm_mm_node * |
7 | nv20_fb_alloc_tag(struct drm_device *dev, uint32_t size) | 6 | nv20_fb_alloc_tag(struct drm_device *dev, uint32_t size) |
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c index e34ea30758f6..ffaab0ba76b9 100644 --- a/drivers/gpu/drm/nouveau/nv20_graph.c +++ b/drivers/gpu/drm/nouveau/nv20_graph.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | /* | 5 | /* |
7 | * NV20 | 6 | * NV20 |
diff --git a/drivers/gpu/drm/nouveau/nv30_fb.c b/drivers/gpu/drm/nouveau/nv30_fb.c index e0135f0e2144..9cc4de8de5ca 100644 --- a/drivers/gpu/drm/nouveau/nv30_fb.c +++ b/drivers/gpu/drm/nouveau/nv30_fb.c | |||
@@ -24,10 +24,9 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_drm.h" | 29 | #include <drm/nouveau_drm.h> |
31 | 30 | ||
32 | void | 31 | void |
33 | nv30_fb_init_tile_region(struct drm_device *dev, int i, uint32_t addr, | 32 | nv30_fb_init_tile_region(struct drm_device *dev, int i, uint32_t addr, |
diff --git a/drivers/gpu/drm/nouveau/nv31_mpeg.c b/drivers/gpu/drm/nouveau/nv31_mpeg.c index 5f239bf658c4..818deb67588e 100644 --- a/drivers/gpu/drm/nouveau/nv31_mpeg.c +++ b/drivers/gpu/drm/nouveau/nv31_mpeg.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_fifo.h" | 27 | #include "nouveau_fifo.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv40_fb.c b/drivers/gpu/drm/nouveau/nv40_fb.c index 7fbcb334c096..88b4f7c43992 100644 --- a/drivers/gpu/drm/nouveau/nv40_fb.c +++ b/drivers/gpu/drm/nouveau/nv40_fb.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | void | 5 | void |
7 | nv40_fb_set_tile_region(struct drm_device *dev, int i) | 6 | nv40_fb_set_tile_region(struct drm_device *dev, int i) |
diff --git a/drivers/gpu/drm/nouveau/nv40_fifo.c b/drivers/gpu/drm/nouveau/nv40_fifo.c index cdc818479b0a..cf952d2048ed 100644 --- a/drivers/gpu/drm/nouveau/nv40_fifo.c +++ b/drivers/gpu/drm/nouveau/nv40_fifo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_util.h" | 30 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c index aa9e2df64a26..5489201bec0b 100644 --- a/drivers/gpu/drm/nouveau/nv40_graph.c +++ b/drivers/gpu/drm/nouveau/nv40_graph.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv40_grctx.c b/drivers/gpu/drm/nouveau/nv40_grctx.c index be0a74750fb1..cf115ad4dad1 100644 --- a/drivers/gpu/drm/nouveau/nv40_grctx.c +++ b/drivers/gpu/drm/nouveau/nv40_grctx.c | |||
@@ -109,7 +109,7 @@ | |||
109 | #define CP_LOAD_MAGIC_NV44TCL 0x00800029 /* per-vs state (0x4497) */ | 109 | #define CP_LOAD_MAGIC_NV44TCL 0x00800029 /* per-vs state (0x4497) */ |
110 | #define CP_LOAD_MAGIC_NV40TCL 0x00800041 /* per-vs state (0x4097) */ | 110 | #define CP_LOAD_MAGIC_NV40TCL 0x00800041 /* per-vs state (0x4097) */ |
111 | 111 | ||
112 | #include "drmP.h" | 112 | #include <drm/drmP.h> |
113 | #include "nouveau_drv.h" | 113 | #include "nouveau_drv.h" |
114 | #include "nouveau_grctx.h" | 114 | #include "nouveau_grctx.h" |
115 | 115 | ||
diff --git a/drivers/gpu/drm/nouveau/nv40_mc.c b/drivers/gpu/drm/nouveau/nv40_mc.c index 03c0d4c3f355..788584364853 100644 --- a/drivers/gpu/drm/nouveau/nv40_mc.c +++ b/drivers/gpu/drm/nouveau/nv40_mc.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | 4 | ||
6 | int | 5 | int |
7 | nv40_mc_init(struct drm_device *dev) | 6 | nv40_mc_init(struct drm_device *dev) |
diff --git a/drivers/gpu/drm/nouveau/nv40_pm.c b/drivers/gpu/drm/nouveau/nv40_pm.c index e66273aff493..b94dd87d592c 100644 --- a/drivers/gpu/drm/nouveau/nv40_pm.c +++ b/drivers/gpu/drm/nouveau/nv40_pm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_bios.h" | 27 | #include "nouveau_bios.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_calc.c b/drivers/gpu/drm/nouveau/nv50_calc.c index 8cf63a8b30cd..4d019eb76f7d 100644 --- a/drivers/gpu/drm/nouveau/nv50_calc.c +++ b/drivers/gpu/drm/nouveau/nv50_calc.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_hw.h" | 27 | #include "nouveau_hw.h" |
28 | 28 | ||
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c index 22cebd5dd694..7f3ae75032d6 100644 --- a/drivers/gpu/drm/nouveau/nv50_crtc.c +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c | |||
@@ -24,9 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_mode.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | #include "drm_crtc_helper.h" | ||
30 | 29 | ||
31 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) | 30 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) |
32 | #include "nouveau_reg.h" | 31 | #include "nouveau_reg.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c index af4ec7bf3670..b290b7b1f65d 100644 --- a/drivers/gpu/drm/nouveau/nv50_cursor.c +++ b/drivers/gpu/drm/nouveau/nv50_cursor.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_mode.h" | ||
29 | 28 | ||
30 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) | 29 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) |
31 | #include "nouveau_reg.h" | 30 | #include "nouveau_reg.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c index 2c36a6b92c53..2bff2e588d87 100644 --- a/drivers/gpu/drm/nouveau/nv50_dac.c +++ b/drivers/gpu/drm/nouveau/nv50_dac.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | 29 | ||
30 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) | 30 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) |
31 | #include "nouveau_reg.h" | 31 | #include "nouveau_reg.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index b244d9968c5d..f868a13e5c2d 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "nouveau_fbcon.h" | 33 | #include "nouveau_fbcon.h" |
34 | #include "nouveau_ramht.h" | 34 | #include "nouveau_ramht.h" |
35 | #include "nouveau_software.h" | 35 | #include "nouveau_software.h" |
36 | #include "drm_crtc_helper.h" | 36 | #include <drm/drm_crtc_helper.h> |
37 | 37 | ||
38 | static void nv50_display_isr(struct drm_device *); | 38 | static void nv50_display_isr(struct drm_device *); |
39 | static void nv50_display_bh(unsigned long); | 39 | static void nv50_display_bh(unsigned long); |
diff --git a/drivers/gpu/drm/nouveau/nv50_display.h b/drivers/gpu/drm/nouveau/nv50_display.h index e9db9b97f041..009ec2a811c4 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.h +++ b/drivers/gpu/drm/nouveau/nv50_display.h | |||
@@ -27,8 +27,7 @@ | |||
27 | #ifndef __NV50_DISPLAY_H__ | 27 | #ifndef __NV50_DISPLAY_H__ |
28 | #define __NV50_DISPLAY_H__ | 28 | #define __NV50_DISPLAY_H__ |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | ||
32 | #include "nouveau_drv.h" | 31 | #include "nouveau_drv.h" |
33 | #include "nouveau_dma.h" | 32 | #include "nouveau_dma.h" |
34 | #include "nouveau_reg.h" | 33 | #include "nouveau_reg.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_evo.c b/drivers/gpu/drm/nouveau/nv50_evo.c index ddcd55595824..dabcd8787176 100644 --- a/drivers/gpu/drm/nouveau/nv50_evo.c +++ b/drivers/gpu/drm/nouveau/nv50_evo.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_dma.h" | 28 | #include "nouveau_dma.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c index f1e4b9e07d14..befd5fb7155f 100644 --- a/drivers/gpu/drm/nouveau/nv50_fb.c +++ b/drivers/gpu/drm/nouveau/nv50_fb.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm.h" | ||
3 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
4 | #include "nouveau_drm.h" | 3 | #include <drm/nouveau_drm.h> |
5 | #include "nouveau_fifo.h" | 4 | #include "nouveau_fifo.h" |
6 | 5 | ||
7 | struct nv50_fb_priv { | 6 | struct nv50_fb_priv { |
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c index e3c8b05dcae4..ec24959e67a2 100644 --- a/drivers/gpu/drm/nouveau/nv50_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_fifo.c b/drivers/gpu/drm/nouveau/nv50_fifo.c index 55383b85db0b..5a440e89e918 100644 --- a/drivers/gpu/drm/nouveau/nv50_fifo.c +++ b/drivers/gpu/drm/nouveau/nv50_fifo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c index c399d510b27a..c86a5fcc5e69 100644 --- a/drivers/gpu/drm/nouveau/nv50_gpio.c +++ b/drivers/gpu/drm/nouveau/nv50_gpio.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/dmi.h> | 25 | #include <linux/dmi.h> |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_hw.h" | 28 | #include "nouveau_hw.h" |
29 | #include "nouveau_gpio.h" | 29 | #include "nouveau_gpio.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index 437608d1dfe7..f8a9c8095297 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/nv50_grctx.c index 881e22b249fc..3bb96a029d66 100644 --- a/drivers/gpu/drm/nouveau/nv50_grctx.c +++ b/drivers/gpu/drm/nouveau/nv50_grctx.c | |||
@@ -105,7 +105,7 @@ | |||
105 | #define CP_SEEK_1 0x00c000ff | 105 | #define CP_SEEK_1 0x00c000ff |
106 | #define CP_SEEK_2 0x00c800ff | 106 | #define CP_SEEK_2 0x00c800ff |
107 | 107 | ||
108 | #include "drmP.h" | 108 | #include <drm/drmP.h> |
109 | #include "nouveau_drv.h" | 109 | #include "nouveau_drv.h" |
110 | #include "nouveau_grctx.h" | 110 | #include "nouveau_grctx.h" |
111 | 111 | ||
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 0bba54f11800..05eff577f053 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c | |||
@@ -25,8 +25,7 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | ||
30 | 29 | ||
31 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
32 | #include "nouveau_vm.h" | 31 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_mc.c b/drivers/gpu/drm/nouveau/nv50_mc.c index e0a9c3faa202..a739c2afae90 100644 --- a/drivers/gpu/drm/nouveau/nv50_mc.c +++ b/drivers/gpu/drm/nouveau/nv50_mc.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | 29 | ||
31 | int | 30 | int |
diff --git a/drivers/gpu/drm/nouveau/nv50_mpeg.c b/drivers/gpu/drm/nouveau/nv50_mpeg.c index 90e8ed22cfcb..e11bb540727b 100644 --- a/drivers/gpu/drm/nouveau/nv50_mpeg.c +++ b/drivers/gpu/drm/nouveau/nv50_mpeg.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_ramht.h" | 27 | #include "nouveau_ramht.h" |
28 | 28 | ||
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c index d020ed4979b4..07593fd73af3 100644 --- a/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/drivers/gpu/drm/nouveau/nv50_pm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_bios.h" | 27 | #include "nouveau_bios.h" |
28 | #include "nouveau_hw.h" | 28 | #include "nouveau_hw.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_software.c b/drivers/gpu/drm/nouveau/nv50_software.c index df554d9dacb8..5497a6ce25b4 100644 --- a/drivers/gpu/drm/nouveau/nv50_software.c +++ b/drivers/gpu/drm/nouveau/nv50_software.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c index 93240bde891b..63ece8503a11 100644 --- a/drivers/gpu/drm/nouveau/nv50_sor.c +++ b/drivers/gpu/drm/nouveau/nv50_sor.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | 29 | ||
30 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) | 30 | #define NOUVEAU_DMA_DEBUG (nouveau_reg_debug & NOUVEAU_REG_DEBUG_EVO) |
31 | #include "nouveau_reg.h" | 31 | #include "nouveau_reg.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c index 179bb42a635c..c9fdfb48270b 100644 --- a/drivers/gpu/drm/nouveau/nv50_vm.c +++ b/drivers/gpu/drm/nouveau/nv50_vm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv50_vram.c b/drivers/gpu/drm/nouveau/nv50_vram.c index 9ed9ae397d75..e2a1af7b9eef 100644 --- a/drivers/gpu/drm/nouveau/nv50_vram.c +++ b/drivers/gpu/drm/nouveau/nv50_vram.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_mm.h" | 27 | #include "nouveau_mm.h" |
28 | 28 | ||
diff --git a/drivers/gpu/drm/nouveau/nv84_bsp.c b/drivers/gpu/drm/nouveau/nv84_bsp.c index 74875739bcc0..a4f4d4a0a755 100644 --- a/drivers/gpu/drm/nouveau/nv84_bsp.c +++ b/drivers/gpu/drm/nouveau/nv84_bsp.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_util.h" | 27 | #include "nouveau_util.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv84_crypt.c b/drivers/gpu/drm/nouveau/nv84_crypt.c index bbfcc73b6708..dc2bc5cc536d 100644 --- a/drivers/gpu/drm/nouveau/nv84_crypt.c +++ b/drivers/gpu/drm/nouveau/nv84_crypt.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_util.h" | 27 | #include "nouveau_util.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv84_fence.c b/drivers/gpu/drm/nouveau/nv84_fence.c index c2f889b0d340..60dd73d532e7 100644 --- a/drivers/gpu/drm/nouveau/nv84_fence.c +++ b/drivers/gpu/drm/nouveau/nv84_fence.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_fifo.h" | 28 | #include "nouveau_fifo.h" |
diff --git a/drivers/gpu/drm/nouveau/nv84_fifo.c b/drivers/gpu/drm/nouveau/nv84_fifo.c index c564c5e4c30a..9844a65491c3 100644 --- a/drivers/gpu/drm/nouveau/nv84_fifo.c +++ b/drivers/gpu/drm/nouveau/nv84_fifo.c | |||
@@ -24,8 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "nouveau_drv.h" | 28 | #include "nouveau_drv.h" |
30 | #include "nouveau_fifo.h" | 29 | #include "nouveau_fifo.h" |
31 | #include "nouveau_ramht.h" | 30 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nv84_vp.c b/drivers/gpu/drm/nouveau/nv84_vp.c index 6570d300ab85..0dec4958eb5f 100644 --- a/drivers/gpu/drm/nouveau/nv84_vp.c +++ b/drivers/gpu/drm/nouveau/nv84_vp.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_util.h" | 27 | #include "nouveau_util.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nv98_crypt.c b/drivers/gpu/drm/nouveau/nv98_crypt.c index e25e13fb894e..6f4c15345b9b 100644 --- a/drivers/gpu/drm/nouveau/nv98_crypt.c +++ b/drivers/gpu/drm/nouveau/nv98_crypt.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_util.h" | 28 | #include "nouveau_util.h" |
diff --git a/drivers/gpu/drm/nouveau/nv98_ppp.c b/drivers/gpu/drm/nouveau/nv98_ppp.c index a987dd6e0036..1847963e27f3 100644 --- a/drivers/gpu/drm/nouveau/nv98_ppp.c +++ b/drivers/gpu/drm/nouveau/nv98_ppp.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_util.h" | 27 | #include "nouveau_util.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nva3_copy.c b/drivers/gpu/drm/nouveau/nva3_copy.c index 0387dc7f4f42..7801cbd057fa 100644 --- a/drivers/gpu/drm/nouveau/nva3_copy.c +++ b/drivers/gpu/drm/nouveau/nva3_copy.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_util.h" | 28 | #include "nouveau_util.h" |
29 | #include "nouveau_vm.h" | 29 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c index 798829353fb6..9258524e4c80 100644 --- a/drivers/gpu/drm/nouveau/nva3_pm.c +++ b/drivers/gpu/drm/nouveau/nva3_pm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_bios.h" | 27 | #include "nouveau_bios.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_copy.c b/drivers/gpu/drm/nouveau/nvc0_copy.c index dddf006f6d88..88a922d60822 100644 --- a/drivers/gpu/drm/nouveau/nvc0_copy.c +++ b/drivers/gpu/drm/nouveau/nvc0_copy.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_util.h" | 28 | #include "nouveau_util.h" |
29 | #include "nouveau_vm.h" | 29 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_fb.c b/drivers/gpu/drm/nouveau/nvc0_fb.c index f376c39310df..7da32a9ef08e 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fb.c +++ b/drivers/gpu/drm/nouveau/nvc0_fb.c | |||
@@ -22,10 +22,9 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "drm.h" | ||
27 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
28 | #include "nouveau_drm.h" | 27 | #include <drm/nouveau_drm.h> |
29 | 28 | ||
30 | struct nvc0_fb_priv { | 29 | struct nvc0_fb_priv { |
31 | struct page *r100c10_page; | 30 | struct page *r100c10_page; |
diff --git a/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/drivers/gpu/drm/nouveau/nvc0_fbcon.c index 797159e7b7a6..ade005fa9de1 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fbcon.c +++ b/drivers/gpu/drm/nouveau/nvc0_fbcon.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_fence.c b/drivers/gpu/drm/nouveau/nvc0_fence.c index 47ab388a606e..2e666d0c4048 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fence.c +++ b/drivers/gpu/drm/nouveau/nvc0_fence.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_dma.h" | 27 | #include "nouveau_dma.h" |
28 | #include "nouveau_fifo.h" | 28 | #include "nouveau_fifo.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c index cd39eb99f5b1..d03ba8631a69 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fifo.c +++ b/drivers/gpu/drm/nouveau/nvc0_fifo.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_mm.h" | 28 | #include "nouveau_mm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c index 2a01e6e47724..59670acad7b9 100644 --- a/drivers/gpu/drm/nouveau/nvc0_graph.c +++ b/drivers/gpu/drm/nouveau/nvc0_graph.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | 29 | ||
30 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
31 | #include "nouveau_mm.h" | 31 | #include "nouveau_mm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c index de77842b31c0..2f17654e79a6 100644 --- a/drivers/gpu/drm/nouveau/nvc0_grctx.c +++ b/drivers/gpu/drm/nouveau/nvc0_grctx.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_mm.h" | 27 | #include "nouveau_mm.h" |
28 | #include "nvc0_graph.h" | 28 | #include "nvc0_graph.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_instmem.c b/drivers/gpu/drm/nouveau/nvc0_instmem.c index b701c439c92e..f5fac7cbb78d 100644 --- a/drivers/gpu/drm/nouveau/nvc0_instmem.c +++ b/drivers/gpu/drm/nouveau/nvc0_instmem.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_pm.c b/drivers/gpu/drm/nouveau/nvc0_pm.c index 4e712b10ebdb..51cee2103544 100644 --- a/drivers/gpu/drm/nouveau/nvc0_pm.c +++ b/drivers/gpu/drm/nouveau/nvc0_pm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_bios.h" | 27 | #include "nouveau_bios.h" |
28 | #include "nouveau_pm.h" | 28 | #include "nouveau_pm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_software.c b/drivers/gpu/drm/nouveau/nvc0_software.c index 93e8c164fec6..940652e7fafa 100644 --- a/drivers/gpu/drm/nouveau/nvc0_software.c +++ b/drivers/gpu/drm/nouveau/nvc0_software.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_ramht.h" | 28 | #include "nouveau_ramht.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_vm.c b/drivers/gpu/drm/nouveau/nvc0_vm.c index 30d2bd58828f..fad338314881 100644 --- a/drivers/gpu/drm/nouveau/nvc0_vm.c +++ b/drivers/gpu/drm/nouveau/nvc0_vm.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_vm.h" | 28 | #include "nouveau_vm.h" |
diff --git a/drivers/gpu/drm/nouveau/nvc0_vram.c b/drivers/gpu/drm/nouveau/nvc0_vram.c index a7eef8934c07..4d62a1d95782 100644 --- a/drivers/gpu/drm/nouveau/nvc0_vram.c +++ b/drivers/gpu/drm/nouveau/nvc0_vram.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_mm.h" | 27 | #include "nouveau_mm.h" |
28 | 28 | ||
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c index 8a2fc89b7763..4b44a3250d4b 100644 --- a/drivers/gpu/drm/nouveau/nvd0_display.c +++ b/drivers/gpu/drm/nouveau/nvd0_display.c | |||
@@ -24,8 +24,8 @@ | |||
24 | 24 | ||
25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | 29 | ||
30 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
31 | #include "nouveau_connector.h" | 31 | #include "nouveau_connector.h" |
diff --git a/drivers/gpu/drm/nouveau/nve0_fifo.c b/drivers/gpu/drm/nouveau/nve0_fifo.c index 281bece751b6..0eba15b2201a 100644 --- a/drivers/gpu/drm/nouveau/nve0_fifo.c +++ b/drivers/gpu/drm/nouveau/nve0_fifo.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | 26 | ||
27 | #include "nouveau_drv.h" | 27 | #include "nouveau_drv.h" |
28 | #include "nouveau_mm.h" | 28 | #include "nouveau_mm.h" |
diff --git a/drivers/gpu/drm/nouveau/nve0_graph.c b/drivers/gpu/drm/nouveau/nve0_graph.c index 8a8051b68f10..b784a8b32458 100644 --- a/drivers/gpu/drm/nouveau/nve0_graph.c +++ b/drivers/gpu/drm/nouveau/nve0_graph.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | 29 | ||
30 | #include "nouveau_drv.h" | 30 | #include "nouveau_drv.h" |
31 | #include "nouveau_mm.h" | 31 | #include "nouveau_mm.h" |
diff --git a/drivers/gpu/drm/nouveau/nve0_grctx.c b/drivers/gpu/drm/nouveau/nve0_grctx.c index d8cb360e92c1..d3a802987972 100644 --- a/drivers/gpu/drm/nouveau/nve0_grctx.c +++ b/drivers/gpu/drm/nouveau/nve0_grctx.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Authors: Ben Skeggs | 22 | * Authors: Ben Skeggs |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "nouveau_drv.h" | 26 | #include "nouveau_drv.h" |
27 | #include "nouveau_mm.h" | 27 | #include "nouveau_mm.h" |
28 | #include "nve0_graph.h" | 28 | #include "nve0_graph.h" |
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index bcac90b543ad..d4660cf942a5 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c | |||
@@ -34,9 +34,8 @@ | |||
34 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
36 | 36 | ||
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include "drm.h" | 38 | #include <drm/r128_drm.h> |
39 | #include "r128_drm.h" | ||
40 | #include "r128_drv.h" | 39 | #include "r128_drv.h" |
41 | 40 | ||
42 | #define R128_FIFO_DEBUG 0 | 41 | #define R128_FIFO_DEBUG 0 |
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index 2666a5308ab9..472c38fe123f 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c | |||
@@ -31,12 +31,11 @@ | |||
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/r128_drm.h> |
36 | #include "r128_drm.h" | ||
37 | #include "r128_drv.h" | 36 | #include "r128_drv.h" |
38 | 37 | ||
39 | #include "drm_pciids.h" | 38 | #include <drm/drm_pciids.h> |
40 | 39 | ||
41 | static struct pci_device_id pciidlist[] = { | 40 | static struct pci_device_id pciidlist[] = { |
42 | r128_PCI_IDS | 41 | r128_PCI_IDS |
diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c index 51c99fc4dd38..a954c548201e 100644 --- a/drivers/gpu/drm/r128/r128_ioc32.c +++ b/drivers/gpu/drm/r128/r128_ioc32.c | |||
@@ -31,9 +31,8 @@ | |||
31 | */ | 31 | */ |
32 | #include <linux/compat.h> | 32 | #include <linux/compat.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/r128_drm.h> |
36 | #include "r128_drm.h" | ||
37 | 36 | ||
38 | typedef struct drm_r128_init32 { | 37 | typedef struct drm_r128_init32 { |
39 | int func; | 38 | int func; |
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c index 429d5a02695f..2ea4f09d2691 100644 --- a/drivers/gpu/drm/r128/r128_irq.c +++ b/drivers/gpu/drm/r128/r128_irq.c | |||
@@ -30,9 +30,8 @@ | |||
30 | * Eric Anholt <anholt@FreeBSD.org> | 30 | * Eric Anholt <anholt@FreeBSD.org> |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | 34 | #include <drm/r128_drm.h> |
35 | #include "r128_drm.h" | ||
36 | #include "r128_drv.h" | 35 | #include "r128_drv.h" |
37 | 36 | ||
38 | u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) | 37 | u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) |
diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c index a9e33ce65918..19bb7e6f3d9a 100644 --- a/drivers/gpu/drm/r128/r128_state.c +++ b/drivers/gpu/drm/r128/r128_state.c | |||
@@ -28,9 +28,8 @@ | |||
28 | * Gareth Hughes <gareth@valinux.com> | 28 | * Gareth Hughes <gareth@valinux.com> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | 32 | #include <drm/r128_drm.h> |
33 | #include "r128_drm.h" | ||
34 | #include "r128_drv.h" | 33 | #include "r128_drv.h" |
35 | 34 | ||
36 | /* ================================================================ | 35 | /* ================================================================ |
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h index 25fea631dad2..feba6b8d36b3 100644 --- a/drivers/gpu/drm/radeon/atom.h +++ b/drivers/gpu/drm/radeon/atom.h | |||
@@ -26,7 +26,7 @@ | |||
26 | #define ATOM_H | 26 | #define ATOM_H |
27 | 27 | ||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | 30 | ||
31 | #define ATOM_BIOS_MAGIC 0xAA55 | 31 | #define ATOM_BIOS_MAGIC 0xAA55 |
32 | #define ATOM_ATI_MAGIC_PTR 0x30 | 32 | #define ATOM_ATI_MAGIC_PTR 0x30 |
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 3623b98ed3fe..ea8e2d471c35 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
@@ -24,13 +24,13 @@ | |||
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | * Jerome Glisse | 25 | * Jerome Glisse |
26 | */ | 26 | */ |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | 30 | ||
31 | #include "atom.h" | 31 | #include "atom.h" |
32 | #include "atom-bits.h" | 32 | #include "atom-bits.h" |
33 | #include "drm_dp_helper.h" | 33 | #include <drm/drm_dp_helper.h> |
34 | 34 | ||
35 | /* move these to drm_dp_helper.c/h */ | 35 | /* move these to drm_dp_helper.c/h */ |
36 | #define DP_LINK_CONFIGURATION_SIZE 9 | 36 | #define DP_LINK_CONFIGURATION_SIZE 9 |
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 6e8803a1170c..8e2ee98e69d2 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c | |||
@@ -23,9 +23,9 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm_crtc_helper.h" | 27 | #include <drm/drm_crtc_helper.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "atom.h" | 30 | #include "atom.h" |
31 | 31 | ||
diff --git a/drivers/gpu/drm/radeon/atombios_i2c.c b/drivers/gpu/drm/radeon/atombios_i2c.c index 44d87b6b4220..082338df708a 100644 --- a/drivers/gpu/drm/radeon/atombios_i2c.c +++ b/drivers/gpu/drm/radeon/atombios_i2c.c | |||
@@ -22,8 +22,8 @@ | |||
22 | * Authors: Alex Deucher | 22 | * Authors: Alex Deucher |
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "radeon_drm.h" | 26 | #include <drm/radeon_drm.h> |
27 | #include "radeon.h" | 27 | #include "radeon.h" |
28 | #include "atom.h" | 28 | #include "atom.h" |
29 | 29 | ||
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index ed3340adeb6f..c548dd75ca8b 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -24,10 +24,10 @@ | |||
24 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "radeon.h" | 28 | #include "radeon.h" |
29 | #include "radeon_asic.h" | 29 | #include "radeon_asic.h" |
30 | #include "radeon_drm.h" | 30 | #include <drm/radeon_drm.h> |
31 | #include "evergreend.h" | 31 | #include "evergreend.h" |
32 | #include "atom.h" | 32 | #include "atom.h" |
33 | #include "avivod.h" | 33 | #include "avivod.h" |
diff --git a/drivers/gpu/drm/radeon/evergreen_blit_kms.c b/drivers/gpu/drm/radeon/evergreen_blit_kms.c index 89cb9feb5653..057c87b6515a 100644 --- a/drivers/gpu/drm/radeon/evergreen_blit_kms.c +++ b/drivers/gpu/drm/radeon/evergreen_blit_kms.c | |||
@@ -24,9 +24,8 @@ | |||
24 | * Alex Deucher <alexander.deucher@amd.com> | 24 | * Alex Deucher <alexander.deucher@amd.com> |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon_drm.h" | ||
30 | #include "radeon.h" | 29 | #include "radeon.h" |
31 | 30 | ||
32 | #include "evergreend.h" | 31 | #include "evergreend.h" |
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index e44a62a07fe3..101acd618f67 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "evergreend.h" | 30 | #include "evergreend.h" |
31 | #include "evergreen_reg_safe.h" | 31 | #include "evergreen_reg_safe.h" |
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c index 65c54160028b..327c08b54180 100644 --- a/drivers/gpu/drm/radeon/evergreen_hdmi.c +++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * Authors: Christian König | 24 | * Authors: Christian König |
25 | * Rafał Miłecki | 25 | * Rafał Miłecki |
26 | */ | 26 | */ |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "radeon_asic.h" | 30 | #include "radeon_asic.h" |
31 | #include "evergreend.h" | 31 | #include "evergreend.h" |
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 853800e8582f..174462519f15 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c | |||
@@ -25,10 +25,10 @@ | |||
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "radeon_asic.h" | 30 | #include "radeon_asic.h" |
31 | #include "radeon_drm.h" | 31 | #include <drm/radeon_drm.h> |
32 | #include "nid.h" | 32 | #include "nid.h" |
33 | #include "atom.h" | 33 | #include "atom.h" |
34 | #include "ni_reg.h" | 34 | #include "ni_reg.h" |
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 8d7e33a0b243..3183a815f71c 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -27,9 +27,8 @@ | |||
27 | */ | 27 | */ |
28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | 31 | #include <drm/radeon_drm.h> |
32 | #include "radeon_drm.h" | ||
33 | #include "radeon_reg.h" | 32 | #include "radeon_reg.h" |
34 | #include "radeon.h" | 33 | #include "radeon.h" |
35 | #include "radeon_asic.h" | 34 | #include "radeon_asic.h" |
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c index f0889259eb08..98143a5c5b73 100644 --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c | |||
@@ -25,9 +25,8 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/radeon_drm.h> |
30 | #include "radeon_drm.h" | ||
31 | #include "radeon_reg.h" | 30 | #include "radeon_reg.h" |
32 | #include "radeon.h" | 31 | #include "radeon.h" |
33 | #include "radeon_asic.h" | 32 | #include "radeon_asic.h" |
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 646a1927dda7..1e10df214271 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "radeon_reg.h" | 33 | #include "radeon_reg.h" |
34 | #include "radeon.h" | 34 | #include "radeon.h" |
35 | #include "radeon_asic.h" | 35 | #include "radeon_asic.h" |
36 | #include "radeon_drm.h" | 36 | #include <drm/radeon_drm.h> |
37 | #include "r100_track.h" | 37 | #include "r100_track.h" |
38 | #include "r300d.h" | 38 | #include "r300d.h" |
39 | #include "rv350d.h" | 39 | #include "rv350d.h" |
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 1fe98b421c9b..002ab038d2ab 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c | |||
@@ -31,10 +31,9 @@ | |||
31 | * Nicolai Haehnle <prefect_@gmx.net> | 31 | * Nicolai Haehnle <prefect_@gmx.net> |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/drm_buffer.h> |
36 | #include "drm_buffer.h" | 36 | #include <drm/radeon_drm.h> |
37 | #include "radeon_drm.h" | ||
38 | #include "radeon_drv.h" | 37 | #include "radeon_drv.h" |
39 | #include "r300_reg.h" | 38 | #include "r300_reg.h" |
40 | 39 | ||
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index f2f5bf6d339f..6fce2eb4dd16 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
@@ -27,7 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "radeon_reg.h" | 31 | #include "radeon_reg.h" |
32 | #include "radeon.h" | 32 | #include "radeon.h" |
33 | #include "radeon_asic.h" | 33 | #include "radeon_asic.h" |
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 079d3c52c08a..90703d539e04 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "radeon_asic.h" | 30 | #include "radeon_asic.h" |
31 | #include "atom.h" | 31 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index d79c639ae739..9f2cafd10f4a 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -30,8 +30,8 @@ | |||
30 | #include <linux/firmware.h> | 30 | #include <linux/firmware.h> |
31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "radeon_drm.h" | 34 | #include <drm/radeon_drm.h> |
35 | #include "radeon.h" | 35 | #include "radeon.h" |
36 | #include "radeon_asic.h" | 36 | #include "radeon_asic.h" |
37 | #include "radeon_mode.h" | 37 | #include "radeon_mode.h" |
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 79b55916cf90..cb03fe22b0ab 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * | 23 | * |
24 | * Authors: Christian König | 24 | * Authors: Christian König |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "radeon.h" | 27 | #include "radeon.h" |
28 | #include "radeon_reg.h" | 28 | #include "radeon_reg.h" |
29 | #include "radeon_asic.h" | 29 | #include "radeon_asic.h" |
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c index 3c031a48205d..26ace5623dc7 100644 --- a/drivers/gpu/drm/radeon/r600_blit.c +++ b/drivers/gpu/drm/radeon/r600_blit.c | |||
@@ -23,9 +23,8 @@ | |||
23 | * Authors: | 23 | * Authors: |
24 | * Alex Deucher <alexander.deucher@amd.com> | 24 | * Alex Deucher <alexander.deucher@amd.com> |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm.h" | 27 | #include <drm/radeon_drm.h> |
28 | #include "radeon_drm.h" | ||
29 | #include "radeon_drv.h" | 28 | #include "radeon_drv.h" |
30 | 29 | ||
31 | #include "r600_blit_shaders.h" | 30 | #include "r600_blit_shaders.h" |
diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c index 2bef8549ddfe..aec8487662c4 100644 --- a/drivers/gpu/drm/radeon/r600_blit_kms.c +++ b/drivers/gpu/drm/radeon/r600_blit_kms.c | |||
@@ -23,9 +23,8 @@ | |||
23 | * | 23 | * |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm.h" | 27 | #include <drm/radeon_drm.h> |
28 | #include "radeon_drm.h" | ||
29 | #include "radeon.h" | 28 | #include "radeon.h" |
30 | 29 | ||
31 | #include "r600d.h" | 30 | #include "r600d.h" |
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index 75ed17c96115..2514123d2d00 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c | |||
@@ -28,9 +28,8 @@ | |||
28 | 28 | ||
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm.h" | 32 | #include <drm/radeon_drm.h> |
33 | #include "radeon_drm.h" | ||
34 | #include "radeon_drv.h" | 33 | #include "radeon_drv.h" |
35 | 34 | ||
36 | #define PFP_UCODE_SIZE 576 | 35 | #define PFP_UCODE_SIZE 576 |
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index f37676d7f217..cb92646a5e55 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "radeon.h" | 30 | #include "radeon.h" |
31 | #include "r600d.h" | 31 | #include "r600d.h" |
32 | #include "r600_reg_safe.h" | 32 | #include "r600_reg_safe.h" |
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c index e3558c3ef24a..23be9319c729 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * | 23 | * |
24 | * Authors: Christian König | 24 | * Authors: Christian König |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "radeon_drm.h" | 27 | #include <drm/radeon_drm.h> |
28 | #include "radeon.h" | 28 | #include "radeon.h" |
29 | #include "radeon_asic.h" | 29 | #include "radeon_asic.h" |
30 | #include "r600d.h" | 30 | #include "r600d.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c index 3516a6081dcf..215063e1a292 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c | |||
@@ -4,10 +4,8 @@ | |||
4 | #include <acpi/acpi_drivers.h> | 4 | #include <acpi/acpi_drivers.h> |
5 | #include <acpi/acpi_bus.h> | 5 | #include <acpi/acpi_bus.h> |
6 | 6 | ||
7 | #include "drmP.h" | 7 | #include <drm/drmP.h> |
8 | #include "drm.h" | 8 | #include <drm/drm_crtc_helper.h> |
9 | #include "drm_sarea.h" | ||
10 | #include "drm_crtc_helper.h" | ||
11 | #include "radeon.h" | 9 | #include "radeon.h" |
12 | 10 | ||
13 | #include <linux/vga_switcheroo.h> | 11 | #include <linux/vga_switcheroo.h> |
diff --git a/drivers/gpu/drm/radeon/radeon_agp.c b/drivers/gpu/drm/radeon/radeon_agp.c index bd2f33e5c91a..10ea17a6b2a6 100644 --- a/drivers/gpu/drm/radeon/radeon_agp.c +++ b/drivers/gpu/drm/radeon/radeon_agp.c | |||
@@ -24,10 +24,9 @@ | |||
24 | * Dave Airlie | 24 | * Dave Airlie |
25 | * Jerome Glisse <glisse@freedesktop.org> | 25 | * Jerome Glisse <glisse@freedesktop.org> |
26 | */ | 26 | */ |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "drm.h" | ||
29 | #include "radeon.h" | 28 | #include "radeon.h" |
30 | #include "radeon_drm.h" | 29 | #include <drm/radeon_drm.h> |
31 | 30 | ||
32 | #if __OS_HAS_AGP | 31 | #if __OS_HAS_AGP |
33 | 32 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index d67d4f3eb6f4..c4b5d0542ee2 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "radeon_drm.h" | 27 | #include <drm/radeon_drm.h> |
28 | #include "radeon.h" | 28 | #include "radeon.h" |
29 | 29 | ||
30 | #include "atom.h" | 30 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index d306cc8fdeaa..b8015913d382 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon_reg.h" | 29 | #include "radeon_reg.h" |
30 | #include "radeon.h" | 30 | #include "radeon.h" |
31 | #include "atom.h" | 31 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c index 9c6b29a41927..38e396dae0a9 100644 --- a/drivers/gpu/drm/radeon/radeon_clocks.c +++ b/drivers/gpu/drm/radeon/radeon_clocks.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon_drm.h" | 29 | #include <drm/radeon_drm.h> |
30 | #include "radeon_reg.h" | 30 | #include "radeon_reg.h" |
31 | #include "radeon.h" | 31 | #include "radeon.h" |
32 | #include "atom.h" | 32 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index f75247d42ffd..a3900e7bd77b 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * Authors: Dave Airlie | 24 | * Authors: Dave Airlie |
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | */ | 26 | */ |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "atom.h" | 30 | #include "atom.h" |
31 | 31 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 895e628b60f8..3bc22e341719 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
@@ -23,11 +23,11 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm_edid.h" | 27 | #include <drm/drm_edid.h> |
28 | #include "drm_crtc_helper.h" | 28 | #include <drm/drm_crtc_helper.h> |
29 | #include "drm_fb_helper.h" | 29 | #include <drm/drm_fb_helper.h> |
30 | #include "radeon_drm.h" | 30 | #include <drm/radeon_drm.h> |
31 | #include "radeon.h" | 31 | #include "radeon.h" |
32 | #include "atom.h" | 32 | #include "atom.h" |
33 | 33 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index ef67e181377b..8b2797dc7b64 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
@@ -31,10 +31,8 @@ | |||
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "drm.h" | 35 | #include <drm/radeon_drm.h> |
36 | #include "drm_sarea.h" | ||
37 | #include "radeon_drm.h" | ||
38 | #include "radeon_drv.h" | 36 | #include "radeon_drv.h" |
39 | #include "r300_reg.h" | 37 | #include "r300_reg.h" |
40 | 38 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index b4a0db24f4dd..891fff52ab65 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
@@ -24,8 +24,8 @@ | |||
24 | * Authors: | 24 | * Authors: |
25 | * Jerome Glisse <glisse@freedesktop.org> | 25 | * Jerome Glisse <glisse@freedesktop.org> |
26 | */ | 26 | */ |
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon_reg.h" | 29 | #include "radeon_reg.h" |
30 | #include "radeon.h" | 30 | #include "radeon.h" |
31 | 31 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c index 8794744cdf1a..0fe56c9f64bd 100644 --- a/drivers/gpu/drm/radeon/radeon_cursor.c +++ b/drivers/gpu/drm/radeon/radeon_cursor.c | |||
@@ -23,8 +23,8 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "radeon_drm.h" | 27 | #include <drm/radeon_drm.h> |
28 | #include "radeon.h" | 28 | #include "radeon.h" |
29 | 29 | ||
30 | #define CURSOR_WIDTH 64 | 30 | #define CURSOR_WIDTH 64 |
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index 7ddef8f30d0e..bfa2a6015727 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c | |||
@@ -23,15 +23,15 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "radeon_drm.h" | 27 | #include <drm/radeon_drm.h> |
28 | #include "radeon.h" | 28 | #include "radeon.h" |
29 | 29 | ||
30 | #include "atom.h" | 30 | #include "atom.h" |
31 | #include <asm/div64.h> | 31 | #include <asm/div64.h> |
32 | 32 | ||
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/drm_crtc_helper.h> |
34 | #include "drm_edid.h" | 34 | #include <drm/drm_edid.h> |
35 | 35 | ||
36 | static void avivo_crtc_load_lut(struct drm_crtc *crtc) | 36 | static void avivo_crtc_load_lut(struct drm_crtc *crtc) |
37 | { | 37 | { |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 8c593ea82c41..97f3fe7dd040 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
@@ -29,12 +29,11 @@ | |||
29 | * OTHER DEALINGS IN THE SOFTWARE. | 29 | * OTHER DEALINGS IN THE SOFTWARE. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/radeon_drm.h> |
34 | #include "radeon_drm.h" | ||
35 | #include "radeon_drv.h" | 34 | #include "radeon_drv.h" |
36 | 35 | ||
37 | #include "drm_pciids.h" | 36 | #include <drm/drm_pciids.h> |
38 | #include <linux/console.h> | 37 | #include <linux/console.h> |
39 | #include <linux/module.h> | 38 | #include <linux/module.h> |
40 | 39 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 74670696277d..5a1bae3a2426 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
@@ -23,9 +23,9 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm_crtc_helper.h" | 27 | #include <drm/drm_crtc_helper.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "atom.h" | 30 | #include "atom.h" |
31 | 31 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 5906914a78bc..fae493710ebf 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
@@ -27,14 +27,13 @@ | |||
27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
28 | #include <linux/fb.h> | 28 | #include <linux/fb.h> |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | 31 | #include <drm/drm_crtc.h> |
32 | #include "drm_crtc.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | #include "drm_crtc_helper.h" | 33 | #include <drm/radeon_drm.h> |
34 | #include "radeon_drm.h" | ||
35 | #include "radeon.h" | 34 | #include "radeon.h" |
36 | 35 | ||
37 | #include "drm_fb_helper.h" | 36 | #include <drm/drm_fb_helper.h> |
38 | 37 | ||
39 | #include <linux/vga_switcheroo.h> | 38 | #include <linux/vga_switcheroo.h> |
40 | 39 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 2a59375dbe52..5cd47ff03e48 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
@@ -34,8 +34,7 @@ | |||
34 | #include <linux/list.h> | 34 | #include <linux/list.h> |
35 | #include <linux/kref.h> | 35 | #include <linux/kref.h> |
36 | #include <linux/slab.h> | 36 | #include <linux/slab.h> |
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include "drm.h" | ||
39 | #include "radeon_reg.h" | 38 | #include "radeon_reg.h" |
40 | #include "radeon.h" | 39 | #include "radeon.h" |
41 | #include "radeon_trace.h" | 40 | #include "radeon_trace.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_gart.c b/drivers/gpu/drm/radeon/radeon_gart.c index bb3b7fe05ccd..33cc03e310fd 100644 --- a/drivers/gpu/drm/radeon/radeon_gart.c +++ b/drivers/gpu/drm/radeon/radeon_gart.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon_drm.h" | 29 | #include <drm/radeon_drm.h> |
30 | #include "radeon.h" | 30 | #include "radeon.h" |
31 | #include "radeon_reg.h" | 31 | #include "radeon_reg.h" |
32 | 32 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 1b57b0058ad6..04c212da6f65 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c | |||
@@ -25,9 +25,8 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm.h" | 29 | #include <drm/radeon_drm.h> |
30 | #include "radeon_drm.h" | ||
31 | #include "radeon.h" | 30 | #include "radeon.h" |
32 | 31 | ||
33 | int radeon_gem_object_init(struct drm_gem_object *obj) | 32 | int radeon_gem_object_init(struct drm_gem_object *obj) |
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index 3edec1c198e3..c5bddd630eb9 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c | |||
@@ -25,9 +25,9 @@ | |||
25 | */ | 25 | */ |
26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm_edid.h" | 29 | #include <drm/drm_edid.h> |
30 | #include "radeon_drm.h" | 30 | #include <drm/radeon_drm.h> |
31 | #include "radeon.h" | 31 | #include "radeon.h" |
32 | #include "atom.h" | 32 | #include "atom.h" |
33 | 33 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c index 48b7cea31e08..8fc81a26438a 100644 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c | |||
@@ -29,9 +29,8 @@ | |||
29 | */ | 29 | */ |
30 | #include <linux/compat.h> | 30 | #include <linux/compat.h> |
31 | 31 | ||
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/radeon_drm.h> |
34 | #include "radeon_drm.h" | ||
35 | #include "radeon_drv.h" | 34 | #include "radeon_drv.h" |
36 | 35 | ||
37 | typedef struct drm_radeon_init32 { | 36 | typedef struct drm_radeon_init32 { |
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c index 00da38424dfc..e7710339a6a7 100644 --- a/drivers/gpu/drm/radeon/radeon_irq.c +++ b/drivers/gpu/drm/radeon/radeon_irq.c | |||
@@ -30,9 +30,8 @@ | |||
30 | * Michel D�zer <michel@daenzer.net> | 30 | * Michel D�zer <michel@daenzer.net> |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include "drmP.h" | 33 | #include <drm/drmP.h> |
34 | #include "drm.h" | 34 | #include <drm/radeon_drm.h> |
35 | #include "radeon_drm.h" | ||
36 | #include "radeon_drv.h" | 35 | #include "radeon_drv.h" |
37 | 36 | ||
38 | void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state) | 37 | void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state) |
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 50b596ec7b7e..9201992cee12 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c | |||
@@ -25,9 +25,9 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm_crtc_helper.h" | 29 | #include <drm/drm_crtc_helper.h> |
30 | #include "radeon_drm.h" | 30 | #include <drm/radeon_drm.h> |
31 | #include "radeon_reg.h" | 31 | #include "radeon_reg.h" |
32 | #include "radeon.h" | 32 | #include "radeon.h" |
33 | #include "atom.h" | 33 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 414b4acf6947..8a7f87f17c13 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c | |||
@@ -25,10 +25,9 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "drm_sarea.h" | ||
30 | #include "radeon.h" | 29 | #include "radeon.h" |
31 | #include "radeon_drm.h" | 30 | #include <drm/radeon_drm.h> |
32 | #include "radeon_asic.h" | 31 | #include "radeon_asic.h" |
33 | 32 | ||
34 | #include <linux/vga_switcheroo.h> | 33 | #include <linux/vga_switcheroo.h> |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 670e9910f869..757b08f07195 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c | |||
@@ -23,9 +23,9 @@ | |||
23 | * Authors: Dave Airlie | 23 | * Authors: Dave Airlie |
24 | * Alex Deucher | 24 | * Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm_crtc_helper.h" | 27 | #include <drm/drm_crtc_helper.h> |
28 | #include "radeon_drm.h" | 28 | #include <drm/radeon_drm.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "atom.h" | 30 | #include "atom.h" |
31 | #include <linux/backlight.h> | 31 | #include <linux/backlight.h> |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c index b37ec0f1413a..49750d07ab7d 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #include "drmP.h" | 1 | #include <drm/drmP.h> |
2 | #include "drm_crtc_helper.h" | 2 | #include <drm/drm_crtc_helper.h> |
3 | #include "radeon.h" | 3 | #include "radeon.h" |
4 | 4 | ||
5 | /* | 5 | /* |
diff --git a/drivers/gpu/drm/radeon/radeon_mem.c b/drivers/gpu/drm/radeon/radeon_mem.c index 988548efea92..b9f067241633 100644 --- a/drivers/gpu/drm/radeon/radeon_mem.c +++ b/drivers/gpu/drm/radeon/radeon_mem.c | |||
@@ -29,9 +29,8 @@ | |||
29 | * Keith Whitwell <keith@tungstengraphics.com> | 29 | * Keith Whitwell <keith@tungstengraphics.com> |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/radeon_drm.h> |
34 | #include "radeon_drm.h" | ||
35 | #include "radeon_drv.h" | 34 | #include "radeon_drv.h" |
36 | 35 | ||
37 | /* Very simple allocator for GART memory, working on a static range | 36 | /* Very simple allocator for GART memory, working on a static range |
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index d56978949f34..0c28ca3964b1 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h | |||
@@ -30,12 +30,11 @@ | |||
30 | #ifndef RADEON_MODE_H | 30 | #ifndef RADEON_MODE_H |
31 | #define RADEON_MODE_H | 31 | #define RADEON_MODE_H |
32 | 32 | ||
33 | #include <drm_crtc.h> | 33 | #include <drm/drm_crtc.h> |
34 | #include <drm_mode.h> | 34 | #include <drm/drm_edid.h> |
35 | #include <drm_edid.h> | 35 | #include <drm/drm_dp_helper.h> |
36 | #include <drm_dp_helper.h> | 36 | #include <drm/drm_fixed.h> |
37 | #include <drm_fixed.h> | 37 | #include <drm/drm_crtc_helper.h> |
38 | #include <drm_crtc_helper.h> | ||
39 | #include <linux/i2c.h> | 38 | #include <linux/i2c.h> |
40 | #include <linux/i2c-algo-bit.h> | 39 | #include <linux/i2c-algo-bit.h> |
41 | 40 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 9024e7222839..56ed724b398d 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <linux/list.h> | 32 | #include <linux/list.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <drm/drmP.h> | 34 | #include <drm/drmP.h> |
35 | #include "radeon_drm.h" | 35 | #include <drm/radeon_drm.h> |
36 | #include "radeon.h" | 36 | #include "radeon.h" |
37 | #include "radeon_trace.h" | 37 | #include "radeon_trace.h" |
38 | 38 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index 7ae606600107..3ef0319981d3 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * Authors: Rafał Miłecki <zajec5@gmail.com> | 20 | * Authors: Rafał Miłecki <zajec5@gmail.com> |
21 | * Alex Deucher <alexdeucher@gmail.com> | 21 | * Alex Deucher <alexdeucher@gmail.com> |
22 | */ | 22 | */ |
23 | #include "drmP.h" | 23 | #include <drm/drmP.h> |
24 | #include "radeon.h" | 24 | #include "radeon.h" |
25 | #include "avivod.h" | 25 | #include "avivod.h" |
26 | #include "atom.h" | 26 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c index 6bef46ace831..e09521858f64 100644 --- a/drivers/gpu/drm/radeon/radeon_prime.c +++ b/drivers/gpu/drm/radeon/radeon_prime.c | |||
@@ -23,11 +23,10 @@ | |||
23 | * | 23 | * |
24 | * Authors: Alex Deucher | 24 | * Authors: Alex Deucher |
25 | */ | 25 | */ |
26 | #include "drmP.h" | 26 | #include <drm/drmP.h> |
27 | #include "drm.h" | ||
28 | 27 | ||
29 | #include "radeon.h" | 28 | #include "radeon.h" |
30 | #include "radeon_drm.h" | 29 | #include <drm/radeon_drm.h> |
31 | 30 | ||
32 | #include <linux/dma-buf.h> | 31 | #include <linux/dma-buf.h> |
33 | 32 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 43c431a2686d..fc209c8b8666 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
@@ -28,8 +28,8 @@ | |||
28 | */ | 28 | */ |
29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "radeon_drm.h" | 32 | #include <drm/radeon_drm.h> |
33 | #include "radeon_reg.h" | 33 | #include "radeon_reg.h" |
34 | #include "radeon.h" | 34 | #include "radeon.h" |
35 | #include "atom.h" | 35 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_sa.c b/drivers/gpu/drm/radeon/radeon_sa.c index 4e771240fdd0..83e889b9420b 100644 --- a/drivers/gpu/drm/radeon/radeon_sa.c +++ b/drivers/gpu/drm/radeon/radeon_sa.c | |||
@@ -41,8 +41,7 @@ | |||
41 | * If we are asked to block we wait on all the oldest fence of all | 41 | * If we are asked to block we wait on all the oldest fence of all |
42 | * rings. We just wait for any of those fence to complete. | 42 | * rings. We just wait for any of those fence to complete. |
43 | */ | 43 | */ |
44 | #include "drmP.h" | 44 | #include <drm/drmP.h> |
45 | #include "drm.h" | ||
46 | #include "radeon.h" | 45 | #include "radeon.h" |
47 | 46 | ||
48 | static void radeon_sa_bo_remove_locked(struct radeon_sa_bo *sa_bo); | 47 | static void radeon_sa_bo_remove_locked(struct radeon_sa_bo *sa_bo); |
diff --git a/drivers/gpu/drm/radeon/radeon_semaphore.c b/drivers/gpu/drm/radeon/radeon_semaphore.c index 7cc78de6ddc3..97f3ece81cd2 100644 --- a/drivers/gpu/drm/radeon/radeon_semaphore.c +++ b/drivers/gpu/drm/radeon/radeon_semaphore.c | |||
@@ -27,8 +27,7 @@ | |||
27 | * Authors: | 27 | * Authors: |
28 | * Christian König <deathsimple@vodafone.de> | 28 | * Christian König <deathsimple@vodafone.de> |
29 | */ | 29 | */ |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | ||
32 | #include "radeon.h" | 31 | #include "radeon.h" |
33 | 32 | ||
34 | 33 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index e8422ae7fe74..8e9057b6a365 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c | |||
@@ -27,11 +27,9 @@ | |||
27 | * Kevin E. Martin <martin@valinux.com> | 27 | * Kevin E. Martin <martin@valinux.com> |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "drm.h" | 31 | #include <drm/drm_buffer.h> |
32 | #include "drm_buffer.h" | 32 | #include <drm/radeon_drm.h> |
33 | #include "drm_sarea.h" | ||
34 | #include "radeon_drm.h" | ||
35 | #include "radeon_drv.h" | 33 | #include "radeon_drv.h" |
36 | 34 | ||
37 | /* ================================================================ | 35 | /* ================================================================ |
diff --git a/drivers/gpu/drm/radeon/radeon_trace_points.c b/drivers/gpu/drm/radeon/radeon_trace_points.c index 8175993df84d..e51d3575976b 100644 --- a/drivers/gpu/drm/radeon/radeon_trace_points.c +++ b/drivers/gpu/drm/radeon/radeon_trace_points.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Author : Dave Airlie <airlied@redhat.com> | 2 | * Author : Dave Airlie <airlied@redhat.com> |
3 | */ | 3 | */ |
4 | #include <drm/drmP.h> | 4 | #include <drm/drmP.h> |
5 | #include "radeon_drm.h" | 5 | #include <drm/radeon_drm.h> |
6 | #include "radeon.h" | 6 | #include "radeon.h" |
7 | 7 | ||
8 | #define CREATE_TRACE_POINTS | 8 | #define CREATE_TRACE_POINTS |
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 5301b3df8466..6590cc128f36 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * close to the one of the R600 family (R600 likely being an evolution | 35 | * close to the one of the R600 family (R600 likely being an evolution |
36 | * of the RS600 GART block). | 36 | * of the RS600 GART block). |
37 | */ | 37 | */ |
38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
39 | #include "radeon.h" | 39 | #include "radeon.h" |
40 | #include "radeon_asic.h" | 40 | #include "radeon_asic.h" |
41 | #include "atom.h" | 41 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 3b663fcfe061..dfb9f0fe6f38 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * Alex Deucher | 25 | * Alex Deucher |
26 | * Jerome Glisse | 26 | * Jerome Glisse |
27 | */ | 27 | */ |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "radeon_asic.h" | 30 | #include "radeon_asic.h" |
31 | #include "atom.h" | 31 | #include "atom.h" |
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index aa8ef491ef3c..ae4f93e2f135 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c | |||
@@ -27,7 +27,7 @@ | |||
27 | */ | 27 | */ |
28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
29 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "rv515d.h" | 31 | #include "rv515d.h" |
32 | #include "radeon.h" | 32 | #include "radeon.h" |
33 | #include "radeon_asic.h" | 33 | #include "radeon_asic.h" |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index ca8ffec10ff6..35a4152bb1ad 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -28,10 +28,10 @@ | |||
28 | #include <linux/firmware.h> | 28 | #include <linux/firmware.h> |
29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "radeon.h" | 32 | #include "radeon.h" |
33 | #include "radeon_asic.h" | 33 | #include "radeon_asic.h" |
34 | #include "radeon_drm.h" | 34 | #include <drm/radeon_drm.h> |
35 | #include "rv770d.h" | 35 | #include "rv770d.h" |
36 | #include "atom.h" | 36 | #include "atom.h" |
37 | #include "avivod.h" | 37 | #include "avivod.h" |
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c index 0139e227e3c7..d883cae56378 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c | |||
@@ -25,10 +25,10 @@ | |||
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "radeon.h" | 29 | #include "radeon.h" |
30 | #include "radeon_asic.h" | 30 | #include "radeon_asic.h" |
31 | #include "radeon_drm.h" | 31 | #include <drm/radeon_drm.h> |
32 | #include "sid.h" | 32 | #include "sid.h" |
33 | #include "atom.h" | 33 | #include "atom.h" |
34 | #include "si_blit_shaders.h" | 34 | #include "si_blit_shaders.h" |
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index 1efbb9075837..b88a42154e16 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c | |||
@@ -22,8 +22,8 @@ | |||
22 | * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | 22 | * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION |
23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "savage_drm.h" | 26 | #include <drm/savage_drm.h> |
27 | #include "savage_drv.h" | 27 | #include "savage_drv.h" |
28 | 28 | ||
29 | /* Need a long timeout for shadow status updates can take a while | 29 | /* Need a long timeout for shadow status updates can take a while |
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c index c5a164337bd5..71b2081e7835 100644 --- a/drivers/gpu/drm/savage/savage_drv.c +++ b/drivers/gpu/drm/savage/savage_drv.c | |||
@@ -25,11 +25,11 @@ | |||
25 | 25 | ||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "savage_drm.h" | 29 | #include <drm/savage_drm.h> |
30 | #include "savage_drv.h" | 30 | #include "savage_drv.h" |
31 | 31 | ||
32 | #include "drm_pciids.h" | 32 | #include <drm/drm_pciids.h> |
33 | 33 | ||
34 | static struct pci_device_id pciidlist[] = { | 34 | static struct pci_device_id pciidlist[] = { |
35 | savage_PCI_IDS | 35 | savage_PCI_IDS |
diff --git a/drivers/gpu/drm/savage/savage_state.c b/drivers/gpu/drm/savage/savage_state.c index b6d8608375cd..b35e75ed890c 100644 --- a/drivers/gpu/drm/savage/savage_state.c +++ b/drivers/gpu/drm/savage/savage_state.c | |||
@@ -22,8 +22,8 @@ | |||
22 | * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | 22 | * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION |
23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 23 | * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
24 | */ | 24 | */ |
25 | #include "drmP.h" | 25 | #include <drm/drmP.h> |
26 | #include "savage_drm.h" | 26 | #include <drm/savage_drm.h> |
27 | #include "savage_drv.h" | 27 | #include "savage_drv.h" |
28 | 28 | ||
29 | void savage_emit_clip_rect_s3d(drm_savage_private_t * dev_priv, | 29 | void savage_emit_clip_rect_s3d(drm_savage_private_t * dev_priv, |
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index 867dc03000e6..841065b998a1 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c | |||
@@ -27,11 +27,11 @@ | |||
27 | 27 | ||
28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "sis_drm.h" | 31 | #include <drm/sis_drm.h> |
32 | #include "sis_drv.h" | 32 | #include "sis_drv.h" |
33 | 33 | ||
34 | #include "drm_pciids.h" | 34 | #include <drm/drm_pciids.h> |
35 | 35 | ||
36 | static struct pci_device_id pciidlist[] = { | 36 | static struct pci_device_id pciidlist[] = { |
37 | sisdrv_PCI_IDS | 37 | sisdrv_PCI_IDS |
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h index 573758b2d2d6..13b527bb83be 100644 --- a/drivers/gpu/drm/sis/sis_drv.h +++ b/drivers/gpu/drm/sis/sis_drv.h | |||
@@ -44,7 +44,7 @@ enum sis_family { | |||
44 | SIS_CHIP_315 = 1, | 44 | SIS_CHIP_315 = 1, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | #include "drm_mm.h" | 47 | #include <drm/drm_mm.h> |
48 | 48 | ||
49 | 49 | ||
50 | #define SIS_BASE (dev_priv->mmio) | 50 | #define SIS_BASE (dev_priv->mmio) |
diff --git a/drivers/gpu/drm/sis/sis_mm.c b/drivers/gpu/drm/sis/sis_mm.c index 2c231070d250..2b2f78c428af 100644 --- a/drivers/gpu/drm/sis/sis_mm.c +++ b/drivers/gpu/drm/sis/sis_mm.c | |||
@@ -31,8 +31,8 @@ | |||
31 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 31 | * Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #include "drmP.h" | 34 | #include <drm/drmP.h> |
35 | #include "sis_drm.h" | 35 | #include <drm/sis_drm.h> |
36 | #include "sis_drv.h" | 36 | #include "sis_drv.h" |
37 | 37 | ||
38 | #include <video/sisfb.h> | 38 | #include <video/sisfb.h> |
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c index a7f4d6bd1330..ddfa743459d0 100644 --- a/drivers/gpu/drm/tdfx/tdfx_drv.c +++ b/drivers/gpu/drm/tdfx/tdfx_drv.c | |||
@@ -32,10 +32,10 @@ | |||
32 | 32 | ||
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
34 | 34 | ||
35 | #include "drmP.h" | 35 | #include <drm/drmP.h> |
36 | #include "tdfx_drv.h" | 36 | #include "tdfx_drv.h" |
37 | 37 | ||
38 | #include "drm_pciids.h" | 38 | #include <drm/drm_pciids.h> |
39 | 39 | ||
40 | static struct pci_device_id pciidlist[] = { | 40 | static struct pci_device_id pciidlist[] = { |
41 | tdfx_PCI_IDS | 41 | tdfx_PCI_IDS |
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c index 4a8728291361..3302f99e7497 100644 --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c | |||
@@ -31,11 +31,11 @@ | |||
31 | 31 | ||
32 | #define pr_fmt(fmt) "[TTM] " fmt | 32 | #define pr_fmt(fmt) "[TTM] " fmt |
33 | 33 | ||
34 | #include "ttm/ttm_module.h" | 34 | #include <drm/ttm/ttm_module.h> |
35 | #include "ttm/ttm_bo_driver.h" | 35 | #include <drm/ttm/ttm_bo_driver.h> |
36 | #include "ttm/ttm_page_alloc.h" | 36 | #include <drm/ttm/ttm_page_alloc.h> |
37 | #ifdef TTM_HAS_AGP | 37 | #ifdef TTM_HAS_AGP |
38 | #include "ttm/ttm_placement.h" | 38 | #include <drm/ttm/ttm_placement.h> |
39 | #include <linux/agp_backend.h> | 39 | #include <linux/agp_backend.h> |
40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 36f4b28c1b90..402ab69f9f99 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
@@ -30,9 +30,9 @@ | |||
30 | 30 | ||
31 | #define pr_fmt(fmt) "[TTM] " fmt | 31 | #define pr_fmt(fmt) "[TTM] " fmt |
32 | 32 | ||
33 | #include "ttm/ttm_module.h" | 33 | #include <drm/ttm/ttm_module.h> |
34 | #include "ttm/ttm_bo_driver.h" | 34 | #include <drm/ttm/ttm_bo_driver.h> |
35 | #include "ttm/ttm_placement.h" | 35 | #include <drm/ttm/ttm_placement.h> |
36 | #include <linux/jiffies.h> | 36 | #include <linux/jiffies.h> |
37 | #include <linux/slab.h> | 37 | #include <linux/slab.h> |
38 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c index 038e947d00f9..9212494e9072 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c | |||
@@ -28,10 +28,10 @@ | |||
28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "ttm/ttm_module.h" | 31 | #include <drm/ttm/ttm_module.h> |
32 | #include "ttm/ttm_bo_driver.h" | 32 | #include <drm/ttm/ttm_bo_driver.h> |
33 | #include "ttm/ttm_placement.h" | 33 | #include <drm/ttm/ttm_placement.h> |
34 | #include "drm_mm.h" | 34 | #include <drm/drm_mm.h> |
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index f8187ead7b37..2a4aa57779e7 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
@@ -28,8 +28,8 @@ | |||
28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "ttm/ttm_bo_driver.h" | 31 | #include <drm/ttm/ttm_bo_driver.h> |
32 | #include "ttm/ttm_placement.h" | 32 | #include <drm/ttm/ttm_placement.h> |
33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
34 | #include <linux/highmem.h> | 34 | #include <linux/highmem.h> |
35 | #include <linux/wait.h> | 35 | #include <linux/wait.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_execbuf_util.c b/drivers/gpu/drm/ttm/ttm_execbuf_util.c index 3832fe10b4df..1937069432c5 100644 --- a/drivers/gpu/drm/ttm/ttm_execbuf_util.c +++ b/drivers/gpu/drm/ttm/ttm_execbuf_util.c | |||
@@ -25,9 +25,9 @@ | |||
25 | * | 25 | * |
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "ttm/ttm_execbuf_util.h" | 28 | #include <drm/ttm/ttm_execbuf_util.h> |
29 | #include "ttm/ttm_bo_driver.h" | 29 | #include <drm/ttm/ttm_bo_driver.h> |
30 | #include "ttm/ttm_placement.h" | 30 | #include <drm/ttm/ttm_placement.h> |
31 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_lock.c b/drivers/gpu/drm/ttm/ttm_lock.c index 075daf44bce4..3daa9a3930b8 100644 --- a/drivers/gpu/drm/ttm/ttm_lock.c +++ b/drivers/gpu/drm/ttm/ttm_lock.c | |||
@@ -28,8 +28,8 @@ | |||
28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "ttm/ttm_lock.h" | 31 | #include <drm/ttm/ttm_lock.h> |
32 | #include "ttm/ttm_module.h" | 32 | #include <drm/ttm/ttm_module.h> |
33 | #include <linux/atomic.h> | 33 | #include <linux/atomic.h> |
34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
35 | #include <linux/wait.h> | 35 | #include <linux/wait.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index 23d2ecbaed59..479c6b0467ca 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c | |||
@@ -27,9 +27,9 @@ | |||
27 | 27 | ||
28 | #define pr_fmt(fmt) "[TTM] " fmt | 28 | #define pr_fmt(fmt) "[TTM] " fmt |
29 | 29 | ||
30 | #include "ttm/ttm_memory.h" | 30 | #include <drm/ttm/ttm_memory.h> |
31 | #include "ttm/ttm_module.h" | 31 | #include <drm/ttm/ttm_module.h> |
32 | #include "ttm/ttm_page_alloc.h" | 32 | #include <drm/ttm/ttm_page_alloc.h> |
33 | #include <linux/spinlock.h> | 33 | #include <linux/spinlock.h> |
34 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
35 | #include <linux/wait.h> | 35 | #include <linux/wait.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c index 902d7cf9fb4e..d7f92fe9d904 100644 --- a/drivers/gpu/drm/ttm/ttm_module.c +++ b/drivers/gpu/drm/ttm/ttm_module.c | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
33 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
34 | #include "ttm/ttm_module.h" | 34 | #include <drm/ttm/ttm_module.h> |
35 | #include "drm_sysfs.h" | 35 | #include <drm/drm_sysfs.h> |
36 | 36 | ||
37 | static DECLARE_WAIT_QUEUE_HEAD(exit_q); | 37 | static DECLARE_WAIT_QUEUE_HEAD(exit_q); |
38 | atomic_t device_released; | 38 | atomic_t device_released; |
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 68daca412cbd..c7857874956a 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c | |||
@@ -51,8 +51,8 @@ | |||
51 | 51 | ||
52 | #define pr_fmt(fmt) "[TTM] " fmt | 52 | #define pr_fmt(fmt) "[TTM] " fmt |
53 | 53 | ||
54 | #include "ttm/ttm_object.h" | 54 | #include <drm/ttm/ttm_object.h> |
55 | #include "ttm/ttm_module.h" | 55 | #include <drm/ttm/ttm_module.h> |
56 | #include <linux/list.h> | 56 | #include <linux/list.h> |
57 | #include <linux/spinlock.h> | 57 | #include <linux/spinlock.h> |
58 | #include <linux/slab.h> | 58 | #include <linux/slab.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index ebc6fac96e36..860dc4813e99 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c | |||
@@ -45,8 +45,8 @@ | |||
45 | 45 | ||
46 | #include <linux/atomic.h> | 46 | #include <linux/atomic.h> |
47 | 47 | ||
48 | #include "ttm/ttm_bo_driver.h" | 48 | #include <drm/ttm/ttm_bo_driver.h> |
49 | #include "ttm/ttm_page_alloc.h" | 49 | #include <drm/ttm/ttm_page_alloc.h> |
50 | 50 | ||
51 | #ifdef TTM_HAS_AGP | 51 | #ifdef TTM_HAS_AGP |
52 | #include <asm/agp.h> | 52 | #include <asm/agp.h> |
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c index 4f9e548b2eec..d4aa5a82ab1b 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | |||
@@ -47,8 +47,8 @@ | |||
47 | #include <linux/atomic.h> | 47 | #include <linux/atomic.h> |
48 | #include <linux/device.h> | 48 | #include <linux/device.h> |
49 | #include <linux/kthread.h> | 49 | #include <linux/kthread.h> |
50 | #include "ttm/ttm_bo_driver.h" | 50 | #include <drm/ttm/ttm_bo_driver.h> |
51 | #include "ttm/ttm_page_alloc.h" | 51 | #include <drm/ttm/ttm_page_alloc.h> |
52 | #ifdef TTM_HAS_AGP | 52 | #ifdef TTM_HAS_AGP |
53 | #include <asm/agp.h> | 53 | #include <asm/agp.h> |
54 | #endif | 54 | #endif |
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index fa09daf9a50c..82a529e45afe 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
@@ -38,12 +38,12 @@ | |||
38 | #include <linux/swap.h> | 38 | #include <linux/swap.h> |
39 | #include <linux/slab.h> | 39 | #include <linux/slab.h> |
40 | #include <linux/export.h> | 40 | #include <linux/export.h> |
41 | #include "drm_cache.h" | 41 | #include <drm/drm_cache.h> |
42 | #include "drm_mem_util.h" | 42 | #include <drm/drm_mem_util.h> |
43 | #include "ttm/ttm_module.h" | 43 | #include <drm/ttm/ttm_module.h> |
44 | #include "ttm/ttm_bo_driver.h" | 44 | #include <drm/ttm/ttm_bo_driver.h> |
45 | #include "ttm/ttm_placement.h" | 45 | #include <drm/ttm/ttm_placement.h> |
46 | #include "ttm/ttm_page_alloc.h" | 46 | #include <drm/ttm/ttm_page_alloc.h> |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * Allocates storage for pointers to the pages that back the ttm. | 49 | * Allocates storage for pointers to the pages that back the ttm. |
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c index 8d9dc44f1f94..627cd85521b1 100644 --- a/drivers/gpu/drm/udl/udl_connector.c +++ b/drivers/gpu/drm/udl/udl_connector.c | |||
@@ -10,10 +10,10 @@ | |||
10 | * more details. | 10 | * more details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm_crtc.h" | 14 | #include <drm/drm_crtc.h> |
15 | #include "drm_edid.h" | 15 | #include <drm/drm_edid.h> |
16 | #include "drm_crtc_helper.h" | 16 | #include <drm/drm_crtc_helper.h> |
17 | #include "udl_drv.h" | 17 | #include "udl_drv.h" |
18 | 18 | ||
19 | /* dummy connector to just get EDID, | 19 | /* dummy connector to just get EDID, |
diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 9f84128505bb..c0770dbba74a 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c | |||
@@ -7,8 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include "drm_usb.h" | 10 | #include <drm/drm_usb.h> |
11 | #include "drm_crtc_helper.h" | 11 | #include <drm/drm_crtc_helper.h> |
12 | #include "udl_drv.h" | 12 | #include "udl_drv.h" |
13 | 13 | ||
14 | static struct drm_driver driver; | 14 | static struct drm_driver driver; |
diff --git a/drivers/gpu/drm/udl/udl_encoder.c b/drivers/gpu/drm/udl/udl_encoder.c index 0731ab2e6c06..610538308f19 100644 --- a/drivers/gpu/drm/udl/udl_encoder.c +++ b/drivers/gpu/drm/udl/udl_encoder.c | |||
@@ -10,9 +10,9 @@ | |||
10 | * more details. | 10 | * more details. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "drm_crtc.h" | 14 | #include <drm/drm_crtc.h> |
15 | #include "drm_crtc_helper.h" | 15 | #include <drm/drm_crtc_helper.h> |
16 | #include "udl_drv.h" | 16 | #include "udl_drv.h" |
17 | 17 | ||
18 | /* dummy encoder */ | 18 | /* dummy encoder */ |
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index ce9a61179925..877df059a76f 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c | |||
@@ -14,13 +14,12 @@ | |||
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | 16 | ||
17 | #include "drmP.h" | 17 | #include <drm/drmP.h> |
18 | #include "drm.h" | 18 | #include <drm/drm_crtc.h> |
19 | #include "drm_crtc.h" | 19 | #include <drm/drm_crtc_helper.h> |
20 | #include "drm_crtc_helper.h" | ||
21 | #include "udl_drv.h" | 20 | #include "udl_drv.h" |
22 | 21 | ||
23 | #include "drm_fb_helper.h" | 22 | #include <drm/drm_fb_helper.h> |
24 | 23 | ||
25 | #define DL_DEFIO_WRITE_DELAY 5 /* fb_deferred_io.delay in jiffies */ | 24 | #define DL_DEFIO_WRITE_DELAY 5 /* fb_deferred_io.delay in jiffies */ |
26 | 25 | ||
diff --git a/drivers/gpu/drm/udl/udl_gem.c b/drivers/gpu/drm/udl/udl_gem.c index 291ecc145585..4acc8c7431cd 100644 --- a/drivers/gpu/drm/udl/udl_gem.c +++ b/drivers/gpu/drm/udl/udl_gem.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * more details. | 6 | * more details. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "drmP.h" | 9 | #include <drm/drmP.h> |
10 | #include "udl_drv.h" | 10 | #include "udl_drv.h" |
11 | #include <linux/shmem_fs.h> | 11 | #include <linux/shmem_fs.h> |
12 | #include <linux/dma-buf.h> | 12 | #include <linux/dma-buf.h> |
diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 4c2d836a0893..1f6dbfd62c2a 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c | |||
@@ -10,7 +10,7 @@ | |||
10 | * License v2. See the file COPYING in the main directory of this archive for | 10 | * License v2. See the file COPYING in the main directory of this archive for |
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | #include "drmP.h" | 13 | #include <drm/drmP.h> |
14 | #include "udl_drv.h" | 14 | #include "udl_drv.h" |
15 | 15 | ||
16 | /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ | 16 | /* -BULK_SIZE as per usb-skeleton. Can we get full page and avoid overhead? */ |
diff --git a/drivers/gpu/drm/udl/udl_modeset.c b/drivers/gpu/drm/udl/udl_modeset.c index 9159d48d1dfd..52ac2b2d9b73 100644 --- a/drivers/gpu/drm/udl/udl_modeset.c +++ b/drivers/gpu/drm/udl/udl_modeset.c | |||
@@ -11,9 +11,9 @@ | |||
11 | * more details. | 11 | * more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "drmP.h" | 14 | #include <drm/drmP.h> |
15 | #include "drm_crtc.h" | 15 | #include <drm/drm_crtc.h> |
16 | #include "drm_crtc_helper.h" | 16 | #include <drm/drm_crtc_helper.h> |
17 | #include "udl_drv.h" | 17 | #include "udl_drv.h" |
18 | 18 | ||
19 | /* | 19 | /* |
diff --git a/drivers/gpu/drm/udl/udl_transfer.c b/drivers/gpu/drm/udl/udl_transfer.c index b9320e2608dd..e96348143a4e 100644 --- a/drivers/gpu/drm/udl/udl_transfer.c +++ b/drivers/gpu/drm/udl/udl_transfer.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
16 | #include <linux/prefetch.h> | 16 | #include <linux/prefetch.h> |
17 | 17 | ||
18 | #include "drmP.h" | 18 | #include <drm/drmP.h> |
19 | #include "udl_drv.h" | 19 | #include "udl_drv.h" |
20 | 20 | ||
21 | #define MAX_CMD_PIXELS 255 | 21 | #define MAX_CMD_PIXELS 255 |
diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c index cc0ffa9abd00..13558f5a2422 100644 --- a/drivers/gpu/drm/via/via_dma.c +++ b/drivers/gpu/drm/via/via_dma.c | |||
@@ -34,9 +34,8 @@ | |||
34 | * Thomas Hellstrom. | 34 | * Thomas Hellstrom. |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include "drm.h" | 38 | #include <drm/via_drm.h> |
39 | #include "via_drm.h" | ||
40 | #include "via_drv.h" | 39 | #include "via_drv.h" |
41 | #include "via_3d_reg.h" | 40 | #include "via_3d_reg.h" |
42 | 41 | ||
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 3e038a394c51..8b0f25904e6d 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c | |||
@@ -34,8 +34,8 @@ | |||
34 | * the same DMA mappings? | 34 | * the same DMA mappings? |
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "drmP.h" | 37 | #include <drm/drmP.h> |
38 | #include "via_drm.h" | 38 | #include <drm/via_drm.h> |
39 | #include "via_drv.h" | 39 | #include "via_drv.h" |
40 | #include "via_dmablit.h" | 40 | #include "via_dmablit.h" |
41 | 41 | ||
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c index af1b914b17e3..f4ae20327941 100644 --- a/drivers/gpu/drm/via/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c | |||
@@ -24,11 +24,11 @@ | |||
24 | 24 | ||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | 26 | ||
27 | #include "drmP.h" | 27 | #include <drm/drmP.h> |
28 | #include "via_drm.h" | 28 | #include <drm/via_drm.h> |
29 | #include "via_drv.h" | 29 | #include "via_drv.h" |
30 | 30 | ||
31 | #include "drm_pciids.h" | 31 | #include <drm/drm_pciids.h> |
32 | 32 | ||
33 | static int via_driver_open(struct drm_device *dev, struct drm_file *file) | 33 | static int via_driver_open(struct drm_device *dev, struct drm_file *file) |
34 | { | 34 | { |
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h index 88edacc93006..893a65090c36 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifndef _VIA_DRV_H_ | 24 | #ifndef _VIA_DRV_H_ |
25 | #define _VIA_DRV_H_ | 25 | #define _VIA_DRV_H_ |
26 | 26 | ||
27 | #include "drm_mm.h" | 27 | #include <drm/drm_mm.h> |
28 | #define DRIVER_AUTHOR "Various" | 28 | #define DRIVER_AUTHOR "Various" |
29 | 29 | ||
30 | #define DRIVER_NAME "via" | 30 | #define DRIVER_NAME "via" |
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index d391f48ef87a..ac98964297cf 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c | |||
@@ -35,9 +35,8 @@ | |||
35 | * The refresh rate is also calculated for video playback sync purposes. | 35 | * The refresh rate is also calculated for video playback sync purposes. |
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "drmP.h" | 38 | #include <drm/drmP.h> |
39 | #include "drm.h" | 39 | #include <drm/via_drm.h> |
40 | #include "via_drm.h" | ||
41 | #include "via_drv.h" | 40 | #include "via_drv.h" |
42 | 41 | ||
43 | #define VIA_REG_INTERRUPT 0x200 | 42 | #define VIA_REG_INTERRUPT 0x200 |
diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c index c126182ac07e..c0f1cc7f5ca9 100644 --- a/drivers/gpu/drm/via/via_map.c +++ b/drivers/gpu/drm/via/via_map.c | |||
@@ -21,8 +21,8 @@ | |||
21 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 21 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | #include "drmP.h" | 24 | #include <drm/drmP.h> |
25 | #include "via_drm.h" | 25 | #include <drm/via_drm.h> |
26 | #include "via_drv.h" | 26 | #include "via_drv.h" |
27 | 27 | ||
28 | static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init) | 28 | static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init) |
diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c index acfcb358e7b7..0d55432e02a2 100644 --- a/drivers/gpu/drm/via/via_mm.c +++ b/drivers/gpu/drm/via/via_mm.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> | 25 | * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "via_drm.h" | 29 | #include <drm/via_drm.h> |
30 | #include "via_drv.h" | 30 | #include "via_drv.h" |
31 | 31 | ||
32 | #define VIA_MM_ALIGN_SHIFT 4 | 32 | #define VIA_MM_ALIGN_SHIFT 4 |
diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c index 48957b856d41..9dbc92bd1512 100644 --- a/drivers/gpu/drm/via/via_verifier.c +++ b/drivers/gpu/drm/via/via_verifier.c | |||
@@ -29,9 +29,8 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "via_3d_reg.h" | 31 | #include "via_3d_reg.h" |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "drm.h" | 33 | #include <drm/via_drm.h> |
34 | #include "via_drm.h" | ||
35 | #include "via_verifier.h" | 34 | #include "via_verifier.h" |
36 | #include "via_drv.h" | 35 | #include "via_drv.h" |
37 | 36 | ||
diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index 675d311f038f..6569efa2ff6e 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c | |||
@@ -25,8 +25,8 @@ | |||
25 | * Video and XvMC related functions. | 25 | * Video and XvMC related functions. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "via_drm.h" | 29 | #include <drm/via_drm.h> |
30 | #include "via_drv.h" | 30 | #include "via_drv.h" |
31 | 31 | ||
32 | void via_init_futex(drm_via_private_t *dev_priv) | 32 | void via_init_futex(drm_via_private_t *dev_priv) |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c index 1e2c0fb7f786..9826fbc88154 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | |||
@@ -26,9 +26,9 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "vmwgfx_drv.h" | 28 | #include "vmwgfx_drv.h" |
29 | #include "ttm/ttm_bo_driver.h" | 29 | #include <drm/ttm/ttm_bo_driver.h> |
30 | #include "ttm/ttm_placement.h" | 30 | #include <drm/ttm/ttm_placement.h> |
31 | #include "ttm/ttm_page_alloc.h" | 31 | #include <drm/ttm/ttm_page_alloc.h> |
32 | 32 | ||
33 | static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM | | 33 | static uint32_t vram_placement_flags = TTM_PL_FLAG_VRAM | |
34 | TTM_PL_FLAG_CACHED; | 34 | TTM_PL_FLAG_CACHED; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c index 3fa884db08ab..3ce68a2e312d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | |||
@@ -25,9 +25,9 @@ | |||
25 | * | 25 | * |
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "ttm/ttm_placement.h" | 28 | #include <drm/ttm/ttm_placement.h> |
29 | 29 | ||
30 | #include "drmP.h" | 30 | #include <drm/drmP.h> |
31 | #include "vmwgfx_drv.h" | 31 | #include "vmwgfx_drv.h" |
32 | 32 | ||
33 | 33 | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index ba2c35dbf10e..c84d9ba66f3b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -26,12 +26,12 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "vmwgfx_drv.h" | 30 | #include "vmwgfx_drv.h" |
31 | #include "ttm/ttm_placement.h" | 31 | #include <drm/ttm/ttm_placement.h> |
32 | #include "ttm/ttm_bo_driver.h" | 32 | #include <drm/ttm/ttm_bo_driver.h> |
33 | #include "ttm/ttm_object.h" | 33 | #include <drm/ttm/ttm_object.h> |
34 | #include "ttm/ttm_module.h" | 34 | #include <drm/ttm/ttm_module.h> |
35 | 35 | ||
36 | #define VMWGFX_DRIVER_NAME "vmwgfx" | 36 | #define VMWGFX_DRIVER_NAME "vmwgfx" |
37 | #define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices" | 37 | #define VMWGFX_DRIVER_DESC "Linux drm driver for VMware graphics devices" |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 29c984ff7f23..88a179e26de9 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |||
@@ -29,15 +29,15 @@ | |||
29 | #define _VMWGFX_DRV_H_ | 29 | #define _VMWGFX_DRV_H_ |
30 | 30 | ||
31 | #include "vmwgfx_reg.h" | 31 | #include "vmwgfx_reg.h" |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | #include "vmwgfx_drm.h" | 33 | #include <drm/vmwgfx_drm.h> |
34 | #include "drm_hashtab.h" | 34 | #include <drm/drm_hashtab.h> |
35 | #include "linux/suspend.h" | 35 | #include <linux/suspend.h> |
36 | #include "ttm/ttm_bo_driver.h" | 36 | #include <drm/ttm/ttm_bo_driver.h> |
37 | #include "ttm/ttm_object.h" | 37 | #include <drm/ttm/ttm_object.h> |
38 | #include "ttm/ttm_lock.h" | 38 | #include <drm/ttm/ttm_lock.h> |
39 | #include "ttm/ttm_execbuf_util.h" | 39 | #include <drm/ttm/ttm_execbuf_util.h> |
40 | #include "ttm/ttm_module.h" | 40 | #include <drm/ttm/ttm_module.h> |
41 | #include "vmwgfx_fence.h" | 41 | #include "vmwgfx_fence.h" |
42 | 42 | ||
43 | #define VMWGFX_DRIVER_DATE "20120209" | 43 | #define VMWGFX_DRIVER_DATE "20120209" |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index 4acced44a623..30654b4cc972 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | |||
@@ -27,8 +27,8 @@ | |||
27 | 27 | ||
28 | #include "vmwgfx_drv.h" | 28 | #include "vmwgfx_drv.h" |
29 | #include "vmwgfx_reg.h" | 29 | #include "vmwgfx_reg.h" |
30 | #include "ttm/ttm_bo_api.h" | 30 | #include <drm/ttm/ttm_bo_api.h> |
31 | #include "ttm/ttm_placement.h" | 31 | #include <drm/ttm/ttm_placement.h> |
32 | 32 | ||
33 | static int vmw_cmd_invalid(struct vmw_private *dev_priv, | 33 | static int vmw_cmd_invalid(struct vmw_private *dev_priv, |
34 | struct vmw_sw_context *sw_context, | 34 | struct vmw_sw_context *sw_context, |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index a32f2e96dd02..ed5ce2a41bbf 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |||
@@ -28,10 +28,10 @@ | |||
28 | 28 | ||
29 | #include <linux/export.h> | 29 | #include <linux/export.h> |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "vmwgfx_drv.h" | 32 | #include "vmwgfx_drv.h" |
33 | 33 | ||
34 | #include "ttm/ttm_placement.h" | 34 | #include <drm/ttm/ttm_placement.h> |
35 | 35 | ||
36 | #define VMW_DIRTY_DELAY (HZ / 30) | 36 | #define VMW_DIRTY_DELAY (HZ / 30) |
37 | 37 | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c index 7e0743358dff..bc187fafd58c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * | 25 | * |
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "vmwgfx_drv.h" | 29 | #include "vmwgfx_drv.h" |
30 | 30 | ||
31 | #define VMW_FENCE_WRAP (1 << 31) | 31 | #define VMW_FENCE_WRAP (1 << 31) |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c index a0c2f12b1e1b..3eb148667d63 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | |||
@@ -26,8 +26,8 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "vmwgfx_drv.h" | 28 | #include "vmwgfx_drv.h" |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "ttm/ttm_placement.h" | 30 | #include <drm/ttm/ttm_placement.h> |
31 | 31 | ||
32 | bool vmw_fifo_have_3d(struct vmw_private *dev_priv) | 32 | bool vmw_fifo_have_3d(struct vmw_private *dev_priv) |
33 | { | 33 | { |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c index 21ee78226560..3751730764a5 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | |||
@@ -26,8 +26,8 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "vmwgfx_drv.h" | 28 | #include "vmwgfx_drv.h" |
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "ttm/ttm_bo_driver.h" | 30 | #include <drm/ttm/ttm_bo_driver.h> |
31 | 31 | ||
32 | #define VMW_PPN_SIZE sizeof(unsigned long) | 32 | #define VMW_PPN_SIZE sizeof(unsigned long) |
33 | 33 | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c index 5f717152cff5..c5c054ae9056 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | |||
@@ -29,9 +29,9 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "vmwgfx_drv.h" | 31 | #include "vmwgfx_drv.h" |
32 | #include "ttm/ttm_module.h" | 32 | #include <drm/ttm/ttm_module.h> |
33 | #include "ttm/ttm_bo_driver.h" | 33 | #include <drm/ttm/ttm_bo_driver.h> |
34 | #include "ttm/ttm_placement.h" | 34 | #include <drm/ttm/ttm_placement.h> |
35 | #include <linux/idr.h> | 35 | #include <linux/idr.h> |
36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index 66917c6c3813..b07ca2e4d04b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | |||
@@ -26,7 +26,7 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "vmwgfx_drv.h" | 28 | #include "vmwgfx_drv.h" |
29 | #include "vmwgfx_drm.h" | 29 | #include <drm/vmwgfx_drm.h> |
30 | #include "vmwgfx_kms.h" | 30 | #include "vmwgfx_kms.h" |
31 | 31 | ||
32 | int vmw_getparam_ioctl(struct drm_device *dev, void *data, | 32 | int vmw_getparam_ioctl(struct drm_device *dev, void *data, |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c index cabc95f7517e..4640adbcaf91 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * | 25 | * |
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "vmwgfx_drv.h" | 29 | #include "vmwgfx_drv.h" |
30 | 30 | ||
31 | #define VMW_FENCE_WRAP (1 << 24) | 31 | #define VMW_FENCE_WRAP (1 << 24) |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h index 8184bc5b1730..6fa89c9d6214 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | |||
@@ -28,8 +28,8 @@ | |||
28 | #ifndef VMWGFX_KMS_H_ | 28 | #ifndef VMWGFX_KMS_H_ |
29 | #define VMWGFX_KMS_H_ | 29 | #define VMWGFX_KMS_H_ |
30 | 30 | ||
31 | #include "drmP.h" | 31 | #include <drm/drmP.h> |
32 | #include "drm_crtc_helper.h" | 32 | #include <drm/drm_crtc_helper.h> |
33 | #include "vmwgfx_drv.h" | 33 | #include "vmwgfx_drv.h" |
34 | 34 | ||
35 | #define VMWGFX_NUM_DISPLAY_UNITS 8 | 35 | #define VMWGFX_NUM_DISPLAY_UNITS 8 |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c index 14399eec9c3c..cb55b7b66377 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | |||
@@ -26,10 +26,10 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | 28 | ||
29 | #include "drmP.h" | 29 | #include <drm/drmP.h> |
30 | #include "vmwgfx_drv.h" | 30 | #include "vmwgfx_drv.h" |
31 | 31 | ||
32 | #include "ttm/ttm_placement.h" | 32 | #include <drm/ttm/ttm_placement.h> |
33 | 33 | ||
34 | #include "svga_overlay.h" | 34 | #include "svga_overlay.h" |
35 | #include "svga_escape.h" | 35 | #include "svga_escape.h" |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 2c6ffe0e2c07..da3c6b5b98a1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |||
@@ -26,10 +26,10 @@ | |||
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "vmwgfx_drv.h" | 28 | #include "vmwgfx_drv.h" |
29 | #include "vmwgfx_drm.h" | 29 | #include <drm/vmwgfx_drm.h> |
30 | #include "ttm/ttm_object.h" | 30 | #include <drm/ttm/ttm_object.h> |
31 | #include "ttm/ttm_placement.h" | 31 | #include <drm/ttm/ttm_placement.h> |
32 | #include "drmP.h" | 32 | #include <drm/drmP.h> |
33 | 33 | ||
34 | struct vmw_user_context { | 34 | struct vmw_user_context { |
35 | struct ttm_base_object base; | 35 | struct ttm_base_object base; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c index d3c11f5184f3..98d6bfb3a997 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * | 25 | * |
26 | **************************************************************************/ | 26 | **************************************************************************/ |
27 | 27 | ||
28 | #include "drmP.h" | 28 | #include <drm/drmP.h> |
29 | #include "vmwgfx_drv.h" | 29 | #include "vmwgfx_drv.h" |
30 | 30 | ||
31 | int vmw_mmap(struct file *filp, struct vm_area_struct *vma) | 31 | int vmw_mmap(struct file *filp, struct vm_area_struct *vma) |
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 682633bfe00f..05593d882023 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk) | |||
635 | return; | 635 | return; |
636 | 636 | ||
637 | BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op)); | 637 | BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op)); |
638 | ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op, | 638 | gnttab_batch_copy(netbk->grant_copy_op, npo.copy_prod); |
639 | npo.copy_prod); | ||
640 | BUG_ON(ret != 0); | ||
641 | 639 | ||
642 | while ((skb = __skb_dequeue(&rxq)) != NULL) { | 640 | while ((skb = __skb_dequeue(&rxq)) != NULL) { |
643 | sco = (struct skb_cb_overlay *)skb->cb; | 641 | sco = (struct skb_cb_overlay *)skb->cb; |
@@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk) | |||
1460 | static void xen_netbk_tx_action(struct xen_netbk *netbk) | 1458 | static void xen_netbk_tx_action(struct xen_netbk *netbk) |
1461 | { | 1459 | { |
1462 | unsigned nr_gops; | 1460 | unsigned nr_gops; |
1463 | int ret; | ||
1464 | 1461 | ||
1465 | nr_gops = xen_netbk_tx_build_gops(netbk); | 1462 | nr_gops = xen_netbk_tx_build_gops(netbk); |
1466 | 1463 | ||
1467 | if (nr_gops == 0) | 1464 | if (nr_gops == 0) |
1468 | return; | 1465 | return; |
1469 | ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, | ||
1470 | netbk->tx_copy_ops, nr_gops); | ||
1471 | BUG_ON(ret); | ||
1472 | 1466 | ||
1473 | xen_netbk_tx_submit(netbk); | 1467 | gnttab_batch_copy(netbk->tx_copy_ops, nr_gops); |
1474 | 1468 | ||
1469 | xen_netbk_tx_submit(netbk); | ||
1475 | } | 1470 | } |
1476 | 1471 | ||
1477 | static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx) | 1472 | static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx) |
diff --git a/drivers/of/address.c b/drivers/of/address.c index 7e262a6124c5..72e496f1e9b0 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c | |||
@@ -9,8 +9,8 @@ | |||
9 | 9 | ||
10 | /* Max address size we deal with */ | 10 | /* Max address size we deal with */ |
11 | #define OF_MAX_ADDR_CELLS 4 | 11 | #define OF_MAX_ADDR_CELLS 4 |
12 | #define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ | 12 | #define OF_CHECK_ADDR_COUNT(na) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS) |
13 | (ns) > 0) | 13 | #define OF_CHECK_COUNTS(na, ns) (OF_CHECK_ADDR_COUNT(na) && (ns) > 0) |
14 | 14 | ||
15 | static struct of_bus *of_match_bus(struct device_node *np); | 15 | static struct of_bus *of_match_bus(struct device_node *np); |
16 | static int __of_address_to_resource(struct device_node *dev, | 16 | static int __of_address_to_resource(struct device_node *dev, |
@@ -69,6 +69,14 @@ static u64 of_bus_default_map(u32 *addr, const __be32 *range, | |||
69 | (unsigned long long)cp, (unsigned long long)s, | 69 | (unsigned long long)cp, (unsigned long long)s, |
70 | (unsigned long long)da); | 70 | (unsigned long long)da); |
71 | 71 | ||
72 | /* | ||
73 | * If the number of address cells is larger than 2 we assume the | ||
74 | * mapping doesn't specify a physical address. Rather, the address | ||
75 | * specifies an identifier that must match exactly. | ||
76 | */ | ||
77 | if (na > 2 && memcmp(range, addr, na * 4) != 0) | ||
78 | return OF_BAD_ADDR; | ||
79 | |||
72 | if (da < cp || da >= (cp + s)) | 80 | if (da < cp || da >= (cp + s)) |
73 | return OF_BAD_ADDR; | 81 | return OF_BAD_ADDR; |
74 | return da - cp; | 82 | return da - cp; |
@@ -182,7 +190,7 @@ const __be32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size, | |||
182 | } | 190 | } |
183 | bus->count_cells(dev, &na, &ns); | 191 | bus->count_cells(dev, &na, &ns); |
184 | of_node_put(parent); | 192 | of_node_put(parent); |
185 | if (!OF_CHECK_COUNTS(na, ns)) | 193 | if (!OF_CHECK_ADDR_COUNT(na)) |
186 | return NULL; | 194 | return NULL; |
187 | 195 | ||
188 | /* Get "reg" or "assigned-addresses" property */ | 196 | /* Get "reg" or "assigned-addresses" property */ |
@@ -490,6 +498,25 @@ u64 of_translate_dma_address(struct device_node *dev, const __be32 *in_addr) | |||
490 | } | 498 | } |
491 | EXPORT_SYMBOL(of_translate_dma_address); | 499 | EXPORT_SYMBOL(of_translate_dma_address); |
492 | 500 | ||
501 | bool of_can_translate_address(struct device_node *dev) | ||
502 | { | ||
503 | struct device_node *parent; | ||
504 | struct of_bus *bus; | ||
505 | int na, ns; | ||
506 | |||
507 | parent = of_get_parent(dev); | ||
508 | if (parent == NULL) | ||
509 | return false; | ||
510 | |||
511 | bus = of_match_bus(parent); | ||
512 | bus->count_cells(dev, &na, &ns); | ||
513 | |||
514 | of_node_put(parent); | ||
515 | |||
516 | return OF_CHECK_COUNTS(na, ns); | ||
517 | } | ||
518 | EXPORT_SYMBOL(of_can_translate_address); | ||
519 | |||
493 | const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, | 520 | const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, |
494 | unsigned int *flags) | 521 | unsigned int *flags) |
495 | { | 522 | { |
@@ -506,7 +533,7 @@ const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, | |||
506 | bus = of_match_bus(parent); | 533 | bus = of_match_bus(parent); |
507 | bus->count_cells(dev, &na, &ns); | 534 | bus->count_cells(dev, &na, &ns); |
508 | of_node_put(parent); | 535 | of_node_put(parent); |
509 | if (!OF_CHECK_COUNTS(na, ns)) | 536 | if (!OF_CHECK_ADDR_COUNT(na)) |
510 | return NULL; | 537 | return NULL; |
511 | 538 | ||
512 | /* Get "reg" or "assigned-addresses" property */ | 539 | /* Get "reg" or "assigned-addresses" property */ |
diff --git a/drivers/of/base.c b/drivers/of/base.c index d4a1c9a043e1..af3b22ac7627 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
@@ -391,6 +391,29 @@ struct device_node *of_get_next_available_child(const struct device_node *node, | |||
391 | EXPORT_SYMBOL(of_get_next_available_child); | 391 | EXPORT_SYMBOL(of_get_next_available_child); |
392 | 392 | ||
393 | /** | 393 | /** |
394 | * of_get_child_by_name - Find the child node by name for a given parent | ||
395 | * @node: parent node | ||
396 | * @name: child name to look for. | ||
397 | * | ||
398 | * This function looks for child node for given matching name | ||
399 | * | ||
400 | * Returns a node pointer if found, with refcount incremented, use | ||
401 | * of_node_put() on it when done. | ||
402 | * Returns NULL if node is not found. | ||
403 | */ | ||
404 | struct device_node *of_get_child_by_name(const struct device_node *node, | ||
405 | const char *name) | ||
406 | { | ||
407 | struct device_node *child; | ||
408 | |||
409 | for_each_child_of_node(node, child) | ||
410 | if (child->name && (of_node_cmp(child->name, name) == 0)) | ||
411 | break; | ||
412 | return child; | ||
413 | } | ||
414 | EXPORT_SYMBOL(of_get_child_by_name); | ||
415 | |||
416 | /** | ||
394 | * of_find_node_by_path - Find a node matching a full OF path | 417 | * of_find_node_by_path - Find a node matching a full OF path |
395 | * @path: The full path to match | 418 | * @path: The full path to match |
396 | * | 419 | * |
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index ff8ab7b27373..a23ec7779997 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c | |||
@@ -392,6 +392,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res, | |||
392 | 392 | ||
393 | return i; | 393 | return i; |
394 | } | 394 | } |
395 | EXPORT_SYMBOL_GPL(of_irq_to_resource_table); | ||
395 | 396 | ||
396 | struct intc_desc { | 397 | struct intc_desc { |
397 | struct list_head list; | 398 | struct list_head list; |
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c index 1e173f357674..3550f3bf4f92 100644 --- a/drivers/of/of_i2c.c +++ b/drivers/of/of_i2c.c | |||
@@ -61,6 +61,9 @@ void of_i2c_register_devices(struct i2c_adapter *adap) | |||
61 | info.of_node = of_node_get(node); | 61 | info.of_node = of_node_get(node); |
62 | info.archdata = &dev_ad; | 62 | info.archdata = &dev_ad; |
63 | 63 | ||
64 | if (of_get_property(node, "wakeup-source", NULL)) | ||
65 | info.flags |= I2C_CLIENT_WAKE; | ||
66 | |||
64 | request_module("%s%s", I2C_MODULE_PREFIX, info.type); | 67 | request_module("%s%s", I2C_MODULE_PREFIX, info.type); |
65 | 68 | ||
66 | result = i2c_new_device(adap, &info); | 69 | result = i2c_new_device(adap, &info); |
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index e44f8c2d239d..9bdeaf30b17d 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c | |||
@@ -78,6 +78,7 @@ void of_device_make_bus_id(struct device *dev) | |||
78 | struct device_node *node = dev->of_node; | 78 | struct device_node *node = dev->of_node; |
79 | const u32 *reg; | 79 | const u32 *reg; |
80 | u64 addr; | 80 | u64 addr; |
81 | const __be32 *addrp; | ||
81 | int magic; | 82 | int magic; |
82 | 83 | ||
83 | #ifdef CONFIG_PPC_DCR | 84 | #ifdef CONFIG_PPC_DCR |
@@ -105,7 +106,15 @@ void of_device_make_bus_id(struct device *dev) | |||
105 | */ | 106 | */ |
106 | reg = of_get_property(node, "reg", NULL); | 107 | reg = of_get_property(node, "reg", NULL); |
107 | if (reg) { | 108 | if (reg) { |
108 | addr = of_translate_address(node, reg); | 109 | if (of_can_translate_address(node)) { |
110 | addr = of_translate_address(node, reg); | ||
111 | } else { | ||
112 | addrp = of_get_address(node, 0, NULL, NULL); | ||
113 | if (addrp) | ||
114 | addr = of_read_number(addrp, 1); | ||
115 | else | ||
116 | addr = OF_BAD_ADDR; | ||
117 | } | ||
109 | if (addr != OF_BAD_ADDR) { | 118 | if (addr != OF_BAD_ADDR) { |
110 | dev_set_name(dev, "%llx.%s", | 119 | dev_set_name(dev, "%llx.%s", |
111 | (unsigned long long)addr, node->name); | 120 | (unsigned long long)addr, node->name); |
@@ -140,8 +149,9 @@ struct platform_device *of_device_alloc(struct device_node *np, | |||
140 | return NULL; | 149 | return NULL; |
141 | 150 | ||
142 | /* count the io and irq resources */ | 151 | /* count the io and irq resources */ |
143 | while (of_address_to_resource(np, num_reg, &temp_res) == 0) | 152 | if (of_can_translate_address(np)) |
144 | num_reg++; | 153 | while (of_address_to_resource(np, num_reg, &temp_res) == 0) |
154 | num_reg++; | ||
145 | num_irq = of_irq_count(np); | 155 | num_irq = of_irq_count(np); |
146 | 156 | ||
147 | /* Populate the resource table */ | 157 | /* Populate the resource table */ |
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c index def8d0b5620c..0aab85a51559 100644 --- a/drivers/pci/xen-pcifront.c +++ b/drivers/pci/xen-pcifront.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/bitops.h> | 21 | #include <linux/bitops.h> |
22 | #include <linux/time.h> | 22 | #include <linux/time.h> |
23 | 23 | ||
24 | #include <asm/xen/swiotlb-xen.h> | ||
24 | #define INVALID_GRANT_REF (0) | 25 | #define INVALID_GRANT_REF (0) |
25 | #define INVALID_EVTCHN (-1) | 26 | #define INVALID_EVTCHN (-1) |
26 | 27 | ||
@@ -236,7 +237,7 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn, | |||
236 | return errno_to_pcibios_err(do_pci_op(pdev, &op)); | 237 | return errno_to_pcibios_err(do_pci_op(pdev, &op)); |
237 | } | 238 | } |
238 | 239 | ||
239 | struct pci_ops pcifront_bus_ops = { | 240 | static struct pci_ops pcifront_bus_ops = { |
240 | .read = pcifront_bus_read, | 241 | .read = pcifront_bus_read, |
241 | .write = pcifront_bus_write, | 242 | .write = pcifront_bus_write, |
242 | }; | 243 | }; |
@@ -668,7 +669,7 @@ static irqreturn_t pcifront_handler_aer(int irq, void *dev) | |||
668 | schedule_pcifront_aer_op(pdev); | 669 | schedule_pcifront_aer_op(pdev); |
669 | return IRQ_HANDLED; | 670 | return IRQ_HANDLED; |
670 | } | 671 | } |
671 | static int pcifront_connect(struct pcifront_device *pdev) | 672 | static int pcifront_connect_and_init_dma(struct pcifront_device *pdev) |
672 | { | 673 | { |
673 | int err = 0; | 674 | int err = 0; |
674 | 675 | ||
@@ -681,9 +682,13 @@ static int pcifront_connect(struct pcifront_device *pdev) | |||
681 | dev_err(&pdev->xdev->dev, "PCI frontend already installed!\n"); | 682 | dev_err(&pdev->xdev->dev, "PCI frontend already installed!\n"); |
682 | err = -EEXIST; | 683 | err = -EEXIST; |
683 | } | 684 | } |
684 | |||
685 | spin_unlock(&pcifront_dev_lock); | 685 | spin_unlock(&pcifront_dev_lock); |
686 | 686 | ||
687 | if (!err && !swiotlb_nr_tbl()) { | ||
688 | err = pci_xen_swiotlb_init_late(); | ||
689 | if (err) | ||
690 | dev_err(&pdev->xdev->dev, "Could not setup SWIOTLB!\n"); | ||
691 | } | ||
687 | return err; | 692 | return err; |
688 | } | 693 | } |
689 | 694 | ||
@@ -842,10 +847,10 @@ static int __devinit pcifront_try_connect(struct pcifront_device *pdev) | |||
842 | XenbusStateInitialised) | 847 | XenbusStateInitialised) |
843 | goto out; | 848 | goto out; |
844 | 849 | ||
845 | err = pcifront_connect(pdev); | 850 | err = pcifront_connect_and_init_dma(pdev); |
846 | if (err) { | 851 | if (err) { |
847 | xenbus_dev_fatal(pdev->xdev, err, | 852 | xenbus_dev_fatal(pdev->xdev, err, |
848 | "Error connecting PCI Frontend"); | 853 | "Error setting up PCI Frontend"); |
849 | goto out; | 854 | goto out; |
850 | } | 855 | } |
851 | 856 | ||
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 1860c3aca7e2..1a81c90a4a71 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c | |||
@@ -835,9 +835,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( | |||
835 | return ERR_PTR(-EINVAL); | 835 | return ERR_PTR(-EINVAL); |
836 | } | 836 | } |
837 | 837 | ||
838 | for_each_child_of_node(slave_np, data_np) | 838 | data_np = of_get_child_by_name(slave_np, "controller-data"); |
839 | if (!strcmp(data_np->name, "controller-data")) | ||
840 | break; | ||
841 | if (!data_np) { | 839 | if (!data_np) { |
842 | dev_err(&spi->dev, "child node 'controller-data' not found\n"); | 840 | dev_err(&spi->dev, "child node 'controller-data' not found\n"); |
843 | return ERR_PTR(-EINVAL); | 841 | return ERR_PTR(-EINVAL); |
@@ -847,6 +845,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( | |||
847 | if (!cs) { | 845 | if (!cs) { |
848 | dev_err(&spi->dev, "could not allocate memory for controller" | 846 | dev_err(&spi->dev, "could not allocate memory for controller" |
849 | " data\n"); | 847 | " data\n"); |
848 | of_node_put(data_np); | ||
850 | return ERR_PTR(-ENOMEM); | 849 | return ERR_PTR(-ENOMEM); |
851 | } | 850 | } |
852 | 851 | ||
@@ -855,11 +854,13 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( | |||
855 | dev_err(&spi->dev, "chip select gpio is not specified or " | 854 | dev_err(&spi->dev, "chip select gpio is not specified or " |
856 | "invalid\n"); | 855 | "invalid\n"); |
857 | kfree(cs); | 856 | kfree(cs); |
857 | of_node_put(data_np); | ||
858 | return ERR_PTR(-EINVAL); | 858 | return ERR_PTR(-EINVAL); |
859 | } | 859 | } |
860 | 860 | ||
861 | of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay); | 861 | of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay); |
862 | cs->fb_delay = fb_delay; | 862 | cs->fb_delay = fb_delay; |
863 | of_node_put(data_np); | ||
863 | return cs; | 864 | return cs; |
864 | } | 865 | } |
865 | 866 | ||
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 1e456dca4f60..2944ff88fdc0 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/console.h> | 21 | #include <linux/console.h> |
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | #include <linux/err.h> | 23 | #include <linux/err.h> |
24 | #include <linux/irq.h> | ||
24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
25 | #include <linux/types.h> | 26 | #include <linux/types.h> |
26 | #include <linux/list.h> | 27 | #include <linux/list.h> |
@@ -35,6 +36,7 @@ | |||
35 | #include <xen/page.h> | 36 | #include <xen/page.h> |
36 | #include <xen/events.h> | 37 | #include <xen/events.h> |
37 | #include <xen/interface/io/console.h> | 38 | #include <xen/interface/io/console.h> |
39 | #include <xen/interface/sched.h> | ||
38 | #include <xen/hvc-console.h> | 40 | #include <xen/hvc-console.h> |
39 | #include <xen/xenbus.h> | 41 | #include <xen/xenbus.h> |
40 | 42 | ||
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 7595581d032c..c60d1629c916 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
@@ -373,11 +373,22 @@ static void unmask_evtchn(int port) | |||
373 | { | 373 | { |
374 | struct shared_info *s = HYPERVISOR_shared_info; | 374 | struct shared_info *s = HYPERVISOR_shared_info; |
375 | unsigned int cpu = get_cpu(); | 375 | unsigned int cpu = get_cpu(); |
376 | int do_hypercall = 0, evtchn_pending = 0; | ||
376 | 377 | ||
377 | BUG_ON(!irqs_disabled()); | 378 | BUG_ON(!irqs_disabled()); |
378 | 379 | ||
379 | /* Slow path (hypercall) if this is a non-local port. */ | 380 | if (unlikely((cpu != cpu_from_evtchn(port)))) |
380 | if (unlikely(cpu != cpu_from_evtchn(port))) { | 381 | do_hypercall = 1; |
382 | else | ||
383 | evtchn_pending = sync_test_bit(port, &s->evtchn_pending[0]); | ||
384 | |||
385 | if (unlikely(evtchn_pending && xen_hvm_domain())) | ||
386 | do_hypercall = 1; | ||
387 | |||
388 | /* Slow path (hypercall) if this is a non-local port or if this is | ||
389 | * an hvm domain and an event is pending (hvm domains don't have | ||
390 | * their own implementation of irq_enable). */ | ||
391 | if (do_hypercall) { | ||
381 | struct evtchn_unmask unmask = { .port = port }; | 392 | struct evtchn_unmask unmask = { .port = port }; |
382 | (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask); | 393 | (void)HYPERVISOR_event_channel_op(EVTCHNOP_unmask, &unmask); |
383 | } else { | 394 | } else { |
@@ -390,7 +401,7 @@ static void unmask_evtchn(int port) | |||
390 | * 'hw_resend_irq'. Just like a real IO-APIC we 'lose | 401 | * 'hw_resend_irq'. Just like a real IO-APIC we 'lose |
391 | * the interrupt edge' if the channel is masked. | 402 | * the interrupt edge' if the channel is masked. |
392 | */ | 403 | */ |
393 | if (sync_test_bit(port, &s->evtchn_pending[0]) && | 404 | if (evtchn_pending && |
394 | !sync_test_and_set_bit(port / BITS_PER_LONG, | 405 | !sync_test_and_set_bit(port / BITS_PER_LONG, |
395 | &vcpu_info->evtchn_pending_sel)) | 406 | &vcpu_info->evtchn_pending_sel)) |
396 | vcpu_info->evtchn_upcall_pending = 1; | 407 | vcpu_info->evtchn_upcall_pending = 1; |
@@ -831,6 +842,7 @@ int bind_evtchn_to_irq(unsigned int evtchn) | |||
831 | struct irq_info *info = info_for_irq(irq); | 842 | struct irq_info *info = info_for_irq(irq); |
832 | WARN_ON(info == NULL || info->type != IRQT_EVTCHN); | 843 | WARN_ON(info == NULL || info->type != IRQT_EVTCHN); |
833 | } | 844 | } |
845 | irq_clear_status_flags(irq, IRQ_NOREQUEST|IRQ_NOAUTOEN); | ||
834 | 846 | ||
835 | out: | 847 | out: |
836 | mutex_unlock(&irq_mapping_update_lock); | 848 | mutex_unlock(&irq_mapping_update_lock); |
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 7f1241608489..5df9fd847b2e 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c | |||
@@ -446,7 +446,7 @@ static void mn_release(struct mmu_notifier *mn, | |||
446 | spin_unlock(&priv->lock); | 446 | spin_unlock(&priv->lock); |
447 | } | 447 | } |
448 | 448 | ||
449 | struct mmu_notifier_ops gntdev_mmu_ops = { | 449 | static struct mmu_notifier_ops gntdev_mmu_ops = { |
450 | .release = mn_release, | 450 | .release = mn_release, |
451 | .invalidate_page = mn_invl_page, | 451 | .invalidate_page = mn_invl_page, |
452 | .invalidate_range_start = mn_invl_range_start, | 452 | .invalidate_range_start = mn_invl_range_start, |
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 006726688baf..b2b0a375b348 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <linux/vmalloc.h> | 38 | #include <linux/vmalloc.h> |
39 | #include <linux/uaccess.h> | 39 | #include <linux/uaccess.h> |
40 | #include <linux/io.h> | 40 | #include <linux/io.h> |
41 | #include <linux/delay.h> | ||
41 | #include <linux/hardirq.h> | 42 | #include <linux/hardirq.h> |
42 | 43 | ||
43 | #include <xen/xen.h> | 44 | #include <xen/xen.h> |
@@ -47,6 +48,7 @@ | |||
47 | #include <xen/interface/memory.h> | 48 | #include <xen/interface/memory.h> |
48 | #include <xen/hvc-console.h> | 49 | #include <xen/hvc-console.h> |
49 | #include <asm/xen/hypercall.h> | 50 | #include <asm/xen/hypercall.h> |
51 | #include <asm/xen/interface.h> | ||
50 | 52 | ||
51 | #include <asm/pgtable.h> | 53 | #include <asm/pgtable.h> |
52 | #include <asm/sync_bitops.h> | 54 | #include <asm/sync_bitops.h> |
@@ -285,10 +287,9 @@ int gnttab_grant_foreign_access(domid_t domid, unsigned long frame, | |||
285 | } | 287 | } |
286 | EXPORT_SYMBOL_GPL(gnttab_grant_foreign_access); | 288 | EXPORT_SYMBOL_GPL(gnttab_grant_foreign_access); |
287 | 289 | ||
288 | void gnttab_update_subpage_entry_v2(grant_ref_t ref, domid_t domid, | 290 | static void gnttab_update_subpage_entry_v2(grant_ref_t ref, domid_t domid, |
289 | unsigned long frame, int flags, | 291 | unsigned long frame, int flags, |
290 | unsigned page_off, | 292 | unsigned page_off, unsigned length) |
291 | unsigned length) | ||
292 | { | 293 | { |
293 | gnttab_shared.v2[ref].sub_page.frame = frame; | 294 | gnttab_shared.v2[ref].sub_page.frame = frame; |
294 | gnttab_shared.v2[ref].sub_page.page_off = page_off; | 295 | gnttab_shared.v2[ref].sub_page.page_off = page_off; |
@@ -345,9 +346,9 @@ bool gnttab_subpage_grants_available(void) | |||
345 | } | 346 | } |
346 | EXPORT_SYMBOL_GPL(gnttab_subpage_grants_available); | 347 | EXPORT_SYMBOL_GPL(gnttab_subpage_grants_available); |
347 | 348 | ||
348 | void gnttab_update_trans_entry_v2(grant_ref_t ref, domid_t domid, | 349 | static void gnttab_update_trans_entry_v2(grant_ref_t ref, domid_t domid, |
349 | int flags, domid_t trans_domid, | 350 | int flags, domid_t trans_domid, |
350 | grant_ref_t trans_gref) | 351 | grant_ref_t trans_gref) |
351 | { | 352 | { |
352 | gnttab_shared.v2[ref].transitive.trans_domid = trans_domid; | 353 | gnttab_shared.v2[ref].transitive.trans_domid = trans_domid; |
353 | gnttab_shared.v2[ref].transitive.gref = trans_gref; | 354 | gnttab_shared.v2[ref].transitive.gref = trans_gref; |
@@ -823,6 +824,52 @@ unsigned int gnttab_max_grant_frames(void) | |||
823 | } | 824 | } |
824 | EXPORT_SYMBOL_GPL(gnttab_max_grant_frames); | 825 | EXPORT_SYMBOL_GPL(gnttab_max_grant_frames); |
825 | 826 | ||
827 | /* Handling of paged out grant targets (GNTST_eagain) */ | ||
828 | #define MAX_DELAY 256 | ||
829 | static inline void | ||
830 | gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status, | ||
831 | const char *func) | ||
832 | { | ||
833 | unsigned delay = 1; | ||
834 | |||
835 | do { | ||
836 | BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1)); | ||
837 | if (*status == GNTST_eagain) | ||
838 | msleep(delay++); | ||
839 | } while ((*status == GNTST_eagain) && (delay < MAX_DELAY)); | ||
840 | |||
841 | if (delay >= MAX_DELAY) { | ||
842 | printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm); | ||
843 | *status = GNTST_bad_page; | ||
844 | } | ||
845 | } | ||
846 | |||
847 | void gnttab_batch_map(struct gnttab_map_grant_ref *batch, unsigned count) | ||
848 | { | ||
849 | struct gnttab_map_grant_ref *op; | ||
850 | |||
851 | if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, batch, count)) | ||
852 | BUG(); | ||
853 | for (op = batch; op < batch + count; op++) | ||
854 | if (op->status == GNTST_eagain) | ||
855 | gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, op, | ||
856 | &op->status, __func__); | ||
857 | } | ||
858 | EXPORT_SYMBOL_GPL(gnttab_batch_map); | ||
859 | |||
860 | void gnttab_batch_copy(struct gnttab_copy *batch, unsigned count) | ||
861 | { | ||
862 | struct gnttab_copy *op; | ||
863 | |||
864 | if (HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count)) | ||
865 | BUG(); | ||
866 | for (op = batch; op < batch + count; op++) | ||
867 | if (op->status == GNTST_eagain) | ||
868 | gnttab_retry_eagain_gop(GNTTABOP_copy, op, | ||
869 | &op->status, __func__); | ||
870 | } | ||
871 | EXPORT_SYMBOL_GPL(gnttab_batch_copy); | ||
872 | |||
826 | int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, | 873 | int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, |
827 | struct gnttab_map_grant_ref *kmap_ops, | 874 | struct gnttab_map_grant_ref *kmap_ops, |
828 | struct page **pages, unsigned int count) | 875 | struct page **pages, unsigned int count) |
@@ -836,6 +883,12 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops, | |||
836 | if (ret) | 883 | if (ret) |
837 | return ret; | 884 | return ret; |
838 | 885 | ||
886 | /* Retry eagain maps */ | ||
887 | for (i = 0; i < count; i++) | ||
888 | if (map_ops[i].status == GNTST_eagain) | ||
889 | gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, map_ops + i, | ||
890 | &map_ops[i].status, __func__); | ||
891 | |||
839 | if (xen_feature(XENFEAT_auto_translated_physmap)) | 892 | if (xen_feature(XENFEAT_auto_translated_physmap)) |
840 | return ret; | 893 | return ret; |
841 | 894 | ||
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index ccee0f16bcf8..ef6389580b8c 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c | |||
@@ -76,7 +76,7 @@ static void free_page_list(struct list_head *pages) | |||
76 | */ | 76 | */ |
77 | static int gather_array(struct list_head *pagelist, | 77 | static int gather_array(struct list_head *pagelist, |
78 | unsigned nelem, size_t size, | 78 | unsigned nelem, size_t size, |
79 | void __user *data) | 79 | const void __user *data) |
80 | { | 80 | { |
81 | unsigned pageidx; | 81 | unsigned pageidx; |
82 | void *pagedata; | 82 | void *pagedata; |
@@ -246,61 +246,117 @@ struct mmap_batch_state { | |||
246 | domid_t domain; | 246 | domid_t domain; |
247 | unsigned long va; | 247 | unsigned long va; |
248 | struct vm_area_struct *vma; | 248 | struct vm_area_struct *vma; |
249 | int err; | 249 | /* A tristate: |
250 | 250 | * 0 for no errors | |
251 | xen_pfn_t __user *user; | 251 | * 1 if at least one error has happened (and no |
252 | * -ENOENT errors have happened) | ||
253 | * -ENOENT if at least 1 -ENOENT has happened. | ||
254 | */ | ||
255 | int global_error; | ||
256 | /* An array for individual errors */ | ||
257 | int *err; | ||
258 | |||
259 | /* User-space mfn array to store errors in the second pass for V1. */ | ||
260 | xen_pfn_t __user *user_mfn; | ||
252 | }; | 261 | }; |
253 | 262 | ||
254 | static int mmap_batch_fn(void *data, void *state) | 263 | static int mmap_batch_fn(void *data, void *state) |
255 | { | 264 | { |
256 | xen_pfn_t *mfnp = data; | 265 | xen_pfn_t *mfnp = data; |
257 | struct mmap_batch_state *st = state; | 266 | struct mmap_batch_state *st = state; |
267 | int ret; | ||
268 | |||
269 | ret = xen_remap_domain_mfn_range(st->vma, st->va & PAGE_MASK, *mfnp, 1, | ||
270 | st->vma->vm_page_prot, st->domain); | ||
258 | 271 | ||
259 | if (xen_remap_domain_mfn_range(st->vma, st->va & PAGE_MASK, *mfnp, 1, | 272 | /* Store error code for second pass. */ |
260 | st->vma->vm_page_prot, st->domain) < 0) { | 273 | *(st->err++) = ret; |
261 | *mfnp |= 0xf0000000U; | 274 | |
262 | st->err++; | 275 | /* And see if it affects the global_error. */ |
276 | if (ret < 0) { | ||
277 | if (ret == -ENOENT) | ||
278 | st->global_error = -ENOENT; | ||
279 | else { | ||
280 | /* Record that at least one error has happened. */ | ||
281 | if (st->global_error == 0) | ||
282 | st->global_error = 1; | ||
283 | } | ||
263 | } | 284 | } |
264 | st->va += PAGE_SIZE; | 285 | st->va += PAGE_SIZE; |
265 | 286 | ||
266 | return 0; | 287 | return 0; |
267 | } | 288 | } |
268 | 289 | ||
269 | static int mmap_return_errors(void *data, void *state) | 290 | static int mmap_return_errors_v1(void *data, void *state) |
270 | { | 291 | { |
271 | xen_pfn_t *mfnp = data; | 292 | xen_pfn_t *mfnp = data; |
272 | struct mmap_batch_state *st = state; | 293 | struct mmap_batch_state *st = state; |
273 | 294 | int err = *(st->err++); | |
274 | return put_user(*mfnp, st->user++); | 295 | |
296 | /* | ||
297 | * V1 encodes the error codes in the 32bit top nibble of the | ||
298 | * mfn (with its known limitations vis-a-vis 64 bit callers). | ||
299 | */ | ||
300 | *mfnp |= (err == -ENOENT) ? | ||
301 | PRIVCMD_MMAPBATCH_PAGED_ERROR : | ||
302 | PRIVCMD_MMAPBATCH_MFN_ERROR; | ||
303 | return __put_user(*mfnp, st->user_mfn++); | ||
275 | } | 304 | } |
276 | 305 | ||
277 | static struct vm_operations_struct privcmd_vm_ops; | 306 | static struct vm_operations_struct privcmd_vm_ops; |
278 | 307 | ||
279 | static long privcmd_ioctl_mmap_batch(void __user *udata) | 308 | static long privcmd_ioctl_mmap_batch(void __user *udata, int version) |
280 | { | 309 | { |
281 | int ret; | 310 | int ret; |
282 | struct privcmd_mmapbatch m; | 311 | struct privcmd_mmapbatch_v2 m; |
283 | struct mm_struct *mm = current->mm; | 312 | struct mm_struct *mm = current->mm; |
284 | struct vm_area_struct *vma; | 313 | struct vm_area_struct *vma; |
285 | unsigned long nr_pages; | 314 | unsigned long nr_pages; |
286 | LIST_HEAD(pagelist); | 315 | LIST_HEAD(pagelist); |
316 | int *err_array = NULL; | ||
287 | struct mmap_batch_state state; | 317 | struct mmap_batch_state state; |
288 | 318 | ||
289 | if (!xen_initial_domain()) | 319 | if (!xen_initial_domain()) |
290 | return -EPERM; | 320 | return -EPERM; |
291 | 321 | ||
292 | if (copy_from_user(&m, udata, sizeof(m))) | 322 | switch (version) { |
293 | return -EFAULT; | 323 | case 1: |
324 | if (copy_from_user(&m, udata, sizeof(struct privcmd_mmapbatch))) | ||
325 | return -EFAULT; | ||
326 | /* Returns per-frame error in m.arr. */ | ||
327 | m.err = NULL; | ||
328 | if (!access_ok(VERIFY_WRITE, m.arr, m.num * sizeof(*m.arr))) | ||
329 | return -EFAULT; | ||
330 | break; | ||
331 | case 2: | ||
332 | if (copy_from_user(&m, udata, sizeof(struct privcmd_mmapbatch_v2))) | ||
333 | return -EFAULT; | ||
334 | /* Returns per-frame error code in m.err. */ | ||
335 | if (!access_ok(VERIFY_WRITE, m.err, m.num * (sizeof(*m.err)))) | ||
336 | return -EFAULT; | ||
337 | break; | ||
338 | default: | ||
339 | return -EINVAL; | ||
340 | } | ||
294 | 341 | ||
295 | nr_pages = m.num; | 342 | nr_pages = m.num; |
296 | if ((m.num <= 0) || (nr_pages > (LONG_MAX >> PAGE_SHIFT))) | 343 | if ((m.num <= 0) || (nr_pages > (LONG_MAX >> PAGE_SHIFT))) |
297 | return -EINVAL; | 344 | return -EINVAL; |
298 | 345 | ||
299 | ret = gather_array(&pagelist, m.num, sizeof(xen_pfn_t), | 346 | ret = gather_array(&pagelist, m.num, sizeof(xen_pfn_t), m.arr); |
300 | m.arr); | ||
301 | 347 | ||
302 | if (ret || list_empty(&pagelist)) | 348 | if (ret) |
303 | goto out; | 349 | goto out; |
350 | if (list_empty(&pagelist)) { | ||
351 | ret = -EINVAL; | ||
352 | goto out; | ||
353 | } | ||
354 | |||
355 | err_array = kcalloc(m.num, sizeof(int), GFP_KERNEL); | ||
356 | if (err_array == NULL) { | ||
357 | ret = -ENOMEM; | ||
358 | goto out; | ||
359 | } | ||
304 | 360 | ||
305 | down_write(&mm->mmap_sem); | 361 | down_write(&mm->mmap_sem); |
306 | 362 | ||
@@ -315,24 +371,37 @@ static long privcmd_ioctl_mmap_batch(void __user *udata) | |||
315 | goto out; | 371 | goto out; |
316 | } | 372 | } |
317 | 373 | ||
318 | state.domain = m.dom; | 374 | state.domain = m.dom; |
319 | state.vma = vma; | 375 | state.vma = vma; |
320 | state.va = m.addr; | 376 | state.va = m.addr; |
321 | state.err = 0; | 377 | state.global_error = 0; |
378 | state.err = err_array; | ||
322 | 379 | ||
323 | ret = traverse_pages(m.num, sizeof(xen_pfn_t), | 380 | /* mmap_batch_fn guarantees ret == 0 */ |
324 | &pagelist, mmap_batch_fn, &state); | 381 | BUG_ON(traverse_pages(m.num, sizeof(xen_pfn_t), |
382 | &pagelist, mmap_batch_fn, &state)); | ||
325 | 383 | ||
326 | up_write(&mm->mmap_sem); | 384 | up_write(&mm->mmap_sem); |
327 | 385 | ||
328 | if (state.err > 0) { | 386 | if (state.global_error && (version == 1)) { |
329 | state.user = m.arr; | 387 | /* Write back errors in second pass. */ |
388 | state.user_mfn = (xen_pfn_t *)m.arr; | ||
389 | state.err = err_array; | ||
330 | ret = traverse_pages(m.num, sizeof(xen_pfn_t), | 390 | ret = traverse_pages(m.num, sizeof(xen_pfn_t), |
331 | &pagelist, | 391 | &pagelist, mmap_return_errors_v1, &state); |
332 | mmap_return_errors, &state); | 392 | } else if (version == 2) { |
393 | ret = __copy_to_user(m.err, err_array, m.num * sizeof(int)); | ||
394 | if (ret) | ||
395 | ret = -EFAULT; | ||
333 | } | 396 | } |
334 | 397 | ||
398 | /* If we have not had any EFAULT-like global errors then set the global | ||
399 | * error to -ENOENT if necessary. */ | ||
400 | if ((ret == 0) && (state.global_error == -ENOENT)) | ||
401 | ret = -ENOENT; | ||
402 | |||
335 | out: | 403 | out: |
404 | kfree(err_array); | ||
336 | free_page_list(&pagelist); | 405 | free_page_list(&pagelist); |
337 | 406 | ||
338 | return ret; | 407 | return ret; |
@@ -354,7 +423,11 @@ static long privcmd_ioctl(struct file *file, | |||
354 | break; | 423 | break; |
355 | 424 | ||
356 | case IOCTL_PRIVCMD_MMAPBATCH: | 425 | case IOCTL_PRIVCMD_MMAPBATCH: |
357 | ret = privcmd_ioctl_mmap_batch(udata); | 426 | ret = privcmd_ioctl_mmap_batch(udata, 1); |
427 | break; | ||
428 | |||
429 | case IOCTL_PRIVCMD_MMAPBATCH_V2: | ||
430 | ret = privcmd_ioctl_mmap_batch(udata, 2); | ||
358 | break; | 431 | break; |
359 | 432 | ||
360 | default: | 433 | default: |
@@ -380,10 +453,6 @@ static struct vm_operations_struct privcmd_vm_ops = { | |||
380 | 453 | ||
381 | static int privcmd_mmap(struct file *file, struct vm_area_struct *vma) | 454 | static int privcmd_mmap(struct file *file, struct vm_area_struct *vma) |
382 | { | 455 | { |
383 | /* Unsupported for auto-translate guests. */ | ||
384 | if (xen_feature(XENFEAT_auto_translated_physmap)) | ||
385 | return -ENOSYS; | ||
386 | |||
387 | /* DONTCOPY is essential for Xen because copy_page_range doesn't know | 456 | /* DONTCOPY is essential for Xen because copy_page_range doesn't know |
388 | * how to recreate these mappings */ | 457 | * how to recreate these mappings */ |
389 | vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY | VM_PFNMAP; | 458 | vma->vm_flags |= VM_RESERVED | VM_IO | VM_DONTCOPY | VM_PFNMAP; |
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 4d519488d304..58db6df866ef 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c | |||
@@ -52,7 +52,7 @@ static unsigned long xen_io_tlb_nslabs; | |||
52 | * Quick lookup value of the bus address of the IOTLB. | 52 | * Quick lookup value of the bus address of the IOTLB. |
53 | */ | 53 | */ |
54 | 54 | ||
55 | u64 start_dma_addr; | 55 | static u64 start_dma_addr; |
56 | 56 | ||
57 | static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) | 57 | static dma_addr_t xen_phys_to_bus(phys_addr_t paddr) |
58 | { | 58 | { |
@@ -144,31 +144,72 @@ xen_swiotlb_fixup(void *buf, size_t size, unsigned long nslabs) | |||
144 | } while (i < nslabs); | 144 | } while (i < nslabs); |
145 | return 0; | 145 | return 0; |
146 | } | 146 | } |
147 | static unsigned long xen_set_nslabs(unsigned long nr_tbl) | ||
148 | { | ||
149 | if (!nr_tbl) { | ||
150 | xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT); | ||
151 | xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE); | ||
152 | } else | ||
153 | xen_io_tlb_nslabs = nr_tbl; | ||
147 | 154 | ||
148 | void __init xen_swiotlb_init(int verbose) | 155 | return xen_io_tlb_nslabs << IO_TLB_SHIFT; |
156 | } | ||
157 | |||
158 | enum xen_swiotlb_err { | ||
159 | XEN_SWIOTLB_UNKNOWN = 0, | ||
160 | XEN_SWIOTLB_ENOMEM, | ||
161 | XEN_SWIOTLB_EFIXUP | ||
162 | }; | ||
163 | |||
164 | static const char *xen_swiotlb_error(enum xen_swiotlb_err err) | ||
165 | { | ||
166 | switch (err) { | ||
167 | case XEN_SWIOTLB_ENOMEM: | ||
168 | return "Cannot allocate Xen-SWIOTLB buffer\n"; | ||
169 | case XEN_SWIOTLB_EFIXUP: | ||
170 | return "Failed to get contiguous memory for DMA from Xen!\n"\ | ||
171 | "You either: don't have the permissions, do not have"\ | ||
172 | " enough free memory under 4GB, or the hypervisor memory"\ | ||
173 | " is too fragmented!"; | ||
174 | default: | ||
175 | break; | ||
176 | } | ||
177 | return ""; | ||
178 | } | ||
179 | int __ref xen_swiotlb_init(int verbose, bool early) | ||
149 | { | 180 | { |
150 | unsigned long bytes; | 181 | unsigned long bytes, order; |
151 | int rc = -ENOMEM; | 182 | int rc = -ENOMEM; |
152 | unsigned long nr_tbl; | 183 | enum xen_swiotlb_err m_ret = XEN_SWIOTLB_UNKNOWN; |
153 | char *m = NULL; | ||
154 | unsigned int repeat = 3; | 184 | unsigned int repeat = 3; |
155 | 185 | ||
156 | nr_tbl = swiotlb_nr_tbl(); | 186 | xen_io_tlb_nslabs = swiotlb_nr_tbl(); |
157 | if (nr_tbl) | ||
158 | xen_io_tlb_nslabs = nr_tbl; | ||
159 | else { | ||
160 | xen_io_tlb_nslabs = (64 * 1024 * 1024 >> IO_TLB_SHIFT); | ||
161 | xen_io_tlb_nslabs = ALIGN(xen_io_tlb_nslabs, IO_TLB_SEGSIZE); | ||
162 | } | ||
163 | retry: | 187 | retry: |
164 | bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT; | 188 | bytes = xen_set_nslabs(xen_io_tlb_nslabs); |
165 | 189 | order = get_order(xen_io_tlb_nslabs << IO_TLB_SHIFT); | |
166 | /* | 190 | /* |
167 | * Get IO TLB memory from any location. | 191 | * Get IO TLB memory from any location. |
168 | */ | 192 | */ |
169 | xen_io_tlb_start = alloc_bootmem_pages(PAGE_ALIGN(bytes)); | 193 | if (early) |
194 | xen_io_tlb_start = alloc_bootmem_pages(PAGE_ALIGN(bytes)); | ||
195 | else { | ||
196 | #define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT)) | ||
197 | #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) | ||
198 | while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) { | ||
199 | xen_io_tlb_start = (void *)__get_free_pages(__GFP_NOWARN, order); | ||
200 | if (xen_io_tlb_start) | ||
201 | break; | ||
202 | order--; | ||
203 | } | ||
204 | if (order != get_order(bytes)) { | ||
205 | pr_warn("Warning: only able to allocate %ld MB " | ||
206 | "for software IO TLB\n", (PAGE_SIZE << order) >> 20); | ||
207 | xen_io_tlb_nslabs = SLABS_PER_PAGE << order; | ||
208 | bytes = xen_io_tlb_nslabs << IO_TLB_SHIFT; | ||
209 | } | ||
210 | } | ||
170 | if (!xen_io_tlb_start) { | 211 | if (!xen_io_tlb_start) { |
171 | m = "Cannot allocate Xen-SWIOTLB buffer!\n"; | 212 | m_ret = XEN_SWIOTLB_ENOMEM; |
172 | goto error; | 213 | goto error; |
173 | } | 214 | } |
174 | xen_io_tlb_end = xen_io_tlb_start + bytes; | 215 | xen_io_tlb_end = xen_io_tlb_start + bytes; |
@@ -179,17 +220,22 @@ retry: | |||
179 | bytes, | 220 | bytes, |
180 | xen_io_tlb_nslabs); | 221 | xen_io_tlb_nslabs); |
181 | if (rc) { | 222 | if (rc) { |
182 | free_bootmem(__pa(xen_io_tlb_start), PAGE_ALIGN(bytes)); | 223 | if (early) |
183 | m = "Failed to get contiguous memory for DMA from Xen!\n"\ | 224 | free_bootmem(__pa(xen_io_tlb_start), PAGE_ALIGN(bytes)); |
184 | "You either: don't have the permissions, do not have"\ | 225 | else { |
185 | " enough free memory under 4GB, or the hypervisor memory"\ | 226 | free_pages((unsigned long)xen_io_tlb_start, order); |
186 | "is too fragmented!"; | 227 | xen_io_tlb_start = NULL; |
228 | } | ||
229 | m_ret = XEN_SWIOTLB_EFIXUP; | ||
187 | goto error; | 230 | goto error; |
188 | } | 231 | } |
189 | start_dma_addr = xen_virt_to_bus(xen_io_tlb_start); | 232 | start_dma_addr = xen_virt_to_bus(xen_io_tlb_start); |
190 | swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose); | 233 | if (early) { |
191 | 234 | swiotlb_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs, verbose); | |
192 | return; | 235 | rc = 0; |
236 | } else | ||
237 | rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs); | ||
238 | return rc; | ||
193 | error: | 239 | error: |
194 | if (repeat--) { | 240 | if (repeat--) { |
195 | xen_io_tlb_nslabs = max(1024UL, /* Min is 2MB */ | 241 | xen_io_tlb_nslabs = max(1024UL, /* Min is 2MB */ |
@@ -198,10 +244,13 @@ error: | |||
198 | (xen_io_tlb_nslabs << IO_TLB_SHIFT) >> 20); | 244 | (xen_io_tlb_nslabs << IO_TLB_SHIFT) >> 20); |
199 | goto retry; | 245 | goto retry; |
200 | } | 246 | } |
201 | xen_raw_printk("%s (rc:%d)", m, rc); | 247 | pr_err("%s (rc:%d)", xen_swiotlb_error(m_ret), rc); |
202 | panic("%s (rc:%d)", m, rc); | 248 | if (early) |
249 | panic("%s (rc:%d)", xen_swiotlb_error(m_ret), rc); | ||
250 | else | ||
251 | free_pages((unsigned long)xen_io_tlb_start, order); | ||
252 | return rc; | ||
203 | } | 253 | } |
204 | |||
205 | void * | 254 | void * |
206 | xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, | 255 | xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, |
207 | dma_addr_t *dma_handle, gfp_t flags, | 256 | dma_addr_t *dma_handle, gfp_t flags, |
@@ -466,14 +515,6 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | |||
466 | } | 515 | } |
467 | EXPORT_SYMBOL_GPL(xen_swiotlb_map_sg_attrs); | 516 | EXPORT_SYMBOL_GPL(xen_swiotlb_map_sg_attrs); |
468 | 517 | ||
469 | int | ||
470 | xen_swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, | ||
471 | enum dma_data_direction dir) | ||
472 | { | ||
473 | return xen_swiotlb_map_sg_attrs(hwdev, sgl, nelems, dir, NULL); | ||
474 | } | ||
475 | EXPORT_SYMBOL_GPL(xen_swiotlb_map_sg); | ||
476 | |||
477 | /* | 518 | /* |
478 | * Unmap a set of streaming mode DMA translations. Again, cpu read rules | 519 | * Unmap a set of streaming mode DMA translations. Again, cpu read rules |
479 | * concerning calls here are the same as for swiotlb_unmap_page() above. | 520 | * concerning calls here are the same as for swiotlb_unmap_page() above. |
@@ -494,14 +535,6 @@ xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | |||
494 | } | 535 | } |
495 | EXPORT_SYMBOL_GPL(xen_swiotlb_unmap_sg_attrs); | 536 | EXPORT_SYMBOL_GPL(xen_swiotlb_unmap_sg_attrs); |
496 | 537 | ||
497 | void | ||
498 | xen_swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, | ||
499 | enum dma_data_direction dir) | ||
500 | { | ||
501 | return xen_swiotlb_unmap_sg_attrs(hwdev, sgl, nelems, dir, NULL); | ||
502 | } | ||
503 | EXPORT_SYMBOL_GPL(xen_swiotlb_unmap_sg); | ||
504 | |||
505 | /* | 538 | /* |
506 | * Make physical memory consistent for a set of streaming mode DMA translations | 539 | * Make physical memory consistent for a set of streaming mode DMA translations |
507 | * after a transfer. | 540 | * after a transfer. |
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c index fdb6d229c9bb..5e5ad7e28858 100644 --- a/drivers/xen/sys-hypervisor.c +++ b/drivers/xen/sys-hypervisor.c | |||
@@ -114,7 +114,7 @@ static void xen_sysfs_version_destroy(void) | |||
114 | 114 | ||
115 | /* UUID */ | 115 | /* UUID */ |
116 | 116 | ||
117 | static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer) | 117 | static ssize_t uuid_show_fallback(struct hyp_sysfs_attr *attr, char *buffer) |
118 | { | 118 | { |
119 | char *vm, *val; | 119 | char *vm, *val; |
120 | int ret; | 120 | int ret; |
@@ -135,6 +135,17 @@ static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer) | |||
135 | return ret; | 135 | return ret; |
136 | } | 136 | } |
137 | 137 | ||
138 | static ssize_t uuid_show(struct hyp_sysfs_attr *attr, char *buffer) | ||
139 | { | ||
140 | xen_domain_handle_t uuid; | ||
141 | int ret; | ||
142 | ret = HYPERVISOR_xen_version(XENVER_guest_handle, uuid); | ||
143 | if (ret) | ||
144 | return uuid_show_fallback(attr, buffer); | ||
145 | ret = sprintf(buffer, "%pU\n", uuid); | ||
146 | return ret; | ||
147 | } | ||
148 | |||
138 | HYPERVISOR_ATTR_RO(uuid); | 149 | HYPERVISOR_ATTR_RO(uuid); |
139 | 150 | ||
140 | static int __init xen_sysfs_uuid_init(void) | 151 | static int __init xen_sysfs_uuid_init(void) |
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index 89f264c67420..144564e5eb29 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/xen/hypercall.h> | 21 | #include <asm/xen/hypercall.h> |
22 | #include <asm/xen/page.h> | 22 | #include <asm/xen/page.h> |
23 | #include <asm/xen/hypervisor.h> | 23 | #include <asm/xen/hypervisor.h> |
24 | #include <xen/tmem.h> | ||
24 | 25 | ||
25 | #define TMEM_CONTROL 0 | 26 | #define TMEM_CONTROL 0 |
26 | #define TMEM_NEW_POOL 1 | 27 | #define TMEM_NEW_POOL 1 |
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 92ff01dbeb10..961d664e2d2f 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c | |||
@@ -362,6 +362,7 @@ static int __devinit pcistub_init_device(struct pci_dev *dev) | |||
362 | else { | 362 | else { |
363 | dev_dbg(&dev->dev, "reseting (FLR, D3, etc) the device\n"); | 363 | dev_dbg(&dev->dev, "reseting (FLR, D3, etc) the device\n"); |
364 | __pci_reset_function_locked(dev); | 364 | __pci_reset_function_locked(dev); |
365 | pci_restore_state(dev); | ||
365 | } | 366 | } |
366 | /* Now disable the device (this also ensures some private device | 367 | /* Now disable the device (this also ensures some private device |
367 | * data is setup before we export) | 368 | * data is setup before we export) |
@@ -681,14 +682,14 @@ static pci_ers_result_t xen_pcibk_slot_reset(struct pci_dev *dev) | |||
681 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" | 682 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" |
682 | " by HVM, kill it\n"); | 683 | " by HVM, kill it\n"); |
683 | kill_domain_by_device(psdev); | 684 | kill_domain_by_device(psdev); |
684 | goto release; | 685 | goto end; |
685 | } | 686 | } |
686 | 687 | ||
687 | if (!test_bit(_XEN_PCIB_AERHANDLER, | 688 | if (!test_bit(_XEN_PCIB_AERHANDLER, |
688 | (unsigned long *)&psdev->pdev->sh_info->flags)) { | 689 | (unsigned long *)&psdev->pdev->sh_info->flags)) { |
689 | dev_err(&dev->dev, | 690 | dev_err(&dev->dev, |
690 | "guest with no AER driver should have been killed\n"); | 691 | "guest with no AER driver should have been killed\n"); |
691 | goto release; | 692 | goto end; |
692 | } | 693 | } |
693 | result = common_process(psdev, 1, XEN_PCI_OP_aer_slotreset, result); | 694 | result = common_process(psdev, 1, XEN_PCI_OP_aer_slotreset, result); |
694 | 695 | ||
@@ -698,9 +699,9 @@ static pci_ers_result_t xen_pcibk_slot_reset(struct pci_dev *dev) | |||
698 | "No AER slot_reset service or disconnected!\n"); | 699 | "No AER slot_reset service or disconnected!\n"); |
699 | kill_domain_by_device(psdev); | 700 | kill_domain_by_device(psdev); |
700 | } | 701 | } |
701 | release: | ||
702 | pcistub_device_put(psdev); | ||
703 | end: | 702 | end: |
703 | if (psdev) | ||
704 | pcistub_device_put(psdev); | ||
704 | up_write(&pcistub_sem); | 705 | up_write(&pcistub_sem); |
705 | return result; | 706 | return result; |
706 | 707 | ||
@@ -739,14 +740,14 @@ static pci_ers_result_t xen_pcibk_mmio_enabled(struct pci_dev *dev) | |||
739 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" | 740 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" |
740 | " by HVM, kill it\n"); | 741 | " by HVM, kill it\n"); |
741 | kill_domain_by_device(psdev); | 742 | kill_domain_by_device(psdev); |
742 | goto release; | 743 | goto end; |
743 | } | 744 | } |
744 | 745 | ||
745 | if (!test_bit(_XEN_PCIB_AERHANDLER, | 746 | if (!test_bit(_XEN_PCIB_AERHANDLER, |
746 | (unsigned long *)&psdev->pdev->sh_info->flags)) { | 747 | (unsigned long *)&psdev->pdev->sh_info->flags)) { |
747 | dev_err(&dev->dev, | 748 | dev_err(&dev->dev, |
748 | "guest with no AER driver should have been killed\n"); | 749 | "guest with no AER driver should have been killed\n"); |
749 | goto release; | 750 | goto end; |
750 | } | 751 | } |
751 | result = common_process(psdev, 1, XEN_PCI_OP_aer_mmio, result); | 752 | result = common_process(psdev, 1, XEN_PCI_OP_aer_mmio, result); |
752 | 753 | ||
@@ -756,9 +757,9 @@ static pci_ers_result_t xen_pcibk_mmio_enabled(struct pci_dev *dev) | |||
756 | "No AER mmio_enabled service or disconnected!\n"); | 757 | "No AER mmio_enabled service or disconnected!\n"); |
757 | kill_domain_by_device(psdev); | 758 | kill_domain_by_device(psdev); |
758 | } | 759 | } |
759 | release: | ||
760 | pcistub_device_put(psdev); | ||
761 | end: | 760 | end: |
761 | if (psdev) | ||
762 | pcistub_device_put(psdev); | ||
762 | up_write(&pcistub_sem); | 763 | up_write(&pcistub_sem); |
763 | return result; | 764 | return result; |
764 | } | 765 | } |
@@ -797,7 +798,7 @@ static pci_ers_result_t xen_pcibk_error_detected(struct pci_dev *dev, | |||
797 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" | 798 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" |
798 | " by HVM, kill it\n"); | 799 | " by HVM, kill it\n"); |
799 | kill_domain_by_device(psdev); | 800 | kill_domain_by_device(psdev); |
800 | goto release; | 801 | goto end; |
801 | } | 802 | } |
802 | 803 | ||
803 | /*Guest owns the device yet no aer handler regiested, kill guest*/ | 804 | /*Guest owns the device yet no aer handler regiested, kill guest*/ |
@@ -805,7 +806,7 @@ static pci_ers_result_t xen_pcibk_error_detected(struct pci_dev *dev, | |||
805 | (unsigned long *)&psdev->pdev->sh_info->flags)) { | 806 | (unsigned long *)&psdev->pdev->sh_info->flags)) { |
806 | dev_dbg(&dev->dev, "guest may have no aer driver, kill it\n"); | 807 | dev_dbg(&dev->dev, "guest may have no aer driver, kill it\n"); |
807 | kill_domain_by_device(psdev); | 808 | kill_domain_by_device(psdev); |
808 | goto release; | 809 | goto end; |
809 | } | 810 | } |
810 | result = common_process(psdev, error, XEN_PCI_OP_aer_detected, result); | 811 | result = common_process(psdev, error, XEN_PCI_OP_aer_detected, result); |
811 | 812 | ||
@@ -815,9 +816,9 @@ static pci_ers_result_t xen_pcibk_error_detected(struct pci_dev *dev, | |||
815 | "No AER error_detected service or disconnected!\n"); | 816 | "No AER error_detected service or disconnected!\n"); |
816 | kill_domain_by_device(psdev); | 817 | kill_domain_by_device(psdev); |
817 | } | 818 | } |
818 | release: | ||
819 | pcistub_device_put(psdev); | ||
820 | end: | 819 | end: |
820 | if (psdev) | ||
821 | pcistub_device_put(psdev); | ||
821 | up_write(&pcistub_sem); | 822 | up_write(&pcistub_sem); |
822 | return result; | 823 | return result; |
823 | } | 824 | } |
@@ -851,7 +852,7 @@ static void xen_pcibk_error_resume(struct pci_dev *dev) | |||
851 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" | 852 | dev_err(&dev->dev, DRV_NAME " device is not connected or owned" |
852 | " by HVM, kill it\n"); | 853 | " by HVM, kill it\n"); |
853 | kill_domain_by_device(psdev); | 854 | kill_domain_by_device(psdev); |
854 | goto release; | 855 | goto end; |
855 | } | 856 | } |
856 | 857 | ||
857 | if (!test_bit(_XEN_PCIB_AERHANDLER, | 858 | if (!test_bit(_XEN_PCIB_AERHANDLER, |
@@ -859,13 +860,13 @@ static void xen_pcibk_error_resume(struct pci_dev *dev) | |||
859 | dev_err(&dev->dev, | 860 | dev_err(&dev->dev, |
860 | "guest with no AER driver should have been killed\n"); | 861 | "guest with no AER driver should have been killed\n"); |
861 | kill_domain_by_device(psdev); | 862 | kill_domain_by_device(psdev); |
862 | goto release; | 863 | goto end; |
863 | } | 864 | } |
864 | common_process(psdev, 1, XEN_PCI_OP_aer_resume, | 865 | common_process(psdev, 1, XEN_PCI_OP_aer_resume, |
865 | PCI_ERS_RESULT_RECOVERED); | 866 | PCI_ERS_RESULT_RECOVERED); |
866 | release: | ||
867 | pcistub_device_put(psdev); | ||
868 | end: | 867 | end: |
868 | if (psdev) | ||
869 | pcistub_device_put(psdev); | ||
869 | up_write(&pcistub_sem); | 870 | up_write(&pcistub_sem); |
870 | return; | 871 | return; |
871 | } | 872 | } |
@@ -897,17 +898,41 @@ static inline int str_to_slot(const char *buf, int *domain, int *bus, | |||
897 | int *slot, int *func) | 898 | int *slot, int *func) |
898 | { | 899 | { |
899 | int err; | 900 | int err; |
901 | char wc = '*'; | ||
900 | 902 | ||
901 | err = sscanf(buf, " %x:%x:%x.%x", domain, bus, slot, func); | 903 | err = sscanf(buf, " %x:%x:%x.%x", domain, bus, slot, func); |
902 | if (err == 4) | 904 | switch (err) { |
905 | case 3: | ||
906 | *func = -1; | ||
907 | err = sscanf(buf, " %x:%x:%x.%c", domain, bus, slot, &wc); | ||
908 | break; | ||
909 | case 2: | ||
910 | *slot = *func = -1; | ||
911 | err = sscanf(buf, " %x:%x:*.%c", domain, bus, &wc); | ||
912 | if (err >= 2) | ||
913 | ++err; | ||
914 | break; | ||
915 | } | ||
916 | if (err == 4 && wc == '*') | ||
903 | return 0; | 917 | return 0; |
904 | else if (err < 0) | 918 | else if (err < 0) |
905 | return -EINVAL; | 919 | return -EINVAL; |
906 | 920 | ||
907 | /* try again without domain */ | 921 | /* try again without domain */ |
908 | *domain = 0; | 922 | *domain = 0; |
923 | wc = '*'; | ||
909 | err = sscanf(buf, " %x:%x.%x", bus, slot, func); | 924 | err = sscanf(buf, " %x:%x.%x", bus, slot, func); |
910 | if (err == 3) | 925 | switch (err) { |
926 | case 2: | ||
927 | *func = -1; | ||
928 | err = sscanf(buf, " %x:%x.%c", bus, slot, &wc); | ||
929 | break; | ||
930 | case 1: | ||
931 | *slot = *func = -1; | ||
932 | err = sscanf(buf, " %x:*.%c", bus, &wc) + 1; | ||
933 | break; | ||
934 | } | ||
935 | if (err == 3 && wc == '*') | ||
911 | return 0; | 936 | return 0; |
912 | 937 | ||
913 | return -EINVAL; | 938 | return -EINVAL; |
@@ -930,6 +955,19 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func) | |||
930 | { | 955 | { |
931 | struct pcistub_device_id *pci_dev_id; | 956 | struct pcistub_device_id *pci_dev_id; |
932 | unsigned long flags; | 957 | unsigned long flags; |
958 | int rc = 0; | ||
959 | |||
960 | if (slot < 0) { | ||
961 | for (slot = 0; !rc && slot < 32; ++slot) | ||
962 | rc = pcistub_device_id_add(domain, bus, slot, func); | ||
963 | return rc; | ||
964 | } | ||
965 | |||
966 | if (func < 0) { | ||
967 | for (func = 0; !rc && func < 8; ++func) | ||
968 | rc = pcistub_device_id_add(domain, bus, slot, func); | ||
969 | return rc; | ||
970 | } | ||
933 | 971 | ||
934 | pci_dev_id = kmalloc(sizeof(*pci_dev_id), GFP_KERNEL); | 972 | pci_dev_id = kmalloc(sizeof(*pci_dev_id), GFP_KERNEL); |
935 | if (!pci_dev_id) | 973 | if (!pci_dev_id) |
@@ -952,15 +990,15 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func) | |||
952 | static int pcistub_device_id_remove(int domain, int bus, int slot, int func) | 990 | static int pcistub_device_id_remove(int domain, int bus, int slot, int func) |
953 | { | 991 | { |
954 | struct pcistub_device_id *pci_dev_id, *t; | 992 | struct pcistub_device_id *pci_dev_id, *t; |
955 | int devfn = PCI_DEVFN(slot, func); | ||
956 | int err = -ENOENT; | 993 | int err = -ENOENT; |
957 | unsigned long flags; | 994 | unsigned long flags; |
958 | 995 | ||
959 | spin_lock_irqsave(&device_ids_lock, flags); | 996 | spin_lock_irqsave(&device_ids_lock, flags); |
960 | list_for_each_entry_safe(pci_dev_id, t, &pcistub_device_ids, | 997 | list_for_each_entry_safe(pci_dev_id, t, &pcistub_device_ids, |
961 | slot_list) { | 998 | slot_list) { |
962 | if (pci_dev_id->domain == domain | 999 | if (pci_dev_id->domain == domain && pci_dev_id->bus == bus |
963 | && pci_dev_id->bus == bus && pci_dev_id->devfn == devfn) { | 1000 | && (slot < 0 || PCI_SLOT(pci_dev_id->devfn) == slot) |
1001 | && (func < 0 || PCI_FUNC(pci_dev_id->devfn) == func)) { | ||
964 | /* Don't break; here because it's possible the same | 1002 | /* Don't break; here because it's possible the same |
965 | * slot could be in the list more than once | 1003 | * slot could be in the list more than once |
966 | */ | 1004 | */ |
@@ -987,7 +1025,7 @@ static int pcistub_reg_add(int domain, int bus, int slot, int func, int reg, | |||
987 | struct config_field *field; | 1025 | struct config_field *field; |
988 | 1026 | ||
989 | psdev = pcistub_device_find(domain, bus, slot, func); | 1027 | psdev = pcistub_device_find(domain, bus, slot, func); |
990 | if (!psdev || !psdev->dev) { | 1028 | if (!psdev) { |
991 | err = -ENODEV; | 1029 | err = -ENODEV; |
992 | goto out; | 1030 | goto out; |
993 | } | 1031 | } |
@@ -1011,6 +1049,8 @@ static int pcistub_reg_add(int domain, int bus, int slot, int func, int reg, | |||
1011 | if (err) | 1049 | if (err) |
1012 | kfree(field); | 1050 | kfree(field); |
1013 | out: | 1051 | out: |
1052 | if (psdev) | ||
1053 | pcistub_device_put(psdev); | ||
1014 | return err; | 1054 | return err; |
1015 | } | 1055 | } |
1016 | 1056 | ||
@@ -1115,10 +1155,9 @@ static ssize_t pcistub_irq_handler_switch(struct device_driver *drv, | |||
1115 | 1155 | ||
1116 | err = str_to_slot(buf, &domain, &bus, &slot, &func); | 1156 | err = str_to_slot(buf, &domain, &bus, &slot, &func); |
1117 | if (err) | 1157 | if (err) |
1118 | goto out; | 1158 | return err; |
1119 | 1159 | ||
1120 | psdev = pcistub_device_find(domain, bus, slot, func); | 1160 | psdev = pcistub_device_find(domain, bus, slot, func); |
1121 | |||
1122 | if (!psdev) | 1161 | if (!psdev) |
1123 | goto out; | 1162 | goto out; |
1124 | 1163 | ||
@@ -1134,6 +1173,8 @@ static ssize_t pcistub_irq_handler_switch(struct device_driver *drv, | |||
1134 | if (dev_data->isr_on) | 1173 | if (dev_data->isr_on) |
1135 | dev_data->ack_intr = 1; | 1174 | dev_data->ack_intr = 1; |
1136 | out: | 1175 | out: |
1176 | if (psdev) | ||
1177 | pcistub_device_put(psdev); | ||
1137 | if (!err) | 1178 | if (!err) |
1138 | err = count; | 1179 | err = count; |
1139 | return err; | 1180 | return err; |
@@ -1216,15 +1257,16 @@ static ssize_t permissive_add(struct device_driver *drv, const char *buf, | |||
1216 | err = str_to_slot(buf, &domain, &bus, &slot, &func); | 1257 | err = str_to_slot(buf, &domain, &bus, &slot, &func); |
1217 | if (err) | 1258 | if (err) |
1218 | goto out; | 1259 | goto out; |
1260 | if (slot < 0 || func < 0) { | ||
1261 | err = -EINVAL; | ||
1262 | goto out; | ||
1263 | } | ||
1219 | psdev = pcistub_device_find(domain, bus, slot, func); | 1264 | psdev = pcistub_device_find(domain, bus, slot, func); |
1220 | if (!psdev) { | 1265 | if (!psdev) { |
1221 | err = -ENODEV; | 1266 | err = -ENODEV; |
1222 | goto out; | 1267 | goto out; |
1223 | } | 1268 | } |
1224 | if (!psdev->dev) { | 1269 | |
1225 | err = -ENODEV; | ||
1226 | goto release; | ||
1227 | } | ||
1228 | dev_data = pci_get_drvdata(psdev->dev); | 1270 | dev_data = pci_get_drvdata(psdev->dev); |
1229 | /* the driver data for a device should never be null at this point */ | 1271 | /* the driver data for a device should never be null at this point */ |
1230 | if (!dev_data) { | 1272 | if (!dev_data) { |
@@ -1297,17 +1339,51 @@ static int __init pcistub_init(void) | |||
1297 | 1339 | ||
1298 | if (pci_devs_to_hide && *pci_devs_to_hide) { | 1340 | if (pci_devs_to_hide && *pci_devs_to_hide) { |
1299 | do { | 1341 | do { |
1342 | char wc = '*'; | ||
1343 | |||
1300 | parsed = 0; | 1344 | parsed = 0; |
1301 | 1345 | ||
1302 | err = sscanf(pci_devs_to_hide + pos, | 1346 | err = sscanf(pci_devs_to_hide + pos, |
1303 | " (%x:%x:%x.%x) %n", | 1347 | " (%x:%x:%x.%x) %n", |
1304 | &domain, &bus, &slot, &func, &parsed); | 1348 | &domain, &bus, &slot, &func, &parsed); |
1305 | if (err != 4) { | 1349 | switch (err) { |
1350 | case 3: | ||
1351 | func = -1; | ||
1352 | err = sscanf(pci_devs_to_hide + pos, | ||
1353 | " (%x:%x:%x.%c) %n", | ||
1354 | &domain, &bus, &slot, &wc, | ||
1355 | &parsed); | ||
1356 | break; | ||
1357 | case 2: | ||
1358 | slot = func = -1; | ||
1359 | err = sscanf(pci_devs_to_hide + pos, | ||
1360 | " (%x:%x:*.%c) %n", | ||
1361 | &domain, &bus, &wc, &parsed) + 1; | ||
1362 | break; | ||
1363 | } | ||
1364 | |||
1365 | if (err != 4 || wc != '*') { | ||
1306 | domain = 0; | 1366 | domain = 0; |
1367 | wc = '*'; | ||
1307 | err = sscanf(pci_devs_to_hide + pos, | 1368 | err = sscanf(pci_devs_to_hide + pos, |
1308 | " (%x:%x.%x) %n", | 1369 | " (%x:%x.%x) %n", |
1309 | &bus, &slot, &func, &parsed); | 1370 | &bus, &slot, &func, &parsed); |
1310 | if (err != 3) | 1371 | switch (err) { |
1372 | case 2: | ||
1373 | func = -1; | ||
1374 | err = sscanf(pci_devs_to_hide + pos, | ||
1375 | " (%x:%x.%c) %n", | ||
1376 | &bus, &slot, &wc, | ||
1377 | &parsed); | ||
1378 | break; | ||
1379 | case 1: | ||
1380 | slot = func = -1; | ||
1381 | err = sscanf(pci_devs_to_hide + pos, | ||
1382 | " (%x:*.%c) %n", | ||
1383 | &bus, &wc, &parsed) + 1; | ||
1384 | break; | ||
1385 | } | ||
1386 | if (err != 3 || wc != '*') | ||
1311 | goto parse_error; | 1387 | goto parse_error; |
1312 | } | 1388 | } |
1313 | 1389 | ||
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index b3e146edb51d..bcf3ba4a6ec1 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c | |||
@@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev, | |||
490 | 490 | ||
491 | op.host_addr = arbitrary_virt_to_machine(pte).maddr; | 491 | op.host_addr = arbitrary_virt_to_machine(pte).maddr; |
492 | 492 | ||
493 | if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1)) | 493 | gnttab_batch_map(&op, 1); |
494 | BUG(); | ||
495 | 494 | ||
496 | if (op.status != GNTST_okay) { | 495 | if (op.status != GNTST_okay) { |
497 | free_vm_area(area); | 496 | free_vm_area(area); |
@@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref, | |||
572 | gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref, | 571 | gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref, |
573 | dev->otherend_id); | 572 | dev->otherend_id); |
574 | 573 | ||
575 | if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1)) | 574 | gnttab_batch_map(&op, 1); |
576 | BUG(); | ||
577 | 575 | ||
578 | if (op.status != GNTST_okay) { | 576 | if (op.status != GNTST_okay) { |
579 | xenbus_dev_fatal(dev, op.status, | 577 | xenbus_dev_fatal(dev, op.status, |
diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c index 52fe7ad07666..c5aa55c5d371 100644 --- a/drivers/xen/xenbus/xenbus_comms.c +++ b/drivers/xen/xenbus/xenbus_comms.c | |||
@@ -224,7 +224,7 @@ int xb_init_comms(void) | |||
224 | int err; | 224 | int err; |
225 | err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting, | 225 | err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting, |
226 | 0, "xenbus", &xb_waitq); | 226 | 0, "xenbus", &xb_waitq); |
227 | if (err <= 0) { | 227 | if (err < 0) { |
228 | printk(KERN_ERR "XENBUS request irq failed %i\n", err); | 228 | printk(KERN_ERR "XENBUS request irq failed %i\n", err); |
229 | return err; | 229 | return err; |
230 | } | 230 | } |
diff --git a/drivers/xen/xenbus/xenbus_dev_backend.c b/drivers/xen/xenbus/xenbus_dev_backend.c index be738c43104b..d73000800762 100644 --- a/drivers/xen/xenbus/xenbus_dev_backend.c +++ b/drivers/xen/xenbus/xenbus_dev_backend.c | |||
@@ -107,7 +107,7 @@ static int xenbus_backend_mmap(struct file *file, struct vm_area_struct *vma) | |||
107 | return 0; | 107 | return 0; |
108 | } | 108 | } |
109 | 109 | ||
110 | const struct file_operations xenbus_backend_fops = { | 110 | static const struct file_operations xenbus_backend_fops = { |
111 | .open = xenbus_backend_open, | 111 | .open = xenbus_backend_open, |
112 | .mmap = xenbus_backend_mmap, | 112 | .mmap = xenbus_backend_mmap, |
113 | .unlocked_ioctl = xenbus_backend_ioctl, | 113 | .unlocked_ioctl = xenbus_backend_ioctl, |
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index b793723e724d..038b71dbf03c 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c | |||
@@ -324,8 +324,8 @@ static int cmp_dev(struct device *dev, void *data) | |||
324 | return 0; | 324 | return 0; |
325 | } | 325 | } |
326 | 326 | ||
327 | struct xenbus_device *xenbus_device_find(const char *nodename, | 327 | static struct xenbus_device *xenbus_device_find(const char *nodename, |
328 | struct bus_type *bus) | 328 | struct bus_type *bus) |
329 | { | 329 | { |
330 | struct xb_find_info info = { .dev = NULL, .nodename = nodename }; | 330 | struct xb_find_info info = { .dev = NULL, .nodename = nodename }; |
331 | 331 | ||
@@ -719,17 +719,47 @@ static int __init xenstored_local_init(void) | |||
719 | return err; | 719 | return err; |
720 | } | 720 | } |
721 | 721 | ||
722 | enum xenstore_init { | ||
723 | UNKNOWN, | ||
724 | PV, | ||
725 | HVM, | ||
726 | LOCAL, | ||
727 | }; | ||
722 | static int __init xenbus_init(void) | 728 | static int __init xenbus_init(void) |
723 | { | 729 | { |
724 | int err = 0; | 730 | int err = 0; |
731 | enum xenstore_init usage = UNKNOWN; | ||
732 | uint64_t v = 0; | ||
725 | 733 | ||
726 | if (!xen_domain()) | 734 | if (!xen_domain()) |
727 | return -ENODEV; | 735 | return -ENODEV; |
728 | 736 | ||
729 | xenbus_ring_ops_init(); | 737 | xenbus_ring_ops_init(); |
730 | 738 | ||
731 | if (xen_hvm_domain()) { | 739 | if (xen_pv_domain()) |
732 | uint64_t v = 0; | 740 | usage = PV; |
741 | if (xen_hvm_domain()) | ||
742 | usage = HVM; | ||
743 | if (xen_hvm_domain() && xen_initial_domain()) | ||
744 | usage = LOCAL; | ||
745 | if (xen_pv_domain() && !xen_start_info->store_evtchn) | ||
746 | usage = LOCAL; | ||
747 | if (xen_pv_domain() && xen_start_info->store_evtchn) | ||
748 | xenstored_ready = 1; | ||
749 | |||
750 | switch (usage) { | ||
751 | case LOCAL: | ||
752 | err = xenstored_local_init(); | ||
753 | if (err) | ||
754 | goto out_error; | ||
755 | xen_store_interface = mfn_to_virt(xen_store_mfn); | ||
756 | break; | ||
757 | case PV: | ||
758 | xen_store_evtchn = xen_start_info->store_evtchn; | ||
759 | xen_store_mfn = xen_start_info->store_mfn; | ||
760 | xen_store_interface = mfn_to_virt(xen_store_mfn); | ||
761 | break; | ||
762 | case HVM: | ||
733 | err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); | 763 | err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v); |
734 | if (err) | 764 | if (err) |
735 | goto out_error; | 765 | goto out_error; |
@@ -738,18 +768,12 @@ static int __init xenbus_init(void) | |||
738 | if (err) | 768 | if (err) |
739 | goto out_error; | 769 | goto out_error; |
740 | xen_store_mfn = (unsigned long)v; | 770 | xen_store_mfn = (unsigned long)v; |
741 | xen_store_interface = ioremap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE); | 771 | xen_store_interface = |
742 | } else { | 772 | ioremap(xen_store_mfn << PAGE_SHIFT, PAGE_SIZE); |
743 | xen_store_evtchn = xen_start_info->store_evtchn; | 773 | break; |
744 | xen_store_mfn = xen_start_info->store_mfn; | 774 | default: |
745 | if (xen_store_evtchn) | 775 | pr_warn("Xenstore state unknown\n"); |
746 | xenstored_ready = 1; | 776 | break; |
747 | else { | ||
748 | err = xenstored_local_init(); | ||
749 | if (err) | ||
750 | goto out_error; | ||
751 | } | ||
752 | xen_store_interface = mfn_to_virt(xen_store_mfn); | ||
753 | } | 777 | } |
754 | 778 | ||
755 | /* Initialize the interface to xenstore. */ | 779 | /* Initialize the interface to xenstore. */ |
diff --git a/drivers/xen/xenbus/xenbus_probe_frontend.c b/drivers/xen/xenbus/xenbus_probe_frontend.c index a31b54d48839..3159a37d966d 100644 --- a/drivers/xen/xenbus/xenbus_probe_frontend.c +++ b/drivers/xen/xenbus/xenbus_probe_frontend.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <xen/xenbus.h> | 21 | #include <xen/xenbus.h> |
22 | #include <xen/events.h> | 22 | #include <xen/events.h> |
23 | #include <xen/page.h> | 23 | #include <xen/page.h> |
24 | #include <xen/xen.h> | ||
24 | 25 | ||
25 | #include <xen/platform_pci.h> | 26 | #include <xen/platform_pci.h> |
26 | 27 | ||
diff --git a/drivers/xen/xenbus/xenbus_xs.c b/drivers/xen/xenbus/xenbus_xs.c index bce15cf4a8df..131dec04794e 100644 --- a/drivers/xen/xenbus/xenbus_xs.c +++ b/drivers/xen/xenbus/xenbus_xs.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <linux/rwsem.h> | 44 | #include <linux/rwsem.h> |
45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
46 | #include <linux/mutex.h> | 46 | #include <linux/mutex.h> |
47 | #include <asm/xen/hypervisor.h> | ||
47 | #include <xen/xenbus.h> | 48 | #include <xen/xenbus.h> |
48 | #include <xen/xen.h> | 49 | #include <xen/xen.h> |
49 | #include "xenbus_comms.h" | 50 | #include "xenbus_comms.h" |
@@ -622,7 +623,7 @@ static void xs_reset_watches(void) | |||
622 | { | 623 | { |
623 | int err, supported = 0; | 624 | int err, supported = 0; |
624 | 625 | ||
625 | if (!xen_hvm_domain()) | 626 | if (!xen_hvm_domain() || xen_initial_domain()) |
626 | return; | 627 | return; |
627 | 628 | ||
628 | err = xenbus_scanf(XBT_NIL, "control", | 629 | err = xenbus_scanf(XBT_NIL, "control", |