[git pull] drm-fixes

[git pull] drm-fixes

[Dave Airlie]

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

This includes a bunch of kms fixes, along one with regression with the 
freeing of maps from the multi-master changes, along with make drm build 
on MIPS work.

Dave.

 drivers/gpu/drm/drm_agpsupport.c  |    3 ++-
 drivers/gpu/drm/drm_crtc.c        |   14 +++++++++-----
 drivers/gpu/drm/drm_drv.c         |    4 ++++
 drivers/gpu/drm/drm_edid.c        |    2 +-
 drivers/gpu/drm/drm_stub.c        |    8 ++++++++
 drivers/gpu/drm/i915/i915_dma.c   |    7 ++++---
 drivers/gpu/drm/i915/i915_gem.c   |    2 +-
 drivers/gpu/drm/i915/intel_lvds.c |   13 +++++++++++++
 include/drm/drm_crtc.h            |    3 ++-
 9 files changed, 44 insertions(+), 12 deletions(-)

commit 2906f0258770d3a9c4e65364df8acc904e148bbe
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Tue Jan 20 19:10:54 2009 -0800

    drm/i915: Fix cursor physical address choice to match the 2D driver.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>

commit 1bb88edb7a3769992026f34fd648bb459b0469aa
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Jan 15 01:16:25 2009 -0800

    drm: stash AGP include under the do-we-have-AGP ifdef
    
    This fixes the MIPS with DRM build.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Tested-by: Martin Michlmayr <tbm@cyrius.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 4942f8b23b56a3f9a713d4436338710579329ffc
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Jan 22 22:23:53 2009 +1000

    drm: don't whine about not reading EDID data
    
    Make this message a little quieter, since it's common and not necessarily
    indicative of a problem.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 335041ed31d774391d9add49824d05e7d19d93e9
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Jan 22 22:22:06 2009 +1000

    drm/i915: hook up LVDS DPMS property
    
    The LVDS output supports DPMS calls, but we never hooked up the property code,
    so set property calls didn't actually do anything.  Implement a set_property
    callback for the LVDS output so that the right thing happens.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit ed2dd4b0cc1494c27478f4ea8452f68d2037a60c
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Jan 22 22:21:16 2009 +1000

    drm/i915: remove unnecessary debug output in KMS init
    
    We don't really need to print out the FB BAR...
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 260883c85611d3a7e27130af9aef15252856e14f
Author: Dave Airlie <airlied@redhat.com>
Date:   Thu Jan 22 17:58:49 2009 +1000

    i915: fix freeing path for gem phys objects.
    
    This off-by-one was pointed out by Jesse Barnes.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ad2563c2e42fc67b0976aeb70e9f3faf1c1196e8
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Jan 19 17:21:45 2009 +1000

    drm: create mode_config idr lock
    
    Create a separate mode_config IDR lock for simplicity.  The core DRM
    config structures (connector, mode, etc. lists) are still protected by
    the mode_config mutex, but the CRTC IDR (used for the various identifier
    IDs) is now protected by the mode_config idr_mutex.  Simplifies the
    locking a bit and removes a warning.
    
    All objects are protected by the config mutex, we may in the future,
    split the object further to have reference counts.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit c1ff85d97708550e634fb6fa099c463db90fc40d
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Jan 19 17:17:58 2009 +1000

    drm: fix leak of device mappings since multi-master changes.
    
    Device maps now contain a link to the master that created them, so
    when cleaning up the master, remove any maps that are connected to it.
    Also delete any remaining maps at driver unload time.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

Re: [git pull] drm-fixes

[Linus Torvalds]

Dave,
 you have some odd and slightly git usage model, which shows up in various 
commits. Lookie here as an example from comit 335041ed:

	Author: Jesse Barnes <jbarnes@virtuousgeek.org>  2009-01-22 04:22:06
	Committer: Dave Airlie <airlied@redhat.com>  2009-01-22 04:22:06
	
	    drm/i915: hook up LVDS DPMS property
	    
	    The LVDS output supports DPMS calls, but we never hooked up the property code,
	    so set property calls didn't actually do anything.  Implement a set_property
	    callback for the LVDS output so that the right thing happens.
	    
	    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

and this has a few issues that trigger my "Dave is doing something wrong" 
reaction:

 - The signed-off-chain is incomplete from the author to the committer.

   A _good_ sign-off will always have the sign-offs from the author and 
   the committer and everybody in between. This one does not. Clearly 
   Jesse did sign off on his work, but he is not listed as the committer: 
   you are. And that means that your sign-off is missing.

 - You are clearly lying about dates and/or dropping them.

   The dates for authorship and committing are the same, yet the author 
   and committer are clearly _not_ the same. You can try to convince me 
   that you committed Jesse's work the same second he sent it to you, but 
   quite frankly, I don't buy it. End result: you've done something to 
   drop the date information.

I don't know what tools you use, or what process the patches go through, 
but I do know that whatever your process is, it's losing information. 
Please fix it.

I've pulled, but I hope I won't have to see these issues in future pull 
requests.

			Linus

Re: [git pull] drm-fixes

[Dave Airlie]

On Tue, Jan 27, 2009 at 4:23 AM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
>
> Dave,
>  you have some odd and slightly git usage model, which shows up in various
> commits. Lookie here as an example from comit 335041ed:
>
>        Author: Jesse Barnes <jbarnes@virtuousgeek.org>  2009-01-22 04:22:06
>        Committer: Dave Airlie <airlied@redhat.com>  2009-01-22 04:22:06
>
>            drm/i915: hook up LVDS DPMS property
>
>            The LVDS output supports DPMS calls, but we never hooked up the property code,
>            so set property calls didn't actually do anything.  Implement a set_property
>            callback for the LVDS output so that the right thing happens.
>
>            Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> and this has a few issues that trigger my "Dave is doing something wrong"
> reaction:
>
>  - The signed-off-chain is incomplete from the author to the committer.
>
>   A _good_ sign-off will always have the sign-offs from the author and
>   the committer and everybody in between. This one does not. Clearly
>   Jesse did sign off on his work, but he is not listed as the committer:
>   you are. And that means that your sign-off is missing.

