* [PATCH]: radeon: Misc corrections.
@ 2008-05-08 10:22 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2008-05-08 10:22 UTC (permalink / raw
To: benh; +Cc: linux-fbdev-devel, linux-kernel
I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
hangs in my sparc64 boxes when the init scripts set the font. The
problem goes away if I disable acceleration.
I haven't figured out that bug yet, but along the way
I found some corrections to make based upon some auditing.
1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
and the XORG video driver differ. I've made the kernel
match what XORG is using.
2) In radeonfb_engine_reset() we have top-level code structure
that roughly looks like:
if (family is 300, 350, or V350)
do this;
else
do that;
...
if (family is NOT 300, OR
family is NOT 350, OR
family is NOT V350)
do another thing;
this last conditional makes no sense, is always true,
and obviously was likely meant to be "family is NOT
300, 350, or V350". So I've made the code match the
intent.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index 3ca27cb..4d13f68 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -241,8 +241,8 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
INREG(HOST_PATH_CNTL);
OUTREG(HOST_PATH_CNTL, host_path_cntl);
- if (rinfo->family != CHIP_FAMILY_R300 ||
- rinfo->family != CHIP_FAMILY_R350 ||
+ if (rinfo->family != CHIP_FAMILY_R300 &&
+ rinfo->family != CHIP_FAMILY_R350 &&
rinfo->family != CHIP_FAMILY_RV350)
OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
diff --git a/include/video/radeon.h b/include/video/radeon.h
index 83467e1..95a1f20 100644
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -527,8 +527,9 @@
/* DSTCACHE_CTLSTAT bit constants */
-#define RB2D_DC_FLUSH (3 << 0)
-#define RB2D_DC_FLUSH_ALL 0xf
+#define RB2D_DC_FLUSH_2D (1 << 0)
+#define RB2D_DC_FREE_2D (1 << 2)
+#define RB2D_DC_FLUSH_ALL (RB2D_DC_FLUSH_2D | RB2D_DC_FREE_2D)
#define RB2D_DC_BUSY (1 << 31)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH]: radeon: Misc corrections.
@ 2008-05-08 10:22 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2008-05-08 10:22 UTC (permalink / raw
To: benh; +Cc: linux-fbdev-devel, linux-kernel
I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
hangs in my sparc64 boxes when the init scripts set the font. The
problem goes away if I disable acceleration.
I haven't figured out that bug yet, but along the way
I found some corrections to make based upon some auditing.
1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
and the XORG video driver differ. I've made the kernel
match what XORG is using.
2) In radeonfb_engine_reset() we have top-level code structure
that roughly looks like:
if (family is 300, 350, or V350)
do this;
else
do that;
...
if (family is NOT 300, OR
family is NOT 350, OR
family is NOT V350)
do another thing;
this last conditional makes no sense, is always true,
and obviously was likely meant to be "family is NOT
300, 350, or V350". So I've made the code match the
intent.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
index 3ca27cb..4d13f68 100644
--- a/drivers/video/aty/radeon_accel.c
+++ b/drivers/video/aty/radeon_accel.c
@@ -241,8 +241,8 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
INREG(HOST_PATH_CNTL);
OUTREG(HOST_PATH_CNTL, host_path_cntl);
- if (rinfo->family != CHIP_FAMILY_R300 ||
- rinfo->family != CHIP_FAMILY_R350 ||
+ if (rinfo->family != CHIP_FAMILY_R300 &&
+ rinfo->family != CHIP_FAMILY_R350 &&
rinfo->family != CHIP_FAMILY_RV350)
OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
diff --git a/include/video/radeon.h b/include/video/radeon.h
index 83467e1..95a1f20 100644
--- a/include/video/radeon.h
+++ b/include/video/radeon.h
@@ -527,8 +527,9 @@
/* DSTCACHE_CTLSTAT bit constants */
-#define RB2D_DC_FLUSH (3 << 0)
-#define RB2D_DC_FLUSH_ALL 0xf
+#define RB2D_DC_FLUSH_2D (1 << 0)
+#define RB2D_DC_FREE_2D (1 << 2)
+#define RB2D_DC_FLUSH_ALL (RB2D_DC_FLUSH_2D | RB2D_DC_FREE_2D)
#define RB2D_DC_BUSY (1 << 31)
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH]: radeon: Misc corrections.
2008-05-08 10:22 ` David Miller
@ 2008-05-08 10:32 ` Benjamin Herrenschmidt
-1 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2008-05-08 10:32 UTC (permalink / raw
To: David Miller; +Cc: linux-fbdev-devel, linux-kernel
On Thu, 2008-05-08 at 03:22 -0700, David Miller wrote:
> I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
> hangs in my sparc64 boxes when the init scripts set the font. The
> problem goes away if I disable acceleration.
There's a whole lot of known issues there with r3xx and later, mostly
because of the memory map...
I must admit I've been letting this driver rot for some time, hoping
that the integration of radeon mode setting in the kernel DRM would
replace it soon, but that hasn't happened yet...
> I haven't figured out that bug yet, but along the way
> I found some corrections to make based upon some auditing.
You may find clues about what's wrong by looking at the way the X driver
sets up the card internal memory map. I think that's where the problem
is for most newer cards.
> 1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
> and the XORG video driver differ. I've made the kernel
> match what XORG is using.
>
> 2) In radeonfb_engine_reset() we have top-level code structure
> that roughly looks like:
>
> if (family is 300, 350, or V350)
> do this;
> else
> do that;
> ...
> if (family is NOT 300, OR
> family is NOT 350, OR
> family is NOT V350)
> do another thing;
>
> this last conditional makes no sense, is always true,
> and obviously was likely meant to be "family is NOT
> 300, 350, or V350". So I've made the code match the
> intent.
Yeah, looks like a copy/paste bug from some old broken ATI code, thanks
for spotting it.
I'll give your patch a quick test tomorrow on my rv350 to check it
doesn't break anything.
Thanks !
Ben.
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
> index 3ca27cb..4d13f68 100644
> --- a/drivers/video/aty/radeon_accel.c
> +++ b/drivers/video/aty/radeon_accel.c
> @@ -241,8 +241,8 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
> INREG(HOST_PATH_CNTL);
> OUTREG(HOST_PATH_CNTL, host_path_cntl);
>
> - if (rinfo->family != CHIP_FAMILY_R300 ||
> - rinfo->family != CHIP_FAMILY_R350 ||
> + if (rinfo->family != CHIP_FAMILY_R300 &&
> + rinfo->family != CHIP_FAMILY_R350 &&
> rinfo->family != CHIP_FAMILY_RV350)
> OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
>
> diff --git a/include/video/radeon.h b/include/video/radeon.h
> index 83467e1..95a1f20 100644
> --- a/include/video/radeon.h
> +++ b/include/video/radeon.h
> @@ -527,8 +527,9 @@
>
>
> /* DSTCACHE_CTLSTAT bit constants */
> -#define RB2D_DC_FLUSH (3 << 0)
> -#define RB2D_DC_FLUSH_ALL 0xf
> +#define RB2D_DC_FLUSH_2D (1 << 0)
> +#define RB2D_DC_FREE_2D (1 << 2)
> +#define RB2D_DC_FLUSH_ALL (RB2D_DC_FLUSH_2D | RB2D_DC_FREE_2D)
> #define RB2D_DC_BUSY (1 << 31)
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: radeon: Misc corrections.
@ 2008-05-08 10:32 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2008-05-08 10:32 UTC (permalink / raw
To: David Miller; +Cc: linux-fbdev-devel, linux-kernel
On Thu, 2008-05-08 at 03:22 -0700, David Miller wrote:
> I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
> hangs in my sparc64 boxes when the init scripts set the font. The
> problem goes away if I disable acceleration.
There's a whole lot of known issues there with r3xx and later, mostly
because of the memory map...
I must admit I've been letting this driver rot for some time, hoping
that the integration of radeon mode setting in the kernel DRM would
replace it soon, but that hasn't happened yet...
> I haven't figured out that bug yet, but along the way
> I found some corrections to make based upon some auditing.
You may find clues about what's wrong by looking at the way the X driver
sets up the card internal memory map. I think that's where the problem
is for most newer cards.
> 1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
> and the XORG video driver differ. I've made the kernel
> match what XORG is using.
>
> 2) In radeonfb_engine_reset() we have top-level code structure
> that roughly looks like:
>
> if (family is 300, 350, or V350)
> do this;
> else
> do that;
> ...
> if (family is NOT 300, OR
> family is NOT 350, OR
> family is NOT V350)
> do another thing;
>
> this last conditional makes no sense, is always true,
> and obviously was likely meant to be "family is NOT
> 300, 350, or V350". So I've made the code match the
> intent.
Yeah, looks like a copy/paste bug from some old broken ATI code, thanks
for spotting it.
I'll give your patch a quick test tomorrow on my rv350 to check it
doesn't break anything.
Thanks !
Ben.
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> diff --git a/drivers/video/aty/radeon_accel.c b/drivers/video/aty/radeon_accel.c
> index 3ca27cb..4d13f68 100644
> --- a/drivers/video/aty/radeon_accel.c
> +++ b/drivers/video/aty/radeon_accel.c
> @@ -241,8 +241,8 @@ void radeonfb_engine_reset(struct radeonfb_info *rinfo)
> INREG(HOST_PATH_CNTL);
> OUTREG(HOST_PATH_CNTL, host_path_cntl);
>
> - if (rinfo->family != CHIP_FAMILY_R300 ||
> - rinfo->family != CHIP_FAMILY_R350 ||
> + if (rinfo->family != CHIP_FAMILY_R300 &&
> + rinfo->family != CHIP_FAMILY_R350 &&
> rinfo->family != CHIP_FAMILY_RV350)
> OUTREG(RBBM_SOFT_RESET, rbbm_soft_reset);
>
> diff --git a/include/video/radeon.h b/include/video/radeon.h
> index 83467e1..95a1f20 100644
> --- a/include/video/radeon.h
> +++ b/include/video/radeon.h
> @@ -527,8 +527,9 @@
>
>
> /* DSTCACHE_CTLSTAT bit constants */
> -#define RB2D_DC_FLUSH (3 << 0)
> -#define RB2D_DC_FLUSH_ALL 0xf
> +#define RB2D_DC_FLUSH_2D (1 << 0)
> +#define RB2D_DC_FREE_2D (1 << 2)
> +#define RB2D_DC_FLUSH_ALL (RB2D_DC_FLUSH_2D | RB2D_DC_FREE_2D)
> #define RB2D_DC_BUSY (1 << 31)
>
>
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-05-08 10:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-08 10:22 [PATCH]: radeon: Misc corrections David Miller
2008-05-08 10:22 ` David Miller
2008-05-08 10:32 ` Benjamin Herrenschmidt
2008-05-08 10:32 ` Benjamin Herrenschmidt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.