Re: [Freedreno] [PATCH 4/6] drm/msm: dpu: Remove 'inline' from several functions

2018-10-08 Thread Jeykumar Sankaran 

On 2018-09-20 07:58, Sean Paul wrote:

From: Sean Paul 

Per chapter 15 of coding-style, removing 'inline' keyword from 
functions

that are larger than a typical macro. In a couple of cases I've
simplified the function and kept the inline.

Signed-off-by: Sean Paul 


Reviewed-by: Jeykumar Sankaran 


---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c  |  4 ++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h  | 16 ++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c   |  4 ++--
 .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c  |  4 ++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c|  6 ++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 12 +++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c   |  2 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c |  6 ++---
 .../gpu/drm/msm/disp/dpu1/msm_media_info.h| 24 +--
 9 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index a8f2dd7a37c7..5ff23f00582b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -53,7 +53,7 @@ static inline int _dpu_crtc_get_mixer_width(struct
dpu_crtc_state *cstate,
return mode->hdisplay / cstate->num_mixers;
 }

-static inline struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)
+static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)
 {
struct msm_drm_private *priv;

@@ -70,7 +70,7 @@ static inline struct dpu_kms 
*_dpu_crtc_get_kms(struct

drm_crtc *crtc)
return to_dpu_kms(priv->kms);
 }

-static inline int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, 
bool