This one is my fault, I think I just cut-n-pasted the commit message
in my sleep,
and forgot to add my signoff.

>
>  - You are clearly lying about dates and/or dropping them.
>
>   The dates for authorship and committing are the same, yet the author
>   and committer are clearly _not_ the same. You can try to convince me
>   that you committed Jesse's work the same second he sent it to you, but
>   quite frankly, I don't buy it. End result: you've done something to
>   drop the date information

Well I'm not 100% sure what happened for this patch, I suspect,
jbarnes sent patch a week
or two ago, it misapplied against the tree I had currently when
applied with git-am, it didn't work so I hand
applied the patch with patch and then did git commit
--author="jbarnes" as he did write it, I just munged it.

Now I'm unsure how I should best handle this, in a world where I can
devote a lot more time to
maintaining this, I would sent Jesse a mail saying, rebase, he'd reply
with a rebase and I'd apply it,
however I generally find it easier to just fix this stuff up on the
run as its synchronous. Should
I be specifying a date somewhere in the commit message?

Dave.

Re: [git pull] drm-fixes

[Sam Ravnborg]

> 
> Well I'm not 100% sure what happened for this patch, I suspect,
> jbarnes sent patch a week
> or two ago, it misapplied against the tree I had currently when
> applied with git-am, it didn't work so I hand
> applied the patch with patch and then did git commit
> --author="jbarnes" as he did write it, I just munged it.
> 
> Now I'm unsure how I should best handle this, in a world where I can
> devote a lot more time to
> maintaining this, I would sent Jesse a mail saying, rebase, he'd reply
> with a rebase and I'd apply it,
> however I generally find it easier to just fix this stuff up on the
> run as its synchronous. Should
> I be specifying a date somewhere in the commit message?

My simple way to deal with this is to:

0) save the mail
1) fix subject and changelog and add my Signed-off-by:
2) apply the patch somehow
3) replace the origianl patch in the (saved) mail
4) git reset --hard (or patch -p1 -R < saved-mail)
5) git am <saved mail>

There must be easier ways to do so I think.
But the above is what my fingers know to do so I do it
routinely.

	Sam

Re: [git pull] drm-fixes

[Linus Torvalds]

On Mon, 26 Jan 2009, Sam Ravnborg wrote:

> > 
> > Well I'm not 100% sure what happened for this patch, I suspect,
> > jbarnes sent patch a week
> > or two ago, it misapplied against the tree I had currently when
> > applied with git-am, it didn't work so I hand
> > applied the patch with patch and then did git commit
> > --author="jbarnes" as he did write it, I just munged it.
> > 
> > Now I'm unsure how I should best handle this, in a world where I can
> > devote a lot more time to
> > maintaining this, I would sent Jesse a mail saying, rebase, he'd reply
> > with a rebase and I'd apply it,
> > however I generally find it easier to just fix this stuff up on the
> > run as its synchronous. Should
> > I be specifying a date somewhere in the commit message?
> 
> My simple way to deal with this is to:
> 
> 0) save the mail
> 1) fix subject and changelog and add my Signed-off-by:
> 2) apply the patch somehow
> 3) replace the origianl patch in the (saved) mail
> 4) git reset --hard (or patch -p1 -R < saved-mail)
> 5) git am <saved mail>
> 
> There must be easier ways to do so I think.

Um. Yes. Something like

	git am -s -C1

which ends up requiring just a single line of context for the patch to 
apply, exactly like the GNU 'patch' program.

The difference being that GNU patch does that incredibly broken thing by 
default, and makes it easy to apply a patch that was already applied quite 
by mistake, because it still works. Git will require you to say explicitly 
that it's ok to have just a single line of context.

Anyway, on its own I wouldn't have reacted - sure, you can just do the 
whole "use patch and then commit as another user" and the times will be 
odd, but the *big* issue with Dave's pull-request was that there were 
multiple cases of just clearly lost information.

In other words, I don't care about the dates. I don't care _how_ you do 
your git commits. And I don't even care if you use the broken "patch" 
command that accepts random line noise as a patch, as long as you check it 
later.

But I _do_ care when it looks like somebody is using a bad process that 
clearly isn't working, and that clearly is dropping things on the floor. 
If it's a "odd things happens very occasionally because I had to use a 
special sequence for it", that's fine.

So when 3 out of 8 patches were somehow missing information (two without 
sign-offs, and the third that had a sign-off but was obviously also done 
by the odd sequence that dropped the timestamp), that's no longer just 
some occasional issue and is a more endemic process problem.

			Linus

Re: [git pull] drm-fixes

[Linus Torvalds]

On Mon, 26 Jan 2009, Linus Torvalds wrote:
> > 
> > There must be easier ways to do so I think.
> 
> Um. Yes. Something like
> 
> 	git am -s -C1
> 
> which ends up requiring just a single line of context for the patch to 
> apply, exactly like the GNU 'patch' program.
> 
> The difference being that GNU patch does that incredibly broken thing by 
> default, and makes it easy to apply a patch that was already applied quite 
> by mistake, because it still works. Git will require you to say explicitly 
> that it's ok to have just a single line of context.

Btw, I _really_ don't want people using -C1 by default. It really is a 
broken default, and there is a reason why I dislike GNU patch for applying 
almost any patch that makes any sense what-so-ever.

So please work with the stricter git defaults. You can still get patches 
that silently apply even if they don't work (there's nothing magical about 
three lines of context - a patch may still apply in the wrong place), but 
it's a lot harder to get those silent screw-ups.

