Re: [PATCH] vgaarb: use bridges to control VGA routing where possible.

2010-12-16 Thread Mark Marshall

On 16/12/2010 05:54, Dave Airlie wrote:

From: Dave Airlie
  int pci_set_vga_state(struct pci_dev *dev, bool decode,
- unsigned int command_bits, bool change_bridge)
+ unsigned int command_bits, u32 flags)
  {
struct pci_bus *bus;
struct pci_dev *bridge;
u16 cmd;
int rc;

-   WARN_ON(command_bits&  ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY));
+   WARN_ON((flags&  PCI_VGA_STATE_CHANGE_DECODES)&  (command_bits&  
~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)));


Minor thing, but I think the middle & should be a &&?

MM

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


Re: [PATCH] drm/edid: fix typo in 1600x1...@75 mode

2010-05-19 Thread Mark Marshall

Alex Deucher wrote:

Spotted by Scott Bertilson.
Fixes fdo bug 28146.

Signed-off-by: Alex Deucher 
---
 drivers/gpu/drm/drm_edid.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 7188674..54d749d 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -587,7 +587,7 @@ static struct drm_display_mode drm_dmt_modes[] = {
   1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
/* 1600x1...@75hz */
-   { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 2025000, 1600, 1664,
+   { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 202500, 1600, 1664,
   1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
   DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
/* 1600x1...@85hz */


Looks good.
Reviewed-by: Mark Marshall 

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


[PATCH] drm/edid: fix typo in 1600x1200@75 mode

2010-05-19 Thread Mark Marshall
Alex Deucher wrote:
> Spotted by Scott Bertilson.
> Fixes fdo bug 28146.
> 
> Signed-off-by: Alex Deucher 
> ---
>  drivers/gpu/drm/drm_edid.c |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 7188674..54d749d 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -587,7 +587,7 @@ static struct drm_display_mode drm_dmt_modes[] = {
>  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
>  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
>   /* 1600x1200 at 75Hz */
> - { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 2025000, 1600, 1664,
> + { DRM_MODE("1600x1200", DRM_MODE_TYPE_DRIVER, 202500, 1600, 1664,
>  1856, 2160, 0, 1200, 1201, 1204, 1250, 0,
>  DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) },
>   /* 1600x1200 at 85Hz */

Looks good.
Reviewed-by: Mark Marshall 



[PATCH] vgaarb: use bridges to control VGA routing where possible.

2010-12-16 Thread Mark Marshall
On 16/12/2010 05:54, Dave Airlie wrote:
> From: Dave Airlie
>   int pci_set_vga_state(struct pci_dev *dev, bool decode,
> -   unsigned int command_bits, bool change_bridge)
> +   unsigned int command_bits, u32 flags)
>   {
>   struct pci_bus *bus;
>   struct pci_dev *bridge;
>   u16 cmd;
>   int rc;
>
> - WARN_ON(command_bits&  ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY));
> + WARN_ON((flags&  PCI_VGA_STATE_CHANGE_DECODES)&  (command_bits&  
> ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)));

Minor thing, but I think the middle & should be a &&?

MM