tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/qxl: fix build warnings on 32-bit
Just the usual printk related warnings.
Signed-off-by: Dave Airlie <airlied@redhat.com>
+7
-6
+2
-2
drivers/gpu/drm/qxl/qxl_ioctl.c
+2
-2
drivers/gpu/drm/qxl/qxl_ioctl.c
···
151
151
struct qxl_bo *cmd_bo;
152
152
int release_type;
153
153
struct drm_qxl_command *commands =
154
-
(struct drm_qxl_command *)execbuffer->commands;
154
+
(struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
155
155
156
156
if (DRM_COPY_FROM_USER(&user_cmd, &commands[cmd_num],
157
157
sizeof(user_cmd)))
···
193
193
194
194
for (i = 0 ; i < user_cmd.relocs_num; ++i) {
195
195
if (DRM_COPY_FROM_USER(&reloc,
196
-
&((struct drm_qxl_reloc *)user_cmd.relocs)[i],
196
+
&((struct drm_qxl_reloc *)(uintptr_t)user_cmd.relocs)[i],
197
197
sizeof(reloc))) {
198
198
qxl_bo_list_unreserve(&reloc_list, true);
199
199
qxl_release_unreserve(qdev, release);
+5
-4
drivers/gpu/drm/qxl/qxl_kms.c
+5
-4
drivers/gpu/drm/qxl/qxl_kms.c
···
128
128
129
129
qdev->vram_mapping = io_mapping_create_wc(qdev->vram_base, pci_resource_len(pdev, 0));
130
130
qdev->surface_mapping = io_mapping_create_wc(qdev->surfaceram_base, qdev->surfaceram_size);
131
-
DRM_DEBUG_KMS("qxl: vram %p-%p(%dM %dk), surface %p-%p(%dM %dk)\n",
132
-
(void *)qdev->vram_base, (void *)pci_resource_end(pdev, 0),
131
+
DRM_DEBUG_KMS("qxl: vram %llx-%llx(%dM %dk), surface %llx-%llx(%dM %dk)\n",
132
+
(unsigned long long)qdev->vram_base,
133
+
(unsigned long long)pci_resource_end(pdev, 0),
133
134
(int)pci_resource_len(pdev, 0) / 1024 / 1024,
134
135
(int)pci_resource_len(pdev, 0) / 1024,
135
-
(void *)qdev->surfaceram_base,
136
-
(void *)pci_resource_end(pdev, 1),
136
+
(unsigned long long)qdev->surfaceram_base,
137
+
(unsigned long long)pci_resource_end(pdev, 1),
137
138
(int)qdev->surfaceram_size / 1024 / 1024,
138
139
(int)qdev->surfaceram_size / 1024);
139
140