Then, when the strict model doesn't work, take a look by hand, and try to 
figure out why it didn't work. If you decide that you really do want to 
apply the patch, and the changes near-by that causes it to not apply any 
more were really not relevant and don't affect the behaviour of the patch, 
_that_ is when you can use -C1 and --whitespace=fix etc to make it apply 
despite not being a 100% match.

So don't use -C1 and whitespace-fixup blindly. That way lies madness. It 
may _seem_ to be much easier, and yes, 95% of the time it will do the 
right thing, but when it doesn't, it silently does bad things. Please only 
use those flags when you've literally spent a few seconds of a real human 
brain to look at why they are needed.

			Linus

Re: [git pull] drm-fixes

[Johannes Weiner]

On Mon, Jan 26, 2009 at 10:52:35PM +0100, Sam Ravnborg wrote:
> > 
> > Well I'm not 100% sure what happened for this patch, I suspect,
> > jbarnes sent patch a week
> > or two ago, it misapplied against the tree I had currently when
> > applied with git-am, it didn't work so I hand
> > applied the patch with patch and then did git commit
> > --author="jbarnes" as he did write it, I just munged it.
> > 
> > Now I'm unsure how I should best handle this, in a world where I can
> > devote a lot more time to
> > maintaining this, I would sent Jesse a mail saying, rebase, he'd reply
> > with a rebase and I'd apply it,
> > however I generally find it easier to just fix this stuff up on the
> > run as its synchronous. Should
> > I be specifying a date somewhere in the commit message?
> 
> My simple way to deal with this is to:
> 
> 0) save the mail

  1) git am --signoff --interactive mailfile

HTH,
	Hannes

Re: [git pull] drm-fixes

[Daniel Vetter]

Hi Linus,

This pull also contains the fix for the eDP dmesg noise you've reported
(turned out to be a regression introduced in 3.5). Please yell if you
still see them. The DP regression Dave mentioned is a different bug
introduced in 3.4.

Thanks, Daniel

On Sun, Jun 17, 2012 at 08:42:28AM +0100, Dave Airlie wrote:
> Hi Linus,
> 
> radeon is most of the work, one regression, one BUG fix in the new prime 
> code, some fixes to init code to make streamout not lock up the hardware, 
> and just some code to enable users to test HDMI audio on later hw (its off by 
> default).
> 
> Intel adds edp edid caching for some strange Dell Vostros that black 
> screen on startup if keep reading their EDID, and a fix for a DP 
> regression.
> 
> Otherwise fix for via/sis and one to stop udl binding to multiple 
> non-video usb.
> 
> Dave.
> 
> The following changes since commit 9b15b817f3d62409290fd56fe3cbb076a931bb0a:
> 
>   swap: fix shmem swapping when more than 8 areas (2012-06-15 21:48:14 -0700)
> 
> are available in the git repository at:
> 
>   git://people.freedesktop.org/~airlied/linux drm-fixes
> 
> for you to fetch changes up to c4af5c4597a7a5d64e058703e1328f315a59794e:
> 
>   Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes (2012-06-16 14:45:17 +0100)
> 
> ----------------------------------------------------------------
> 
> Alex Deucher (3):
>       drm/radeon: fix regression in dynpm due to multi-ring rework
>       drm/radeon: add some additional 6xx/7xx/EG register init
>       drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx
> 
> Daniel Vetter (2):
>       drm/i915: eDP aux needs vdd
>       Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"
> 
> Dave Airlie (3):
>       drm/udl: only bind to the video devices on the hub.
>       drm/radeon/prime: reserve/unreserve around pin
>       Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
> 
> Jesse Barnes (2):
>       drm/i915: don't enumerate HDMID if an eDP panel is already active on the port
>       drm/i915: cache the EDID for eDP panels
> 
> Márton Németh (2):
>       drm via: initialize object_idr
>       drm sis: initialize object_idr
> 
> Rafał Miłecki (1):
>       drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)
> 
> Randy Dunlap (1):
>       vga_switcheroo.h: fix pci_dev warning
> 
>  drivers/gpu/drm/i915/intel_display.c       |    2 +-
>  drivers/gpu/drm/i915/intel_dp.c            |   60 ++++++++++++++++++++++++----
>  drivers/gpu/drm/radeon/atombios_encoders.c |    4 +-
>  drivers/gpu/drm/radeon/evergreen.c         |    3 ++
>  drivers/gpu/drm/radeon/evergreen_hdmi.c    |    3 --
>  drivers/gpu/drm/radeon/evergreend.h        |    1 +
>  drivers/gpu/drm/radeon/ni.c                |    5 +++
>  drivers/gpu/drm/radeon/r600.c              |    1 +
>  drivers/gpu/drm/radeon/r600_audio.c        |    2 +-
>  drivers/gpu/drm/radeon/r600_cs.c           |   42 +++++++++++++++++++
>  drivers/gpu/drm/radeon/r600_hdmi.c         |    7 +---
>  drivers/gpu/drm/radeon/r600d.h             |    2 +
>  drivers/gpu/drm/radeon/radeon_drv.c        |    3 +-
>  drivers/gpu/drm/radeon/radeon_pm.c         |   10 +++--
>  drivers/gpu/drm/radeon/radeon_prime.c      |   10 ++++-
>  drivers/gpu/drm/radeon/rv770.c             |    5 ++-
>  drivers/gpu/drm/radeon/rv770d.h            |    3 ++
>  drivers/gpu/drm/sis/sis_drv.c              |    2 +-
>  drivers/gpu/drm/udl/udl_drv.c              |   15 ++++++-
>  drivers/gpu/drm/via/via_map.c              |    3 +-
>  include/linux/vga_switcheroo.h             |    2 +
>  21 files changed, 156 insertions(+), 29 deletions(-)

> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel


-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

[git pull] drm-fixes

[Dave Airlie]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 3207 bytes --]


Hi Linus,

radeon is most of the work, one regression, one BUG fix in the new prime 
code, some fixes to init code to make streamout not lock up the hardware, 
and just some code to enable users to test HDMI audio on later hw (its off by 
default).

Intel adds edp edid caching for some strange Dell Vostros that black 
screen on startup if keep reading their EDID, and a fix for a DP 
regression.

Otherwise fix for via/sis and one to stop udl binding to multiple 
non-video usb.

Dave.

The following changes since commit 9b15b817f3d62409290fd56fe3cbb076a931bb0a:

  swap: fix shmem swapping when more than 8 areas (2012-06-15 21:48:14 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to c4af5c4597a7a5d64e058703e1328f315a59794e:

  Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes (2012-06-16 14:45:17 +0100)

----------------------------------------------------------------

Alex Deucher (3):
      drm/radeon: fix regression in dynpm due to multi-ring rework
      drm/radeon: add some additional 6xx/7xx/EG register init
      drm/radeon: add support for STRMOUT_BASE_UPDATE on 7xx

Daniel Vetter (2):
      drm/i915: eDP aux needs vdd
      Revert "drm/i915/dp: Use auxch precharge value of 5 everywhere"

Dave Airlie (3):
      drm/udl: only bind to the video devices on the hub.
      drm/radeon/prime: reserve/unreserve around pin
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Jesse Barnes (2):
      drm/i915: don't enumerate HDMID if an eDP panel is already active on the port
      drm/i915: cache the EDID for eDP panels

Márton Németh (2):
      drm via: initialize object_idr
      drm sis: initialize object_idr

Rafał Miłecki (1):
      drm/radeon: enable HDMI on DCE5 (AKA NI excluding Aruba)

Randy Dunlap (1):
      vga_switcheroo.h: fix pci_dev warning

 drivers/gpu/drm/i915/intel_display.c       |    2 +-
 drivers/gpu/drm/i915/intel_dp.c            |   60 ++++++++++++++++++++++++----
 drivers/gpu/drm/radeon/atombios_encoders.c |    4 +-
 drivers/gpu/drm/radeon/evergreen.c         |    3 ++
 drivers/gpu/drm/radeon/evergreen_hdmi.c    |    3 --
 drivers/gpu/drm/radeon/evergreend.h        |    1 +
 drivers/gpu/drm/radeon/ni.c                |    5 +++
 drivers/gpu/drm/radeon/r600.c              |    1 +
 drivers/gpu/drm/radeon/r600_audio.c        |    2 +-
 drivers/gpu/drm/radeon/r600_cs.c           |   42 +++++++++++++++++++
 drivers/gpu/drm/radeon/r600_hdmi.c         |    7 +---
 drivers/gpu/drm/radeon/r600d.h             |    2 +
 drivers/gpu/drm/radeon/radeon_drv.c        |    3 +-
 drivers/gpu/drm/radeon/radeon_pm.c         |   10 +++--
 drivers/gpu/drm/radeon/radeon_prime.c      |   10 ++++-
 drivers/gpu/drm/radeon/rv770.c             |    5 ++-
 drivers/gpu/drm/radeon/rv770d.h            |    3 ++
 drivers/gpu/drm/sis/sis_drv.c              |    2 +-
 drivers/gpu/drm/udl/udl_drv.c              |   15 ++++++-
 drivers/gpu/drm/via/via_map.c              |    3 +-
 include/linux/vga_switcheroo.h             |    2 +
 21 files changed, 156 insertions(+), 29 deletions(-)

[git pull] drm-fixes

[Dave Airlie]

Hi Linus,

Happy Christmas, two fixes, one for radeon, one for vmwgfx.

Dave.

The following changes since commit b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc:

  Merge git://git.infradead.org/mtd-2.6 (2011-12-20 18:39:37 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

Alex Deucher (1):
      drm/radeon/kms: bail on BTC parts if MC ucode is missing

Xi Wang (1):
      vmwgfx: fix incorrect VRAM size check in vmw_kms_fb_create()

 drivers/gpu/drm/radeon/evergreen.c  |   12 ++++++++++++
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c |    6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

[git pull] drm-fixes

[Dave Airlie]

Hi,

Slightly larger than I'd like, but Alex is still bringing up some variants 
of the llano hardware platform with different output configurations, so 
displaying something is nicer than just black screening. I've done some 
testing on pre-llano systems and haven't seen any problems with it, so I'm 
happy to push it.

Otherwise there is one i915 revert, the GMBUS code was causing some 
problems with the core i2c and needs a rework, one regression fix for UMS 
drivers since I split the pci/platform/usb code out, a couple of minor radeon 
fixes, and one radeon fix for a bug with some floating i2c lines on 
certain family of motherboards.

Dave.

The following changes since commit 21c5977a836e399fc710ff2c5367845ed5c2527f:

  alpha: fix several security issues (2011-06-15 20:04:02 -0700)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

Alex Deucher (13):
      drm/radeon/kms: signed fix for evergreen thermal
      drm/radeon/kms: be more pedantic about the g5 quirk (v2)
      drm/radeon/kms: clear wb memory by default
      drm/radeon/kms: fix num crtcs for Cedar and Caicos
      drm/radeon/kms: rework atombios_get_encoder_mode()
      drm/radeon/kms: add missing external encoder action
      drm/radeon/kms: add support for load detection on dp bridges
      drm/radeon/kms: fix support for DDC on dp bridges
      drm/radeon/kms: issue blank/unblank commands for ext encoders
      drm/radeon/kms: fix handling of DP to LVDS bridges
      drm/radeon/kms/atom: AdjustPixelClock fixes for DP bridges
      drm/radeon/kms: set DP link config properly for DP bridges
      drm/radeon/kms: use helper functions for fence read/write

Christian Dietrich (1):
      drivers/gpu/drm: use printk_ratelimited instead of printk_ratelimit

Dave Airlie (2):
      drm: make debug levels match in edid failure code.
      drm/radeon: workaround a hw bug on some radeon chipsets with all-0 EDIDs.

Jean Delvare (1):
      Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"

Wolfram Sang (1):
      drm: populate irq_by_busid-member for pci

 drivers/gpu/drm/drm_edid.c                 |   19 ++++-
 drivers/gpu/drm/drm_ioc32.c                |    9 +-
 drivers/gpu/drm/drm_pci.c                  |    3 +-
 drivers/gpu/drm/i915/intel_i2c.c           |    3 +-
 drivers/gpu/drm/radeon/atombios.h          |    1 +
 drivers/gpu/drm/radeon/atombios_crtc.c     |    7 ++
 drivers/gpu/drm/radeon/evergreen.c         |    3 +-
 drivers/gpu/drm/radeon/radeon_asic.c       |   31 +++++---
 drivers/gpu/drm/radeon/radeon_combios.c    |    9 ++-
 drivers/gpu/drm/radeon/radeon_connectors.c |   58 ++++++++++++--
 drivers/gpu/drm/radeon/radeon_device.c     |    2 +
 drivers/gpu/drm/radeon/radeon_encoders.c   |  112 +++++++++++++++++++++-------
 drivers/gpu/drm/radeon/radeon_fence.c      |   51 +++++++++----
 drivers/gpu/drm/radeon/radeon_mode.h       |    2 +
 include/drm/drm_crtc.h                     |    2 +
 15 files changed, 237 insertions(+), 75 deletions(-)

[git pull] drm-fixes

[Dave Airlie]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 3421 bytes --]


