rpms/kernel/devel drm-modesetting-radeon.patch, 1.18, 1.19 kernel.spec, 1.911, 1.912
Dave Airlie
airlied at fedoraproject.org
Fri Aug 29 00:04:47 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27899
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Log Message:
* Fri Aug 29 2008 Dave Airlie <airlied at redhat.com>
- change boot option from text to nomodeset and make drivers debuggable later
drm-modesetting-radeon.patch:
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- drm-modesetting-radeon.patch 28 Aug 2008 23:44:24 -0000 1.18
+++ drm-modesetting-radeon.patch 29 Aug 2008 00:04:46 -0000 1.19
@@ -1,3 +1,11 @@
+commit 098dd0e6b64b5ec62988dc2cd2168ab5154899e1
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Aug 29 09:59:02 2008 +1000
+
+ drm: move text mode check to driver.
+
+ also change name from text to nomodeset
+
commit 5aa38d1a3c8fbf239abeb6f73a9a76acc5124d5c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 21:22:27 2008 +1000
@@ -7780,18 +7788,10 @@
/**
* Free a buffer.
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index 452c2d8..3bab487 100644
+index 452c2d8..3c9d0fd 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
-@@ -48,6 +48,7 @@
-
- #include "drmP.h"
- #include "drm_core.h"
-+#include <linux/console.h>
-
- static int drm_version(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-@@ -74,6 +75,9 @@ static struct drm_ioctl_desc drm_ioctls[] = {
+@@ -74,6 +74,9 @@ static struct drm_ioctl_desc drm_ioctls[] = {
DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_setsareactx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_getsareactx, DRM_AUTH),
@@ -7801,7 +7801,7 @@
DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
-@@ -117,6 +121,32 @@ static struct drm_ioctl_desc drm_ioctls[] = {
+@@ -117,6 +120,32 @@ static struct drm_ioctl_desc drm_ioctls[] = {
DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, 0),
DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
@@ -7834,7 +7834,7 @@
};
#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls )
-@@ -132,8 +162,6 @@ static struct drm_ioctl_desc drm_ioctls[] = {
+@@ -132,8 +161,6 @@ static struct drm_ioctl_desc drm_ioctls[] = {
*/
int drm_lastclose(struct drm_device * dev)
{
@@ -7843,7 +7843,7 @@
struct drm_vma_entry *vma, *vma_temp;
int i;
-@@ -141,15 +169,10 @@ int drm_lastclose(struct drm_device * dev)
+@@ -141,15 +168,10 @@ int drm_lastclose(struct drm_device * dev)
if (dev->driver->lastclose)
dev->driver->lastclose(dev);
@@ -7861,7 +7861,7 @@
drm_irq_uninstall(dev);
mutex_lock(&dev->struct_mutex);
-@@ -158,18 +181,8 @@ int drm_lastclose(struct drm_device * dev)
+@@ -158,18 +180,8 @@ int drm_lastclose(struct drm_device * dev)
drm_drawable_free_all(dev);
del_timer(&dev->timer);
@@ -7881,7 +7881,7 @@
struct drm_agp_mem *entry, *tempe;
/* Remove AGP resources, but leave dev->agp
-@@ -188,7 +201,7 @@ int drm_lastclose(struct drm_device * dev)
+@@ -188,7 +200,7 @@ int drm_lastclose(struct drm_device * dev)
dev->agp->acquired = 0;
dev->agp->enabled = 0;
}
@@ -7890,7 +7890,7 @@
drm_sg_cleanup(dev->sg);
dev->sg = NULL;
}
-@@ -199,13 +212,6 @@ int drm_lastclose(struct drm_device * dev)
+@@ -199,13 +211,6 @@ int drm_lastclose(struct drm_device * dev)
drm_free(vma, sizeof(*vma), DRM_MEM_VMAS);
}
@@ -7904,7 +7904,7 @@
if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE) && dev->queuelist) {
for (i = 0; i < dev->queue_count; i++) {
if (dev->queuelist[i]) {
-@@ -222,14 +228,10 @@ int drm_lastclose(struct drm_device * dev)
+@@ -222,14 +227,10 @@ int drm_lastclose(struct drm_device * dev)
}
dev->queue_count = 0;
@@ -7921,18 +7921,7 @@
mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("lastclose completed\n");
-@@ -256,6 +258,10 @@ int drm_init(struct drm_driver *driver)
- int i;
-
- DRM_DEBUG("\n");
-+#ifdef CONFIG_VGA_CONSOLE
-+ if (vgacon_text_force())
-+ driver->driver_features &= ~DRIVER_MODESET;
-+#endif
-
- for (i = 0; driver->pci_driver.id_table[i].vendor != 0; i++) {
- pid = (struct pci_device_id *)&driver->pci_driver.id_table[i];
-@@ -312,8 +318,11 @@ static void drm_cleanup(struct drm_device * dev)
+@@ -312,8 +313,11 @@ static void drm_cleanup(struct drm_device * dev)
drm_ht_remove(&dev->map_hash);
drm_ctxbitmap_cleanup(dev);
@@ -7944,7 +7933,7 @@
if (drm_put_dev(dev))
DRM_ERROR("Cannot unload module\n");
}
-@@ -328,8 +337,13 @@ static int drm_minors_cleanup(int id, void *ptr, void *data)
+@@ -328,8 +332,13 @@ static int drm_minors_cleanup(int id, void *ptr, void *data)
if (minor->dev->driver != driver)
return 0;
@@ -7960,7 +7949,7 @@
if (dev)
pci_dev_put(dev->pdev);
-@@ -357,9 +371,34 @@ static const struct file_operations drm_stub_fops = {
+@@ -357,9 +366,34 @@ static const struct file_operations drm_stub_fops = {
static int __init drm_core_init(void)
{
int ret = -ENOMEM;
@@ -33211,11 +33200,14 @@
+
+}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 637bd7f..664c171 100644
+index 637bd7f..1740aec 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -37,10 +37,17 @@
+@@ -35,12 +35,20 @@
+ #include "radeon_drv.h"
+
#include "drm_pciids.h"
++#include <linux/console.h>
int radeon_no_wb;
+int radeon_dynclks = 1;
@@ -33223,7 +33215,7 @@
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
module_param_named(no_wb, radeon_no_wb, int, 0444);
-+unsigned int radeon_modeset = -1;
++int radeon_modeset = -1;
+module_param_named(modeset, radeon_modeset, int, 0400);
+
+MODULE_PARM_DESC(dynclks, "Disable/Enable dynamic clocks");
@@ -33232,7 +33224,7 @@
static int dri_library_name(struct drm_device *dev, char *buf)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
-@@ -55,12 +62,33 @@ static int dri_library_name(struct drm_device *dev, char *buf)
+@@ -55,12 +63,33 @@ static int dri_library_name(struct drm_device *dev, char *buf)
static struct pci_device_id pciidlist[] = {
radeon_PCI_IDS
};
@@ -33267,7 +33259,7 @@
.dev_priv_size = sizeof(drm_radeon_buf_priv_t),
.load = radeon_driver_load,
.firstopen = radeon_driver_firstopen,
-@@ -80,7 +108,11 @@ static struct drm_driver driver = {
+@@ -80,7 +109,11 @@ static struct drm_driver driver = {
.get_map_ofs = drm_core_get_map_ofs,
.get_reg_ofs = drm_core_get_reg_ofs,
.ioctls = radeon_ioctls,
@@ -33279,7 +33271,7 @@
.fops = {
.owner = THIS_MODULE,
.open = drm_open,
-@@ -99,6 +131,9 @@ static struct drm_driver driver = {
+@@ -99,6 +132,9 @@ static struct drm_driver driver = {
.id_table = pciidlist,
},
@@ -33289,7 +33281,7 @@
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
.date = DRIVER_DATE,
-@@ -110,6 +145,16 @@ static struct drm_driver driver = {
+@@ -110,6 +146,23 @@ static struct drm_driver driver = {
static int __init radeon_init(void)
{
driver.num_ioctls = radeon_max_ioctl;
@@ -33303,6 +33295,13 @@
+ if (radeon_modeset == 1)
+ driver.driver_features |= DRIVER_MODESET;
+
++ /* if the vga console setting is enabled still
++ * let modprobe override it */
++#ifdef CONFIG_VGA_CONSOLE
++ if (vgacon_text_force() && radeon_modeset == -1)
++ driver.driver_features &= ~DRIVER_MODESET;
++#endif
++
return drm_init(&driver);
}
@@ -46500,7 +46499,7 @@
{
unsigned int pos, reg;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
-index bd1f57b..646c9ec 100644
+index bd1f57b..e611f46 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -112,6 +112,23 @@ static int vga_video_font_height;
@@ -46522,7 +46521,7 @@
+}
+
+/* force text mode - used by kernel modesetting */
-+__setup("text", text_mode);
++__setup("nomodeset", text_mode);
+
static int __init no_scroll(char *str)
{
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- kernel.spec 28 Aug 2008 23:44:24 -0000 1.911
+++ kernel.spec 29 Aug 2008 00:04:47 -0000 1.912
@@ -1740,6 +1740,9 @@
%changelog
* Fri Aug 29 2008 Dave Airlie <airlied at redhat.com>
+- change boot option from text to nomodeset and make drivers debuggable later
+
+* Fri Aug 29 2008 Dave Airlie <airlied at redhat.com>
- rebase i915 GEM support to avoid oopsing.
* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com>
More information about the fedora-extras-commits
mailing list