linux-next: manual merge of the trivial tree with the drm tree

linux-next: manual merge of the trivial tree with the drm tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in:

  drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c

between commit:

  109c2f2f1c42 ("drm/nouveau/gr: switch to subdev printk macros")

from the drm tree and commit:

  4bb138a47b7f ("drm/nouveau/gr: Fix typo in nv10.c")

from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
index 9436ada62cba,d6ace41830e9..000000000000
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
@@@ -791,7 -845,7 +791,7 @@@ nv10_gr_ctx_regs_find_offset(struct nv1
  		if (nv10_gr_ctx_regs[i] == reg)
  			return i;
  	}
- 	nvkm_error(subdev, "unknow offset nv10_ctx_regs %d\n", reg);
 -	nv_error(priv, "unknown offset nv10_ctx_regs %d\n", reg);
++	nvkm_error(subdev, "unknown offset nv10_ctx_regs %d\n", reg);
  	return -1;
  }
  
@@@ -804,7 -857,7 +804,7 @@@ nv17_gr_ctx_regs_find_offset(struct nv1
  		if (nv17_gr_ctx_regs[i] == reg)
  			return i;
  	}
- 	nvkm_error(subdev, "unknow offset nv17_ctx_regs %d\n", reg);
 -	nv_error(priv, "unknown offset nv17_ctx_regs %d\n", reg);
++	nvkm_error(subdev, "unknown offset nv17_ctx_regs %d\n", reg);
  	return -1;
  }
  

linux-next: manual merge of the trivial tree with the drm tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/gpu/drm/radeon/atombios.h between commit
e97bd974448ce90f8e4720499d84580bcd6a2f7a ("drm/radeon/kms: update
atombios.h to latest upstream") from the drm tree and commit
c9404c9c392d557a4687c4cbda022b03cb787ce9 ("Fix misspelling of "should"
and "shouldn't" in comments") from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/radeon/atombios.h
index 6732b5d,2a88029..0000000
--- a/drivers/gpu/drm/radeon/atombios.h
+++ b/drivers/gpu/drm/radeon/atombios.h
@@@ -2781,26 -2264,22 +2781,26 @@@ typedef struct _ATOM_LVDS_INFO_V1
  
  #define ATOM_LVDS_INFO_LAST  ATOM_LVDS_INFO_V12
  
 -typedef struct _ATOM_PATCH_RECORD_MODE {
 -	UCHAR ucRecordType;
 -	USHORT usHDisp;
 -	USHORT usVDisp;
 -} ATOM_PATCH_RECORD_MODE;
 +typedef struct  _ATOM_PATCH_RECORD_MODE
 +{
 +  UCHAR     ucRecordType;
 +  USHORT    usHDisp;
 +  USHORT    usVDisp;
 +}ATOM_PATCH_RECORD_MODE;
  
 -typedef struct _ATOM_LCD_RTS_RECORD {
 -	UCHAR ucRecordType;
 -	UCHAR ucRTSValue;
 -} ATOM_LCD_RTS_RECORD;
 +typedef struct  _ATOM_LCD_RTS_RECORD
 +{
 +  UCHAR     ucRecordType;
 +  UCHAR     ucRTSValue;
 +}ATOM_LCD_RTS_RECORD;
  
- //!! If the record below exits, it shoud always be the first record for easy use in command table!!! 
 -/* !! If the record below exits, it should always be the first record for easy use in command table!!! */
 -typedef struct _ATOM_LCD_MODE_CONTROL_CAP {
 -	UCHAR ucRecordType;
 -	USHORT usLCDCap;
 -} ATOM_LCD_MODE_CONTROL_CAP;
++//!! If the record below exits, it should always be the first record for easy use in command table!!! 
 +// The record below is only used when LVDS_Info is present. From ATOM_LVDS_INFO_V12, use ucLCDPanel_SpecialHandlingCap instead.
 +typedef struct  _ATOM_LCD_MODE_CONTROL_CAP
 +{
 +  UCHAR     ucRecordType;
 +  USHORT    usLCDCap;
 +}ATOM_LCD_MODE_CONTROL_CAP;
  
  #define LCD_MODE_CAP_BL_OFF                   1
  #define LCD_MODE_CAP_CRTC_OFF                 2

Re: linux-next: manual merge of the trivial tree with the drm tree

[Dave Airlie]

> Hi Jiri,

Can we drop any cleanups to atombios.h?

This file comes from AMD and we normally drop it into place, so they just 
get overwritten next time.

Dave.

Re: linux-next: manual merge of the trivial tree with the drm tree

[Jiri Kosina]

On Fri, 12 Feb 2010, Dave Airlie wrote:

> > Hi Jiri,
> 
> Can we drop any cleanups to atombios.h?
> 
> This file comes from AMD and we normally drop it into place, so they just 
> get overwritten next time.

Thanks for letting me know, I have reverted the hunk touching this file.

-- 
Jiri Kosina
SUSE Labs, Novell Inc.