Hi Linus,

Mostly i915 serious fixes, along with some minor radeon changes.

(no global header files touched ;-)

Dave.

The following changes since commit d315777b32a4696feb86f2a0c9e9f39c94683649:

  Merge branch 'BUG_ON' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (2011-01-24 19:58:39 +1000)

are available in the git repository at:

  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

Alex Deucher (5):
      drm/radeon/kms: fix a spelling error in an error message
      drm/radeon/kms: make the mac rv630 quirk generic
      drm/radeon/kms: match r6xx/r7xx/evergreen asic_reset with previous asics
      drm/radeon/kms: simplify atom adjust pll setup
      drm/radeon/kms: add new radeon_info ioctl query for clock crystal freq

Chris Wilson (12):
      drm/i915: Initialise ring vfuncs for old DRI paths
      drm/i915: Add dependency on CONFIG_TMPFS
      drm/i915: Don't kick-off hangcheck after a DRI interrupt
      drm/i915/ringbuffer: Fix use of stale HEAD position whilst polling for space
      drm/i915: Fix use of invalid array size for ring->sync_seqno
      drm/i915: Recognise non-VGA display devices
      drm/i915,agp/intel: Do not clear stolen entries
      drm/i915: Increase the amount of defense before computing vblank timestamps
      drm/i915: Disable high-precision vblank timestamping for UMS
      drm/i915: Handle the no-interrupts case for UMS by polling
      Merge remote branch 'linus/master' into drm-intel-fixes
      drm/i915: Prevent uninitialised reads during error state capture

Dave Airlie (1):
      Merge branch 'drm-intel-fixes-2' of ssh://master.kernel.org/.../ickle/drm-intel into drm-fixes

Jesse Barnes (2):
      drm/i915: set more FBC chicken bits
      drm/i915: make the blitter report buffer modifications to the FBC unit

Michael Karcher (1):
      drm/i915: Use consistent mappings for OpRegion between ACPI and i915

Michel Dänzer (1):
      drm/radeon/kms: Initialize pageflip spinlocks.

 drivers/char/agp/intel-gtt.c               |   19 +++---
 drivers/gpu/drm/Kconfig                    |    3 +
 drivers/gpu/drm/i915/i915_dma.c            |   35 +++++-------
 drivers/gpu/drm/i915/i915_drv.c            |    5 +-
 drivers/gpu/drm/i915/i915_drv.h            |    5 +-
 drivers/gpu/drm/i915/i915_gem.c            |   12 +++-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c |    2 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c        |    4 +
 drivers/gpu/drm/i915/i915_irq.c            |   37 +++++++++---
 drivers/gpu/drm/i915/i915_reg.h            |    6 ++
 drivers/gpu/drm/i915/intel_display.c       |   25 ++++++++-
 drivers/gpu/drm/i915/intel_opregion.c      |    3 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c    |   83 ++++++++++++++++++++++------
 drivers/gpu/drm/i915/intel_ringbuffer.h    |    3 +
 drivers/gpu/drm/radeon/atombios_crtc.c     |   22 ++------
 drivers/gpu/drm/radeon/evergreen.c         |    3 +
 drivers/gpu/drm/radeon/r100.c              |    2 +-
 drivers/gpu/drm/radeon/r600.c              |    3 +
 drivers/gpu/drm/radeon/radeon_atombios.c   |   14 ++---
 drivers/gpu/drm/radeon/radeon_drv.c        |    2 +-
 drivers/gpu/drm/radeon/radeon_irq_kms.c    |    3 +
 drivers/gpu/drm/radeon/radeon_kms.c        |    4 +
 drivers/gpu/vga/vgaarb.c                   |    2 +-
 include/drm/radeon_drm.h                   |    1 +
 24 files changed, 203 insertions(+), 95 deletions(-)

[git pull] drm-fixes

[Dave Airlie]

Just a bunch of radeon fixes from Alex, one for AGP r700s.

Dave.

