Dave & Alan:
Maybe I am goofing up something on my end, but gma500 driver on drm-next branch won't compile for me. I have to apply the two patches that follow this note to make it work.
The first is a trivial oversight, but the second makes me wonder whether a stale driver was merged.
-- Ilija
psb_gfx.mod.c is a generated file and should not be revision controlled
Signed-off-by: Ilija Hadzic ihadzic@research.bell-labs.com --- drivers/gpu/drm/gma500/psb_gfx.mod.c | 51 ---------------------------------- 1 files changed, 0 insertions(+), 51 deletions(-) delete mode 100644 drivers/gpu/drm/gma500/psb_gfx.mod.c
diff --git a/drivers/gpu/drm/gma500/psb_gfx.mod.c b/drivers/gpu/drm/gma500/psb_gfx.mod.c deleted file mode 100644 index 3c0bfdf..0000000 --- a/drivers/gpu/drm/gma500/psb_gfx.mod.c +++ /dev/null @@ -1,51 +0,0 @@ -#include <linux/module.h> -#include <linux/vermagic.h> -#include <linux/compiler.h> - -MODULE_INFO(vermagic, VERMAGIC_STRING); - -struct module __this_module -__attribute__((section(".gnu.linkonce.this_module"))) = { - .name = KBUILD_MODNAME, - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif - .arch = MODULE_ARCH_INIT, -}; - -MODULE_INFO(staging, "Y"); - -static const char __module_depends[] -__used -__attribute__((section(".modinfo"))) = -"depends=drm,drm_kms_helper,video,i2c-algo-bit"; - -MODULE_ALIAS("pci:v00008086d00008108sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00008109sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004100sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004101sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004102sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004103sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004104sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004105sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004106sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00004107sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000130sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000131sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000132sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000133sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000134sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000135sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000136sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000137sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE0sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE1sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE2sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE3sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE4sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE5sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE6sv*sd*bc*sc*i*"); -MODULE_ALIAS("pci:v00008086d00000BE7sv*sd*bc*sc*i*"); - -MODULE_INFO(srcversion, "51B3334F342F5EEAC93AF22");
fops field in drm_driver is a pointer to file_operations struct, not embedded structure
Signed-off-by: Ilija Hadzic ihadzic@research.bell-labs.com --- drivers/gpu/drm/gma500/psb_drv.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 3fc50d5..97b5b11 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -1130,6 +1130,17 @@ static struct vm_operations_struct psb_gem_vm_ops = { .close = drm_gem_vm_close, };
+static const struct file_operations psb_gem_fops = { + .owner = THIS_MODULE, + .open = drm_open, + .release = drm_release, + .unlocked_ioctl = psb_unlocked_ioctl, + .mmap = drm_gem_mmap, + .poll = drm_poll, + .fasync = drm_fasync, + .read = drm_read, +}; + static struct drm_driver driver = { .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \ DRIVER_IRQ_VBL | DRIVER_MODESET | DRIVER_GEM , @@ -1158,17 +1169,7 @@ static struct drm_driver driver = { .dumb_create = psb_gem_dumb_create, .dumb_map_offset = psb_gem_dumb_map_gtt, .dumb_destroy = psb_gem_dumb_destroy, - - .fops = { - .owner = THIS_MODULE, - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = psb_unlocked_ioctl, - .mmap = drm_gem_mmap, - .poll = drm_poll, - .fasync = drm_fasync, - .read = drm_read, - }, + .fops = &psb_gem_fops, .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = PSB_DRM_DRIVER_DATE,
On Sun, 27 Nov 2011 11:08:31 -0500 Ilija Hadzic ihadzic@research.bell-labs.com wrote:
Dave & Alan:
Maybe I am goofing up something on my end, but gma500 driver on drm-next branch won't compile for me. I have to apply the two patches that follow this note to make it work.
The first is a trivial oversight, but the second makes me wonder whether a stale driver was merged.
Slightly - simply because getting it pushed ready to merge took a spot of time. I'll go over the patches and anything else pending tomorrow as well as apply a few other pending fixes.
Alan
dri-devel@lists.freedesktop.org
-
Alan Cox -
Ilija Hadzic