Hi Linus,
Please pull the 'drm-fixes' branch from
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
Have been out on holidays, so sorry these are a bit late, the radeon one
fixes a regression reported since -rc1 so is most important.
Dave.
drivers/gpu/drm/drm_bufs.c | 3 +-
drivers/gpu/drm/drm_crtc.c | 7 ++-
drivers/gpu/drm/drm_crtc_helper.c | 109 ++++++++++++++++++++++++++++++++++-
drivers/gpu/drm/drm_edid.c | 5 ++
drivers/gpu/drm/drm_irq.c | 8 ++-
drivers/gpu/drm/drm_sysfs.c | 7 +-
drivers/gpu/drm/i915/i915_dma.c | 12 +---
drivers/gpu/drm/i915/intel_crt.c | 6 +--
drivers/gpu/drm/i915/intel_dvo.c | 1 +
drivers/gpu/drm/i915/intel_hdmi.c | 1 +
drivers/gpu/drm/i915/intel_lvds.c | 8 +--
drivers/gpu/drm/i915/intel_sdvo.c | 1 +
drivers/gpu/drm/i915/intel_tv.c | 1 +
drivers/gpu/drm/radeon/radeon_cp.c | 4 +-
drivers/gpu/drm/radeon/radeon_drv.h | 5 +-
include/drm/drm_crtc.h | 3 +
include/drm/drm_crtc_helper.h | 2 +
17 files changed, 151 insertions(+), 32 deletions(-)
commit fc43896630a421321a19d7970bac27ac94e9d162
Author: Adam Jackson <[email protected]>
Date: Thu Jun 4 10:20:34 2009 +1000
drm: ignore EDID with really tiny modes.
Some EDIDs lie and report tiny modes that aren't possible. Ignore
these modes.
Signed-off-by: Adam Jackson <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 6c51d1cfa0a370b48a157163340190cf5fd2346b
Author: Ben Skeggs <[email protected]>
Date: Tue May 26 10:35:52 2009 +1000
drm: don't associate _DRM_DRIVER maps with a master
A driver will use the _DRM_DRIVER map flag to indicate that it wants
to be responsible for removing the map itself, bypassing the DRM's
automagic cleanup code.
Since the multi-master changes this has been broken, resulting in some
drivers having their registers unmapped before it's finished with them.
Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 93c05f222413e3a16e8785f252db4726693abd71
Author: Jaswinder Singh Rajput <[email protected]>
Date: Thu Jun 4 09:41:19 2009 +1000
drm/i915: intel_lvds.c fix section mismatch
intel_no_lvds[] does not require __initdata as it is used only by
void intel_lvds_init(struct drm_device *dev).
Signed-off-by: Jaswinder Singh Rajput <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit c9fb15f60eb517c958dec64dca9357bf62bf2201
Author: Keith Packard <[email protected]>
Date: Sat May 30 20:42:28 2009 -0700
drm: Hook up DPMS property handling in drm_crtc.c. Add drm_helper_connector_dpms.
Making the drm_crtc.c code recognize the DPMS property and invoke the
connector->dpms function doesn't remove any capability from the driver while
reducing code duplication.
That just highlighted the problem with the existing DPMS functions which
could turn off the connector, but failed to turn off any relevant crtcs. The
new drm_helper_connector_dpms function manages all of that, using the
drm_helper-specific crtc and encoder dpms functions, automatically computing
the appropriate DPMS level for each object in the system.
This fixes the current troubles in the i915 driver which left PLLs, pipes
and planes running while in DPMS_OFF mode or even while they were unused.
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit e36ebaf49274ffa78f17b62bcae4c92c33b5b391
Author: Keith Packard <[email protected]>
Date: Sat May 30 20:42:26 2009 -0700
drm: set permissions on edid file to 0444
Without initializing the sysfs attributes for the edid file,
it was created with mode 0, making it difficult for applications to use.
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 75185c929ed241f5cf1aa28999b8012181e2c7cb
Author: Keith Packard <[email protected]>
Date: Sat May 30 20:42:25 2009 -0700
drm: add newlines to text sysfs files
The contents of various simple text files in sysfs should end with
a newline to make them easier to read from the console.
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
commit 9863871bd1bbf218b921af5e0bc48ca4f6ea9f12
Author: Dave Airlie <[email protected]>
Date: Thu Jun 4 07:08:13 2009 +1000
drm/radeon: fix ring free alignment calculations
fd.o bz#21849
We were aligning to +16 dwords, instead of to the next 16dword
boundary in the ring. Fix the calculation to go to the next 16dword
boundary when space checking.
Signed-off-by: Dave Airlie <[email protected]>
commit b8da7de56ca0ad34726478a50d138a29a9ff76cb
Author: Dave Airlie <[email protected]>
Date: Tue Jun 2 16:50:35 2009 +1000
drm: fix irq naming for kms drivers.
allocating devname in the i915 driver was a hack originally and I
forgot to figure out how to do this properly back then.
So this is the cleaner version that just picks devname or driver name
in the irq code.
It removes the devname allocs from the i915 driver.
Signed-off-by: Dave Airlie <[email protected]>
On Thu, Jun 04, 2009 at 04:39:50AM +0100, Dave Airlie wrote:
>
> Hi Linus,
>
> Please pull the 'drm-fixes' branch from
> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
>
> Have been out on holidays, so sorry these are a bit late, the radeon one
> fixes a regression reported since -rc1 so is most important.
>
These ?fixes? break DRI on my Radeon HD 3300 (RS780):
drmOpenDevice: node name is /dev/dri/card0
drmOpenDevice: open result is 10, (OK)
drmOpenDevice: node name is /dev/dri/card0
drmOpenDevice: open result is 10, (OK)
drmOpenByBusid: Searching for BusID pci:0000:01:05.0
drmOpenDevice: node name is /dev/dri/card0
drmOpenDevice: open result is 10, (OK)
drmOpenByBusid: drmOpenMinor returns 10
drmOpenByBusid: drmGetBusid reports pci:0000:01:05.0
(II) [drm] DRM interface version 1.3
(II) [drm] Could not create SAREA for DRM lock.
(EE) RADEON(0): [dri] DRIScreenInit failed. Disabling DRI.
(II) RADEON(0): RADEONRestoreMemMapRegisters() :
(II) RADEON(0): MC_FB_LOCATION : 0x00c700c0 0x00c700c0
(II) RADEON(0): MC_AGP_LOCATION : 0x003f0000
(==) RADEON(0): Backing store disabled
(WW) RADEON(0): Direct rendering disabled
(EE) RADEON(0): Acceleration initialization failed
(II) RADEON(0): Acceleration disabled
Full Xorg.0.log is attached.
--
Markus
On Fri, Jun 5, 2009 at 3:42 PM, Markus
Trippelsdorf<[email protected]> wrote:
> On Thu, Jun 04, 2009 at 04:39:50AM +0100, Dave Airlie wrote:
>>
>> Hi Linus,
>>
>> Please pull the 'drm-fixes' branch from
>> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
Okay Linus if you do pull this can you revert
6c51d1cfa0a370b48a157163340190cf5fd2346b
that works fine on my intel hw but seems to have a bad effect on radeon.
I'll get Ben to chase down where it goes wrong.
Dave.
>>
>> Have been out on holidays, so sorry these are a bit late, the radeon one
>> fixes a regression reported since -rc1 so is most important.
>>
>
> These ?fixes? break DRI on my Radeon HD 3300 (RS780):
>
> drmOpenDevice: node name is /dev/dri/card0
> drmOpenDevice: open result is 10, (OK)
> drmOpenDevice: node name is /dev/dri/card0
> drmOpenDevice: open result is 10, (OK)
> drmOpenByBusid: Searching for BusID pci:0000:01:05.0
> drmOpenDevice: node name is /dev/dri/card0
> drmOpenDevice: open result is 10, (OK)
> drmOpenByBusid: drmOpenMinor returns 10
> drmOpenByBusid: drmGetBusid reports pci:0000:01:05.0
> (II) [drm] DRM interface version 1.3
> (II) [drm] Could not create SAREA for DRM lock.
> (EE) RADEON(0): [dri] DRIScreenInit failed. ?Disabling DRI.
> (II) RADEON(0): RADEONRestoreMemMapRegisters() :
> (II) RADEON(0): ? MC_FB_LOCATION ? : 0x00c700c0 0x00c700c0
> (II) RADEON(0): ? MC_AGP_LOCATION ?: 0x003f0000
> (==) RADEON(0): Backing store disabled
> (WW) RADEON(0): Direct rendering disabled
> (EE) RADEON(0): Acceleration initialization failed
> (II) RADEON(0): Acceleration disabled
>
> Full Xorg.0.log is attached.
>
> --
> Markus
>
2009/6/5 Dave Airlie <[email protected]>:
>>> Please pull the 'drm-fixes' branch from
>>> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
>
> Okay Linus if you do pull this can you revert
> 6c51d1cfa0a370b48a157163340190cf5fd2346b
It already went in, before your message.
-Timo
On Fri, 5 Jun 2009, Dave Airlie wrote:
> On Fri, Jun 5, 2009 at 3:42 PM, Markus
> Trippelsdorf<[email protected]> wrote:
> > On Thu, Jun 04, 2009 at 04:39:50AM +0100, Dave Airlie wrote:
> >>
> >> Hi Linus,
> >>
> >> Please pull the 'drm-fixes' branch from
> >> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes
>
>
> Okay Linus if you do pull this can you revert
> 6c51d1cfa0a370b48a157163340190cf5fd2346b
>
> that works fine on my intel hw but seems to have a bad effect on radeon.
Grr.
That pull request probably shouldn't have been sent to me at all. It's
clearly almost totally untested, and it was damn late in the -rc series.
Am I going to be in the situation that I simply can't safely pull from you
any more after -rc2 or so? This is _not_ working.
Linus
> >
> > that works fine on my intel hw but seems to have a bad effect on radeon.
>
> Grr.
>
> That pull request probably shouldn't have been sent to me at all. It's
> clearly almost totally untested, and it was damn late in the -rc series.
>
> Am I going to be in the situation that I simply can't safely pull from you
> any more after -rc2 or so? This is _not_ working.
Well I booted it on my laptop and one test box which were the only things
I had with a reasonable userspace on them, and I tested that the KMS
changes which were a lot bigger worked, but I was jetlagged to hell
and I probably shouldn't have pushed the maps change, I was 50/50 on it, I
only realised afterwards you wanted to release this weekend,
Given that I read the 2.6.30-rc8 announce later, I would have just pushed
the single regression radeon fix, I only put some of the other patches in
due to my holidays meaning they were sitting in my inbox.
Dave.