The following changes since commit 2bfc96a127bc1cc94d26bfaa40159966064f9c8c:

  Linux 2.6.36-rc3 (2010-08-29 08:36:04 -0700)

are available in the git repository at:
  ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

Alex Deucher (6):
      drm/radeon/kms: use tracked values for sclk and mclk
      drm/radeon/kms: fix a regression on r7xx AGP due to the HDP flush fix
      drm/radeon/kms: remove useless clock code
      drm/radeon/kms: force legacy pll algo for RV515 LVDS
      drm/radeon/kms: fix tv module parameter
      drm/radeon/kms: properly set crtc high base on r7xx

 drivers/gpu/drm/radeon/atombios_crtc.c     |   22 ++++++--
 drivers/gpu/drm/radeon/evergreen.c         |    9 ---
 drivers/gpu/drm/radeon/r600.c              |   11 +----
 drivers/gpu/drm/radeon/radeon.h            |    8 ++-
 drivers/gpu/drm/radeon/radeon_asic.c       |   18 ------
 drivers/gpu/drm/radeon/radeon_clocks.c     |   58 +++------------------
 drivers/gpu/drm/radeon/radeon_connectors.c |   78 +++++++++++++++------------
 drivers/gpu/drm/radeon/radeon_device.c     |   28 +++-------
 drivers/gpu/drm/radeon/radeon_i2c.c        |    2 +-
 drivers/gpu/drm/radeon/radeon_mode.h       |    1 -
 drivers/gpu/drm/radeon/rv770.c             |   61 ++++++++++++++++++---
 11 files changed, 138 insertions(+), 158 deletions(-)

[git pull] drm-fixes

[Dave Airlie]

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

This is just 3 fast track fixes, one for the colormap issues with 1.7 and
2.9.0 intel driver (note final 1.7 + 2.9.1 is fine, and 1.6 is fine with 
any Intel). The other is a mode validation fix, and the last one at least
lets davem load the kms radeon driver.

I have some radeon KMS fixes queued but will leave them until tomorrow 
just in case.

Dave.

 drivers/gpu/drm/drm_edid.c             |   15 +++++++++++
 drivers/gpu/drm/drm_fb_helper.c        |   42 ++++++++++++++++++++++----------
 drivers/gpu/drm/radeon/radeon_device.c |    7 ++---
 3 files changed, 47 insertions(+), 17 deletions(-)

commit 77de0846aed9d7a1b0ea65090620900d66fb5cfb
Author: Dave Airlie <airlied@redhat.com>
Date:   Fri Oct 23 18:49:03 2009 +1000

    drm/kms: fix kms/fbdev colormap support properly.
    
    This sets the fbcon to use TRUECOLOR by default, it then
    only modifies the pseudo palette for fbcon, and only touches
    the real palette when in 8-bit pseudo color mode.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fcb45611448098a36b893bda71e72bd39730a3dd
Author: Zhao Yakui <yakui.zhao@intel.com>
Date:   Wed Oct 14 09:11:25 2009 +0800

    drm: Add the basic check for the detailed timing in EDID
    
    Sometimes we will get the incorrect display modeline when parsing the detailed
    timing in EDID. For example:
       >hsync/vsync width is zero
       >sync is beyond the blank.
    
    So add the basic check for the detailed timing in EDID to avoid the incorrect
    display modeline.
    
    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 93239ea158368016a017200cb133e1057fb3ef89
Author: Dave Airlie <airlied@redhat.com>
Date:   Wed Oct 28 11:09:58 2009 +1000

    drm/radeon/kms: ignore vga arbiter return.
    
    Since we register all radeon devices, and the arbiter only cares about
    VGA class ones, we will fail to startup on display controller class devices.
    We don't gain anything by using the return value here.
    
    this helps kms on sparc64 get started.
    
    Reported-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

[git pull] drm-fixes

[Dave Airlie]

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

Just some new hw support from AMD (chip ID + pci ids).

Dave.

 drivers/gpu/drm/radeon/r600_cp.c    |   22 +++++++++++++++-------
 drivers/gpu/drm/radeon/radeon_drv.h |    1 +
 include/drm/drm_pciids.h            |    5 +++++
 3 files changed, 21 insertions(+), 7 deletions(-)

commit 6502fbfaf81b09b3f474bb7b3796257e9450273e
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Tue Aug 4 11:24:24 2009 -0400

    drm/radeon: Add support for RS880 chips
    
    These are new AMD IGP chips
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

[git pull] drm-fixes

[Dave Airlie]

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

This contain some fixes to the normal drm modesetting code (mainly better
validation of some userspace args), some radeon KMS fixes, along with some 
new radeon PCI IDs from AMD.

Dave.

 drivers/gpu/drm/drm_crtc.c          |    2 +-
 drivers/gpu/drm/drm_crtc_helper.c   |    6 ++++--
 drivers/gpu/drm/radeon/r100.c       |    3 ++-
 drivers/gpu/drm/radeon/radeon_drv.c |   17 ++++++++---------
 drivers/gpu/drm/radeon/radeon_kms.c |    2 ++
 drivers/gpu/drm/radeon/rv515.c      |    1 +
 drivers/gpu/drm/ttm/ttm_bo.c        |    7 ++++++-
 drivers/gpu/drm/ttm/ttm_bo_util.c   |    8 ++++----
 include/drm/drm_pciids.h            |    5 +++++
 9 files changed, 33 insertions(+), 18 deletions(-)