enable)
+static int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool 
enable)

 {
struct drm_crtc *crtc;
struct msm_drm_private *priv;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
index 3723b4830335..cc18eca8f527 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
@@ -266,13 +266,7 @@ static inline int dpu_crtc_get_mixer_height(struct
dpu_crtc *dpu_crtc,
  */
 static inline int dpu_crtc_frame_pending(struct drm_crtc *crtc)
 {
-   struct dpu_crtc *dpu_crtc;
-
-   if (!crtc)
-   return -EINVAL;
-
-   dpu_crtc = to_dpu_crtc(crtc);
-   return atomic_read(&dpu_crtc->frame_pending);
+   return crtc ? atomic_read(&to_dpu_crtc(crtc)->frame_pending) :
-EINVAL;
 }

 /**
@@ -329,13 +323,7 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct
drm_crtc *crtc);
 static inline enum dpu_crtc_client_type dpu_crtc_get_client_type(
struct drm_crtc *crtc)
 {
-   struct dpu_crtc_state *cstate =
-   crtc ? to_dpu_crtc_state(crtc->state) : NULL;
-
-   if (!cstate)
-   return NRT_CLIENT;
-
-   return RT_CLIENT;
+   return crtc && crtc->state ? RT_CLIENT : NRT_CLIENT;
 }

 /**
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 1f7f3c2e09c2..79a6c6b7350b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1376,7 +1376,7 @@ static void dpu_encoder_off_work(struct 
kthread_work

*work)
  * phys: Pointer to physical encoder structure
  * extra_flush_bits: Additional bit mask to include in flush trigger
  */
-static inline void _dpu_encoder_trigger_flush(struct drm_encoder
*drm_enc,
+static void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,
struct dpu_encoder_phys *phys, uint32_t extra_flush_bits)
 {
struct dpu_hw_ctl *ctl;
@@ -1419,7 +1419,7 @@ static inline void 
_dpu_encoder_trigger_flush(struct

drm_encoder *drm_enc,
  * _dpu_encoder_trigger_start - trigger start for a physical encoder
  * phys: Pointer to physical encoder structure
  */
-static inline void _dpu_encoder_trigger_start(struct dpu_encoder_phys
*phys)
+static void _dpu_encoder_trigger_start(struct dpu_encoder_phys *phys)
 {
if (!phys) {
DPU_ERROR("invalid argument(s)\n");
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 283a2491f3e3..b3c68c4fcc8e 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -110,7 +110,7 @@ static void drm_mode_to_intf_timing_params(
 */
 }

-static inline u32 get_horizontal_total(const struct intf_timing_params
*timing)
+static u32 get_horizontal_total(const struct intf_timing_params 
*timing)

 {
u32 active = timing->xres;
u32 inactive =
@@ -119,7 +119,7 @@ static inline u32 get_horizontal_total(const struct
intf_timing_params *timing)
return active + inactive;
 }

-static inline u32 get_vertical_total(const struct intf_timing_params
*timing)
+static u32 get_vertical_total(const struct intf_timing_params

[Freedreno] [PATCH 4/6] drm/msm: dpu: Remove 'inline' from several functions

2018-09-20 Thread Sean Paul 
From: Sean Paul 

Per chapter 15 of coding-style, removing 'inline' keyword from functions
that are larger than a typical macro. In a couple of cases I've
simplified the function and kept the inline.

Signed-off-by: Sean Paul 
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c  |  4 ++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h  | 16 ++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c   |  4 ++--
 .../drm/msm/disp/dpu1/dpu_encoder_phys_vid.c  |  4 ++--
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c|  6 ++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 12 +++---
 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c   |  2 +-
 drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c |  6 ++---
 .../gpu/drm/msm/disp/dpu1/msm_media_info.h| 24 +--
 9 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index a8f2dd7a37c7..5ff23f00582b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -53,7 +53,7 @@ static inline int _dpu_crtc_get_mixer_width(struct 
dpu_crtc_state *cstate,
return mode->hdisplay / cstate->num_mixers;
 }
 
-static inline struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)
+static struct dpu_kms *_dpu_crtc_get_kms(struct drm_crtc *crtc)
 {
struct msm_drm_private *priv;
 
@@ -70,7 +70,7 @@ static inline struct dpu_kms *_dpu_crtc_get_kms(struct 
drm_crtc *crtc)
return to_dpu_kms(priv->kms);
 }
 
-static inline int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool 
enable)
+static int _dpu_crtc_power_enable(struct dpu_crtc *dpu_crtc, bool enable)
 {
struct drm_crtc *crtc;
struct msm_drm_private *priv;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
index 3723b4830335..cc18eca8f527 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h
@@ -266,13 +266,7 @@ static inline int dpu_crtc_get_mixer_height(struct 
dpu_crtc *dpu_crtc,
  */
 static inline int dpu_crtc_frame_pending(struct drm_crtc *crtc)
 {
-   struct dpu_crtc *dpu_crtc;
-
-   if (!crtc)
-   return -EINVAL;
-
-   dpu_crtc = to_dpu_crtc(crtc);
-   return atomic_read(&dpu_crtc->frame_pending);
+   return crtc ? atomic_read(&to_dpu_crtc(crtc)->frame_pending) : -EINVAL;
 }
 
 /**
@@ -329,13 +323,7 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct drm_crtc 
*crtc);
 static inline enum dpu_crtc_client_type dpu_crtc_get_client_type(
struct drm_crtc *crtc)
 {
-   struct dpu_crtc_state *cstate =
-   crtc ? to_dpu_crtc_state(crtc->state) : NULL;
-
-   if (!cstate)
-   return NRT_CLIENT;
-
-   return RT_CLIENT;
+   return crtc && crtc->state ? RT_CLIENT : NRT_CLIENT;
 }
 
 /**
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 1f7f3c2e09c2..79a6c6b7350b 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1376,7 +1376,7 @@ static void dpu_encoder_off_work(struct kthread_work 
*work)
  * phys: Pointer to physical encoder structure
  * extra_flush_bits: Additional bit mask to include in flush trigger
  */
-static inline void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,
+static void _dpu_encoder_trigger_flush(struct drm_encoder *drm_enc,
struct dpu_encoder_phys *phys, uint32_t extra_flush_bits)
 {
struct dpu_hw_ctl *ctl;
@@ -1419,7 +1419,7 @@ static inline void _dpu_encoder_trigger_flush(struct 
drm_encoder *drm_enc,
  * _dpu_encoder_trigger_start - trigger start for a physical encoder
  * phys: Pointer to physical encoder structure
  */
-static inline void _dpu_encoder_trigger_start(struct dpu_encoder_phys *phys)
+static void _dpu_encoder_trigger_start(struct dpu_encoder_phys *phys)
 {
if (!phys) {
DPU_ERROR("invalid argument(s)\n");
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c 
b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
index 283a2491f3e3..b3c68c4fcc8e 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c
@@ -110,7 +110,7 @@ static void drm_mode_to_intf_timing_params(
 */
 }
 
-static inline u32 get_horizontal_total(const struct intf_timing_params *timing)
+static u32 get_horizontal_total(const struct intf_timing_params *timing)
 {
u32 active = timing->xres;
u32 inactive =
@@ -119,7 +119,7 @@ static inline u32 get_horizontal_total(const struct 
intf_timing_params *timing)
return active + inactive;
 }
 
-static inline u32 get_vertical_total(const struct intf_timing_params *timing)
+static u32 get_vertical_total(const struct intf_timing_params *timing)
 {
u32 active = timing->yres;
u32 inactive =
d