From: Thierry Reding <thierry.reding@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 10/16] drm/gma500: Use unsigned int pipe consistently
Date: Thu, 24 Sep 2015 18:35:32 +0200 [thread overview]
Message-ID: <1443112538-9616-10-git-send-email-thierry.reding@gmail.com> (raw)
In-Reply-To: <1443112538-9616-1-git-send-email-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
The pipe number can never be negative, so turn variables referring to it
to unsigned int.
Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/gpu/drm/gma500/psb_drv.h | 8 ++++----
drivers/gpu/drm/gma500/psb_irq.c | 30 ++++++++++++++++--------------
drivers/gpu/drm/gma500/psb_irq.h | 4 ++--
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
index e21726ecac32..5920a896da1b 100644
--- a/drivers/gpu/drm/gma500/psb_drv.h
+++ b/drivers/gpu/drm/gma500/psb_drv.h
@@ -689,11 +689,11 @@ extern int psb_vblank_wait2(struct drm_device *dev, unsigned int *sequence);
extern int psb_vblank_wait(struct drm_device *dev, unsigned int *sequence);
extern int psb_enable_vblank(struct drm_device *dev, unsigned int pipe);
extern void psb_disable_vblank(struct drm_device *dev, unsigned int pipe);
-void
-psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
+void psb_enable_pipestat(struct drm_psb_private *dev_priv, unsigned int pipe,
+ u32 mask);
-void
-psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
+void psb_disable_pipestat(struct drm_psb_private *dev_priv, unsigned int pipe,
+ u32 mask);
extern u32 psb_get_vblank_counter(struct drm_device *dev, unsigned int pipe);
diff --git a/drivers/gpu/drm/gma500/psb_irq.c b/drivers/gpu/drm/gma500/psb_irq.c
index 78eb10902809..6e383d4d097b 100644
--- a/drivers/gpu/drm/gma500/psb_irq.c
+++ b/drivers/gpu/drm/gma500/psb_irq.c
@@ -35,7 +35,7 @@
*/
static inline u32
-psb_pipestat(int pipe)
+psb_pipestat(unsigned int pipe)
{
if (pipe == 0)
return PIPEASTAT;
@@ -47,7 +47,7 @@ psb_pipestat(int pipe)
}
static inline u32
-mid_pipe_event(int pipe)
+mid_pipe_event(unsigned int pipe)
{
if (pipe == 0)
return _PSB_PIPEA_EVENT_FLAG;
@@ -59,7 +59,7 @@ mid_pipe_event(int pipe)
}
static inline u32
-mid_pipe_vsync(int pipe)
+mid_pipe_vsync(unsigned int pipe)
{
if (pipe == 0)
return _PSB_VSYNC_PIPEA_FLAG;
@@ -71,7 +71,7 @@ mid_pipe_vsync(int pipe)
}
static inline u32
-mid_pipeconf(int pipe)
+mid_pipeconf(unsigned int pipe)
{
if (pipe == 0)
return PIPEACONF;
@@ -82,8 +82,8 @@ mid_pipeconf(int pipe)
BUG();
}
-void
-psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)
+void psb_enable_pipestat(struct drm_psb_private *dev_priv, unsigned int pipe,
+ u32 mask)
{
if ((dev_priv->pipestat[pipe] & mask) != mask) {
u32 reg = psb_pipestat(pipe);
@@ -99,8 +99,8 @@ psb_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)
}
}
-void
-psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)
+void psb_disable_pipestat(struct drm_psb_private *dev_priv, unsigned int pipe,
+ u32 mask)
{
if ((dev_priv->pipestat[pipe] & mask) != 0) {
u32 reg = psb_pipestat(pipe);
@@ -115,7 +115,8 @@ psb_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask)
}
}
-static void mid_enable_pipe_event(struct drm_psb_private *dev_priv, int pipe)
+static void mid_enable_pipe_event(struct drm_psb_private *dev_priv,
+ unsigned int pipe)
{
if (gma_power_begin(dev_priv->dev, false)) {
u32 pipe_event = mid_pipe_event(pipe);
@@ -126,7 +127,8 @@ static void mid_enable_pipe_event(struct drm_psb_private *dev_priv, int pipe)
}
}
-static void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe)
+static void mid_disable_pipe_event(struct drm_psb_private *dev_priv,
+ unsigned int pipe)
{
if (dev_priv->pipestat[pipe] == 0) {
if (gma_power_begin(dev_priv->dev, false)) {
@@ -143,7 +145,7 @@ static void mid_disable_pipe_event(struct drm_psb_private *dev_priv, int pipe)
* Display controller interrupt handler for pipe event.
*
*/
-static void mid_pipe_event_handler(struct drm_device *dev, int pipe)
+static void mid_pipe_event_handler(struct drm_device *dev, unsigned int pipe)
{
struct drm_psb_private *dev_priv =
(struct drm_psb_private *) dev->dev_private;
@@ -175,7 +177,7 @@ static void mid_pipe_event_handler(struct drm_device *dev, int pipe)
if (pipe_clear)
dev_err(dev->dev,
- "%s, can't clear status bits for pipe %d, its value = 0x%x.\n",
+ "%s, can't clear status bits for pipe %u, its value = 0x%x.\n",
__func__, pipe, PSB_RVDC32(pipe_stat_reg));
if (pipe_stat_val & PIPE_VBLANK_STATUS)
@@ -573,7 +575,7 @@ void psb_disable_vblank(struct drm_device *dev, unsigned int pipe)
/*
* It is used to enable TE interrupt
*/
-int mdfld_enable_te(struct drm_device *dev, int pipe)
+int mdfld_enable_te(struct drm_device *dev, unsigned int pipe)
{
struct drm_psb_private *dev_priv =
(struct drm_psb_private *) dev->dev_private;
@@ -602,7 +604,7 @@ int mdfld_enable_te(struct drm_device *dev, int pipe)
/*
* It is used to disable TE interrupt
*/
-void mdfld_disable_te(struct drm_device *dev, int pipe)
+void mdfld_disable_te(struct drm_device *dev, unsigned int pipe)
{
struct drm_psb_private *dev_priv =
(struct drm_psb_private *) dev->dev_private;
diff --git a/drivers/gpu/drm/gma500/psb_irq.h b/drivers/gpu/drm/gma500/psb_irq.h
index e6a81a8c9f35..cbf64a10c92d 100644
--- a/drivers/gpu/drm/gma500/psb_irq.h
+++ b/drivers/gpu/drm/gma500/psb_irq.h
@@ -42,6 +42,6 @@ int psb_enable_vblank(struct drm_device *dev, unsigned int pipe);
void psb_disable_vblank(struct drm_device *dev, unsigned int pipe);
u32 psb_get_vblank_counter(struct drm_device *dev, unsigned int pipe);
-int mdfld_enable_te(struct drm_device *dev, int pipe);
-void mdfld_disable_te(struct drm_device *dev, int pipe);
+int mdfld_enable_te(struct drm_device *dev, unsigned int pipe);
+void mdfld_disable_te(struct drm_device *dev, unsigned int pipe);
#endif /* _PSB_IRQ_H_ */
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-09-24 16:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-24 16:35 [PATCH 01/16] drm/gma500: Sanity-check pipe index Thierry Reding
2015-09-24 16:35 ` [PATCH 02/16] drm/bochs: Store correct CRTC index in events Thierry Reding
2015-09-24 16:35 ` [PATCH 03/16] drm/imx: Make pipe number unsigned Thierry Reding
2015-09-24 16:35 ` [PATCH 04/16] drm/imx: Drop pipe field from struct imx_drm_crtc Thierry Reding
2015-09-25 7:26 ` Philipp Zabel
2015-09-24 16:35 ` [PATCH 05/16] drm/imx: Store correct CRTC index in events Thierry Reding
2015-09-24 16:35 ` [PATCH 06/16] drm/rockchip: " Thierry Reding
2015-09-24 16:35 ` [PATCH 07/16] drm/sti: " Thierry Reding
2015-10-01 14:06 ` Vincent ABRIOU
2015-09-24 16:35 ` [PATCH 08/16] drm/irq: Rename drm_crtc -> crtc Thierry Reding
2015-09-24 18:17 ` Daniel Vetter
2015-09-24 16:35 ` [PATCH 09/16] drm/irq: Use unsigned int pipe in public API Thierry Reding
2015-09-24 19:21 ` Russell King - ARM Linux
2015-09-24 20:20 ` Ville Syrjälä
2015-09-25 7:39 ` Laurent Pinchart
2015-09-25 12:26 ` Thierry Reding
2015-10-01 14:46 ` Vincent ABRIOU
2015-10-06 10:52 ` Ville Syrjälä
2015-09-24 16:35 ` Thierry Reding [this message]
2015-09-24 16:35 ` [PATCH 11/16] drm/imx: Use unsigned int for CRTC index Thierry Reding
2015-09-24 16:35 ` [PATCH 12/16] drm/msm: Use unsigned int pipe consistently Thierry Reding
2015-09-24 16:35 ` [PATCH 13/16] drm: Move ->get_scanout_position() to struct drm_crtc_funcs Thierry Reding
2015-09-24 18:22 ` Daniel Vetter
2015-09-24 16:35 ` [PATCH 14/16] drm/irq: Add drm_crtc_vblank_count_and_time() Thierry Reding
2015-09-24 18:27 ` Daniel Vetter
2015-09-24 16:35 ` [PATCH 15/16] drm/armada: Use drm_crtc_vblank_*() API Thierry Reding
2015-09-24 16:35 ` [PATCH 16/16] drm/sti: " Thierry Reding
2015-10-01 14:49 ` Vincent ABRIOU
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443112538-9616-10-git-send-email-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.