commit c96e7c7a3a79931446ecf9494a8415e4d164ebd8
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Mon Aug 3 14:22:53 2009 +0200

    drm/ttm: Read buffer overflow
    
    Check whether index is within bounds before grabbing the element.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fa99239cb73dbf419bea9f334b85ba94ac88a532
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Mon Aug 3 14:20:32 2009 +0200

    drm/radeon: Read buffer overflow
    
    Check whether index is within bounds before grabbing the element.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit fee280d3fd9bc5247bef9f4ab35a4693bfffdcfd
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Mon Aug 3 12:39:06 2009 +0200

    drm/ttm: Fix a sync object leak.
    
    If there are multiple simultaneous waiters for the same buffer object,
    a temporary reference to its sync object may be leaked.
    
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit c9b7fb54f0a51e587fa09be3a85666b43d36a850
Author: Xiaotian Feng <dfeng@redhat.com>
Date:   Wed Jul 29 21:28:24 2009 +0800

    drm/radeon/kms: fix memory leak in radeon_driver_load_kms
    
    This patch fixes following kmemleak report:
    unreferenced object 0xffff88022cb53000 (size 4096):
      comm "work_for_cpu", pid 97, jiffies 4294672345
      backtrace:
        [<ffffffff810eb222>] create_object+0x19f/0x2a0
        [<ffffffff810eb422>] kmemleak_alloc+0x26/0x4c
        [<ffffffff810e363f>] __kmalloc+0x187/0x1b0
        [<ffffffffa005f3db>] kzalloc.clone.0+0x13/0x15 [radeon]
        [<ffffffffa005f403>] radeon_driver_load_kms+0x26/0xe1 [radeon]
        [<ffffffffa0017432>] drm_get_dev+0x37f/0x480 [drm]
        [<ffffffffa007f424>] radeon_pci_probe+0x15/0x269 [radeon]
        [<ffffffff811f8779>] local_pci_probe+0x17/0x1b
        [<ffffffff8105ffbb>] do_work_for_cpu+0x18/0x2a
        [<ffffffff81063c38>] kthread+0x8a/0x92
        [<ffffffff81012cba>] child_rip+0xa/0x20
        [<ffffffffffffffff>] 0xffffffffffffffff
    
    Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit de05065ff5d6878523317ff4a0b48a1239f80f73
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Aug 3 12:05:34 2009 +1000

    drm/radeon/kms: fix nomodeset.
    
    The ordering was wrong to get the nomodeset parameter to work.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 6d0897ba58139523d37e97855ee0fe2d78629da6
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date:   Fri Jul 31 10:47:51 2009 +0200

    drm/ttm: Fix a potential comparison of structs.
    
    On some architectures the comparison may cause a compilation failure.
    
    Original partial fix Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    
    Signed-off-by: Pekka Paalanen <pq@iki.fi>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 0924d942256ac470c5f7b4ebaf7fe0415fc6fa59
Author: Dave Airlie <airlied@redhat.com>
Date:   Mon Aug 3 12:03:03 2009 +1000

    drm/radeon/kms: fix rv515 VRAM initialisation.
    
    This got missed in the VRAM init re-workings.
    
    Signed-of-by: Dave Airlie <airlied@redhat.com>

commit 7320700df1864b601cef5adbddce8654a0e3f78b
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Mon Aug 3 17:01:53 2009 -0400

    drm/radeon: add some new r7xx pci ids
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 4cb72b1727140f131b2df5f37c2e54f5965f98c2
Author: Jakob Bornecrantz <jakob@vmware.com>
Date:   Mon Aug 3 13:43:59 2009 +0100

    drm: Catch stop possible NULL pointer reference
    
    This was caught by Weiss. Also added some comments to the
    fb_changed and mode_changed variables to explain what they do.
    
    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Tested-by: Thomas White <taw@bitwiz.org.uk>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 7781de74568bddfefbd2d32a934a8c791a2420cd
Author: Jakob Bornecrantz <jakob@vmware.com>
Date:   Mon Aug 3 13:43:58 2009 +0100

    drm: Small logic fix in drm_mode_setcrtc
    
    Match the logic to the comments in the debug message
    
    Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

[git pull] drm-fixes

[Dave Airlie]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 5299 bytes --]

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

A bunch of KMS fixes from you and F11 testing. Still waiting on some 
resolution to the mtrr vs _wc remaps pain.

Dave.

 drivers/gpu/drm/drm_crtc_helper.c    |   76 ++++++++++++++++++++++++++++++++--
 drivers/gpu/drm/drm_edid.c           |    6 +-
 drivers/gpu/drm/drm_irq.c            |   14 ++++--
 drivers/gpu/drm/i915/i915_dma.c      |    2 +-
 drivers/gpu/drm/i915/i915_gem.c      |    2 +-
 drivers/gpu/drm/i915/intel_bios.c    |    6 +++
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 include/drm/drm_crtc_helper.h        |    1 +
 include/drm/drm_edid.h               |    4 +-
 9 files changed, 97 insertions(+), 16 deletions(-)

commit e08fb4f6d1dc95eff5b3fc1d0412bcb5afcae7f2
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Feb 25 14:52:30 2009 +1000

    drm/i915: convert DRM_ERROR to DRM_DEBUG in phys object pwrite path
    
    This snuck in when I wrote phys object support.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit dd0910b3c71b253c08111110f0399b924a8d5853
Author: Dave Airlie <airlied@linux.ie>
Date:   Wed Feb 25 14:49:21 2009 +1000

    drm/i915: make hw page ioremap use ioremap_wc
    
    However we still have another issue with ioremap_wc not falling back
    properly or somehow doing something else stupid, this probably needs
    to be tracked down.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit d61e7380b402a481ab1fa8027068a24918f701c8
