rpms/kernel/devel drm-modesetting-radeon.patch, 1.31, 1.32 kernel.spec, 1.996, 1.997
Dave Airlie
airlied at fedoraproject.org
Wed Oct 1 03:09:25 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29022
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Log Message:
- drm modesetting - radeon add some fixes
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.31 -r 1.32 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- drm-modesetting-radeon.patch 23 Sep 2008 06:57:58 -0000 1.31
+++ drm-modesetting-radeon.patch 1 Oct 2008 03:09:24 -0000 1.32
@@ -1,16 +1,67 @@
-commit 39f9d73e619b02a17731c737b3452664e7599ec5
+commit 9ca2633c13cdba9da4fa76402bf6fdf81a104c89
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Oct 1 11:27:02 2008 +1000
+
+ radeon: fixup GEM pinned offset retrieval for mesa
+
+commit 1c32cd10e4e738ed8ea95fac24a52788ccebff36
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Oct 1 11:25:54 2008 +1000
+
+ drm: fixup clean flag handling properly
+
+commit 4d996424e3240b4e507f3f42619dc65d3c0397b2
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Sep 29 14:57:11 2008 +1000
+
+ radeon: use atom for ext tmds on r4xx
+
+commit 1bf07074508ff2b206ed84ad775f0a1c8bd94dd2
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Sep 29 14:56:32 2008 +1000
+
+ radeon: make atom on r4xx a module option
+
+ default is legacy modesetting. pass module option r4xx_atom
+ to try using atom on r4xx.
+
+commit dc9923a8efbf8ed64f5b066470c9ddbcfd2dd6d7
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Sep 29 14:55:16 2008 +1000
+
+ radeon: first pass at using atombios on r4xx hw
+
+commit 1e6c33b4f9582ad10e0122110776e6ed40b01e5e
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Sep 29 14:50:47 2008 +1000
+
+ radeon: add r600 modesetting registers writes
+
+commit 6101f4eb7947b27665576a0abd4aec9740bc1f84
+Author: Jakob Bornecrantz <jakob at tungstengraphics.com>
+Date: Mon Sep 29 14:49:27 2008 +1000
+
+ drm: separate modesetting userspace bits into drm_mode.h
+
+commit 9cfb2507af5c2459e957e692875126873ed14227
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Sep 29 14:45:11 2008 +1000
+
+ radeon: parse object tables for connectors on r600
+
+commit c3100d0d849205bcffe3b180f151b94b8792969e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 23 16:34:55 2008 +1000
radeon: fix minor cursor disappearing issues
-commit 14eed5a3ffea4629d8189605a6ece8762f07d9fe
+commit d2788cc21add1e650e3c448e9869ff5cc2baed6e
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 18:40:36 2008 -0400
radeon: Fix type in check for tmds type.
-commit 0168869442658dbd7e33e65be597f9089a79e6a8
+commit e4475c94774e4044c4812d6a86ff3f9afbc0a3bd
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 12:00:57 2008 -0400
@@ -19,31 +70,31 @@
This lets us defer handle creation until userspace acutally asks for
one, at which point we also have a drm_file to associate it with.
-commit 0664262b8159ef0c66ad392d2d503c9f016985dc
+commit 47c9a2962fe35ee252c5b6ac6f9ffb193e89cea7
Author: Dave Airlie <airlied at linux.ie>
Date: Sun Sep 21 09:48:51 2008 +1000
drm: fixups on top of rebase
-commit 061cefa1df3eb9529d343188d3897155f00ff16c
+commit 6eabb50b9e2b44d050fea1975bdf3b7432ad9a47
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 03:08:05 2008 +1000
radeon: rmx_fixup() fixes for legacy chips
-commit 3b23502dc6c04204635dc3a84ba5bcea1d190621
+commit a54fbe546ca1ad93d8c10af84ee7d8ed71a84fd8
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 01:55:27 2008 +1000
radeon: fix combios
-commit c059d6eff66af51a9444a01c39b3d759a6a0c729
+commit 77b951cf9313af00b12982f6c92084d3b9443f92
Author: Dave Airlie <airlied at linux.ie>
Date: Fri Sep 19 09:17:36 2008 +1000
radeon: port Alexs patches from modesetting-gem
-commit f35ce101abe8623172636bac692db1d0fd4e529c
+commit fd6e0a93f53c75804d9673f3ae08e134676222e3
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:10:29 2008 -0400
@@ -52,7 +103,7 @@
Shouldn't trigger under normal use and when something breaks, it will
be easier to debug.
-commit e36fdeebf9d0ea75618b693abb1877a1b4a19bdf
+commit bdffcb336dc50ca3d79e079201d0a4748d1f5872
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:07:50 2008 -0400
@@ -61,25 +112,25 @@
The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
accel init.
-commit d9852d3eff1b6d9f164aff30d9a22e6f93a6df08
+commit 75d57c83477a677213a055257c4d6dc5308d4dd3
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 14:53:46 2008 -0400
radeon kms: Get precedence right when computing PLL values.
-commit 2b786dcd4c4d53c4a6cb6405999c968f5ca304ac
+commit 8e1a3b481bf62fd6da776ea41c9f0d8e054012d9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:55:14 2008 +1000
radeon: further LVDS fixes
-commit 0ecedf0ffa7266e3652aee0995e23ca2fe5d8775
+commit 404373b8e8f71e5931d4aedbad1796304ffb319e
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:54:12 2008 +1000
radeon: legacy lvds updates
-commit e46e9dc68d2d3c01b14e19703134252452af724e
+commit 8e2978ca72645194371bf18eda59adc107964c94
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:26:27 2008 +1000
@@ -87,7 +138,7 @@
just fallback around busted stuff for now
-commit 48df612620c266cf324fdd12248b82e4f4d214d8
+commit 6f3d287f6a32bfe15f6a88e0d951cbb44cec6845
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:25:18 2008 +1000
@@ -95,13 +146,13 @@
also dirty buffer on validate
-commit 3a58875d091f808f39b2684480b392a8e1858692
+commit aab1a86a1ff5a26a47ed1da6b31db183dc82e752
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 17:13:32 2008 +1000
radeon: disable blit moves
-commit 26421bce94db32eb3582bd852aca57e5ff3f3760
+commit e71e58a40a641ab64450dcbdc1aa4b452864a4ed
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 16:18:27 2008 +1000
@@ -109,73 +160,73 @@
Normally this will be due to an AGP driver needing updating
-commit 5e7c7a1f7cf302847b6a9632d60cd0daf9f61eb8
+commit abb1474b5a097a2b87d0cd951a41d203e0eb7de4
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:43 2008 +1000
radeon: do proper memory controller init and setup
-commit 8bc3f7fe8ca6ad91354902eee4285838bf00eeaf
+commit ba2910e271403f3313eaa7f3afb5f285f5dd78ba
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:08 2008 +1000
radeon: fix return value
-commit 722125d4dc2748c0b64dbe67492295f4d6d31511
+commit 03af764eb6c0fd263b56298c9526b4130f8ecc3c
[...3014 lines suppressed...]
++ unsigned int type;
++ char name[DRM_DISPLAY_MODE_LEN];
++};
++
++struct drm_mode_card_res {
++ uint64_t fb_id_ptr;
++ uint64_t crtc_id_ptr;
++ uint64_t connector_id_ptr;
++ uint64_t encoder_id_ptr;
++ int count_fbs;
++ int count_crtcs;
++ int count_connectors;
++ int count_encoders;
++ int min_width, max_width;
++ int min_height, max_height;
++};
++
++struct drm_mode_crtc {
++ uint64_t set_connectors_ptr;
++ int count_connectors;
++
++ unsigned int crtc_id; /**< Id */
++ unsigned int fb_id; /**< Id of framebuffer */
++
++ int x, y; /**< Position on the frameuffer */
++
++ uint32_t gamma_size;
++ int mode_valid;
++ struct drm_mode_modeinfo mode;
++};
++
++#define DRM_MODE_ENCODER_NONE 0
++#define DRM_MODE_ENCODER_DAC 1
++#define DRM_MODE_ENCODER_TMDS 2
++#define DRM_MODE_ENCODER_LVDS 3
++#define DRM_MODE_ENCODER_TVDAC 4
++
++struct drm_mode_get_encoder {
++
++ unsigned int encoder_type;
++ unsigned int encoder_id;
++
++ unsigned int crtc_id; /**< Id of crtc */
++
++ uint32_t possible_crtcs;
++ uint32_t possible_clones;
++};
++
++/* This is for connectors with multiple signal types. */
++/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
++#define DRM_MODE_SUBCONNECTOR_Automatic 0
++#define DRM_MODE_SUBCONNECTOR_Unknown 0
++#define DRM_MODE_SUBCONNECTOR_DVID 3
++#define DRM_MODE_SUBCONNECTOR_DVIA 4
++#define DRM_MODE_SUBCONNECTOR_Composite 5
++#define DRM_MODE_SUBCONNECTOR_SVIDEO 6
++#define DRM_MODE_SUBCONNECTOR_Component 8
++
++#define DRM_MODE_CONNECTOR_Unknown 0
++#define DRM_MODE_CONNECTOR_VGA 1
++#define DRM_MODE_CONNECTOR_DVII 2
++#define DRM_MODE_CONNECTOR_DVID 3
++#define DRM_MODE_CONNECTOR_DVIA 4
++#define DRM_MODE_CONNECTOR_Composite 5
++#define DRM_MODE_CONNECTOR_SVIDEO 6
++#define DRM_MODE_CONNECTOR_LVDS 7
++#define DRM_MODE_CONNECTOR_Component 8
++#define DRM_MODE_CONNECTOR_9PinDIN 9
++#define DRM_MODE_CONNECTOR_DisplayPort 10
++#define DRM_MODE_CONNECTOR_HDMIA 11
++#define DRM_MODE_CONNECTOR_HDMIB 12
++
++struct drm_mode_get_connector {
++
++ uint64_t encoders_ptr;
++ uint64_t modes_ptr;
++ uint64_t props_ptr;
++ uint64_t prop_values_ptr;
++
++ int count_modes;
++ int count_props;
++ int count_encoders;
++
++ unsigned int encoder_id; /**< Current Encoder */
++ unsigned int connector_id; /**< Id */
++ unsigned int connector_type;
++ unsigned int connector_type_id;
++
++ unsigned int connection;
++ unsigned int mm_width, mm_height; /**< HxW in millimeters */
++ unsigned int subpixel;
++};
++
++#define DRM_MODE_PROP_PENDING (1<<0)
++#define DRM_MODE_PROP_RANGE (1<<1)
++#define DRM_MODE_PROP_IMMUTABLE (1<<2)
++#define DRM_MODE_PROP_ENUM (1<<3) /* enumerated type with text strings */
++#define DRM_MODE_PROP_BLOB (1<<4)
++
++struct drm_mode_property_enum {
++ uint64_t value;
++ unsigned char name[DRM_PROP_NAME_LEN];
++};
++
++struct drm_mode_get_property {
++ uint64_t values_ptr; /* values and blob lengths */
++ uint64_t enum_blob_ptr; /* enum and blob id ptrs */
++
++ unsigned int prop_id;
++ unsigned int flags;
++ unsigned char name[DRM_PROP_NAME_LEN];
++
++ int count_values;
++ int count_enum_blobs;
++};
++
++struct drm_mode_connector_set_property {
++ uint64_t value;
++ unsigned int prop_id;
++ unsigned int connector_id;
++};
++
++struct drm_mode_get_blob {
++ uint32_t blob_id;
++ uint32_t length;
++ uint64_t data;
++};
++
++struct drm_mode_fb_cmd {
++ unsigned int buffer_id;
++ unsigned int width, height;
++ unsigned int pitch;
++ unsigned int bpp;
++ unsigned int handle;
++ unsigned int depth;
++};
++
++struct drm_mode_mode_cmd {
++ unsigned int connector_id;
++ struct drm_mode_modeinfo mode;
++};
++
++#define DRM_MODE_CURSOR_BO 0x01
++#define DRM_MODE_CURSOR_MOVE 0x02
++
++/*
++ * depending on the value in flags diffrent members are used.
++ *
++ * CURSOR_BO uses
++ * crtc
++ * width
++ * height
++ * handle - if 0 turns the cursor of
++ *
++ * CURSOR_MOVE uses
++ * crtc
++ * x
++ * y
++ */
++struct drm_mode_cursor {
++ unsigned int flags;
++ unsigned int crtc;
++ int x;
++ int y;
++ uint32_t width;
++ uint32_t height;
++ unsigned int handle;
++};
++
++/*
++ * oh so ugly hotplug
++ */
++struct drm_mode_hotplug {
++ uint32_t counter;
++};
++
++struct drm_mode_crtc_lut {
++
++ uint32_t crtc_id;
++ uint32_t gamma_size;
++
++ /* pointers to arrays */
++ uint64_t red;
++ uint64_t green;
++ uint64_t blue;
++};
++
++#endif
diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h
new file mode 100644
index 0000000..fa9fd96
@@ -51476,7 +51917,7 @@
#ifndef CONFIG_MMU
diff --git a/include/linux/pci.h b/include/linux/pci.h
-index c0e1400..5094fb3 100644
+index 98dc624..dff12eb 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -312,6 +312,16 @@ struct pci_bus {
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -r1.996 -r1.997
--- kernel.spec 30 Sep 2008 19:20:32 -0000 1.996
+++ kernel.spec 1 Oct 2008 03:09:24 -0000 1.997
@@ -1739,6 +1739,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Wed Oct 01 2008 Dave Airlie <airlied at redhat.com>
+- drm modesetting - radeon add some fixes
+
* Tue Sep 30 2008 Jeremy Katz <katzj at redhat.com>
- update to squashfs 3.4
More information about the scm-commits
mailing list