Author: Kyle McMartin <kyle@redhat.com>
Date:   Tue Feb 24 20:31:53 2009 -0500

    drm: edid revision 0 is valid
    
    edid->revision == 0 should be valid (at least, so the error message
    indicates. :) and wikipedia seems to indicate that EDID 1.0 existed.
    
    We can dump the entire check, since edid->revision is a u8, so
    it can't ever be less than 0.
    
    Marko reports in RH bz#476735 that his monitor claims to be
    EDID 1.0, and therefore hits the check and is stuck at 800x600 because
    of it.
    
    Reported-by: Marko Ristola <marko.ristola@kolumbus.fi>
    Signed-off-by: Kyle McMartin <kyle@redhat.com>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit b3f5e7329df1a508ac58ebe7509fb7a47b9eab6a
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Feb 19 14:48:22 2009 +0000

    drm: Correct unbalanced drm_vblank_put() during mode setting.
    
    The first time we install a mode, the vblank will be disabled for a pipe
    and so drm_vblank_get() in drm_vblank_pre_modeset() will fail. As we
    unconditionally call drm_vblank_put() afterwards, the vblank reference
    counter becomes unbalanced.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 7bec756c74b1a5079d5074144bb77a6b3e7d7783
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 23 16:09:34 2009 -0800

    drm: disable encoders before re-routing them
    
    In some cases we may receive a mode config that has a different
    CRTC<->encoder map that the current configuration.  In that case, we
    need to disable any re-routed encoders before setting the mode,
    otherwise they may not pick up the new CRTC (if the output types are
    incompatible for example).
    
    Tested-by: Kristian Høgsberg <krh@bitplanet.net>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit fe56cf45f951b3810313584605c1d8a4f20b33a4
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 23 15:36:41 2009 -0800

    drm: Fix ordering of bit fields in EDID structure leading huge vsync values.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit c8766ac5933d6ee75e7ce379a1eb5ceb451fcb83
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Feb 23 08:44:33 2009 -0800

    drm: Fix shifts of EDID vsync offset/width fields.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 37df96736bfe6f5fd9a141d62946e1083d73e712
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 23 15:36:42 2009 -0800

    drm/i915: handle bogus VBT panel timing
    
    We've seen cases in the wild where the VBT sync data is wrong, so add
    some code to fix it up in that case, taking care to make sure that the
    total is greater than the sync end.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

commit 7c04d1d97a8d918b7ae2ef478229862b71a65f06
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 23 15:36:40 2009 -0800

    drm/i915: remove PLL debugging messages
    
    These are normal; we walk through different values looking for the right
    one, so why flood the screen with messages?
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Reviewed-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@linux.ie>

[git pull] drm-fixes

[Dave Airlie]

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

Another bunch of KMS/GEM related fixes for the Intel driver, should fix 
the oops you saw. Also enable suspend/resume on KMS which is a regression
for anyone who wanted to use it.

Dave.

 drivers/gpu/drm/i915/i915_dma.c      |    2 +-
 drivers/gpu/drm/i915/i915_drv.c      |   23 +++++++++++-
 drivers/gpu/drm/i915/i915_drv.h      |    1 +
 drivers/gpu/drm/i915/i915_gem.c      |   67 +++++++++++++++++++++-------------
 drivers/gpu/drm/i915/intel_display.c |    1 +
 5 files changed, 67 insertions(+), 27 deletions(-)

commit 5004417d840e6dcb0052061fd04569b9c9f037a8
Author: Pierre Willenbrock <pierre@pirsoft.de>
Date:   Mon Feb 23 10:12:15 2009 +1000

    drm/i915: Add missing mutex_lock(&dev->struct_mutex)
    
    there might be a nicer way to fix this but this is the simplest for now.
    
    Signed-off-by: Pierre Willenbrock <pierre@pirsoft.de>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 6fb88588555a18792a27f483887fe1f2af5f9c9b
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Mon Feb 23 10:08:21 2009 +1000

    drm/i915: fix WC mapping in non-GEM i915 code.
    
    [airlied - taken from mailing list posting]
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit bab2d1f6531657e37dc84f26184f3f64e1e73ecd
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Feb 20 17:52:20 2009 +0000

    drm/i915: Fix regression in 95ca9d
    
    The object is dereferenced before the NULL check. Oops.
    
    Fixes http://bugs.freedesktop.org/show_bug.cgi?id=20235
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit f21289b355cee8738d80c2ae5cbd272c3f7b5689
Author: Eric Anholt <eric@anholt.net>
Date:   Wed Feb 18 09:44:56 2009 -0800

    drm/i915: Retire requests from i915_gem_busy_ioctl.
    
    This ensures that the user gets the latest information from the hardware
    on whether the buffer is busy, potentially reducing the working set of objects
    that the user chooses.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 5669fcacc58bf3a7386057addffd280d75380858
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Tue Feb 17 15:13:31 2009 -0800

    drm/i915: suspend/resume GEM when KMS is active
    
    In the KMS case, we need to suspend/resume GEM as well.  So on suspend, make
    sure we idle GEM and stop any new rendering from coming in, and on resume,
    re-init the framebuffer and clear the suspended flag.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit efbeed96f7e20783b22d9529ef536b61f7ea8637
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Feb 19 14:54:51 2009 -0800

    drm/i915: Don't let a device flush to prepare buffers clear new write_domains.
    
    The problem was that object_set_to_gpu_domain would set the new write_domains
    that are getting set by this batchbuffer, then the accumulated flushes required
    for all the objects in preparation for this batchbuffer were posted, and the
    brand new write domain would get cleared by the flush being posted.  Instead,
    hang on to the new (or old if we're not changing it) value and set it after
    the flush is queued.
    
    Results from this noticably included conformance test failures from reads
    shortly after writes (where the new write domain had been lost and thus not
    flushed and waited on), but is a suspected cause of hangs in some apps when
    a write domain is lost on a buffer that gets reused for instruction or
    commmand state.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 8b0e378a20e48c691d374f39d8b0596e63598cfc
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Feb 19 14:40:50 2009 -0800

    drm/i915: Cut two args to set_to_gpu_domain that confused this tricky path.
    
    While not strictly required, it helped while thinking about the following
    change.  This change should be invariant.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>