[PATCH v2 0/5] drm: clean up several wrapper functions

[PATCH v2 0/5] drm: clean up several wrapper functions

[Masahiro Yamada]

Changes in v2:
  - Split per-driver
  - Remove i915_driver_open()
  - Fix dce_virtual_hw_init() as well

Masahiro Yamada (5):
  drm/amdgpu: squash lines for simple wrapper functions
  drm/radeon: squash lines for simple wrapper functions
  drm/bridge: squash lines for simple wrapper functions
  drm/qxl: squash lines for simple wrapper functions
  drm/i915: use i915_gem_open() directly instead of i915_driver_open()

 drivers/gpu/drm/amd/amdgpu/dce_virtual.c          |  6 +-----
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c            |  6 +-----
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c            |  6 +-----
 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
 drivers/gpu/drm/i915/i915_drv.c                   | 13 +------------
 drivers/gpu/drm/qxl/qxl_draw.c                    |  7 ++-----
 drivers/gpu/drm/qxl/qxl_release.c                 |  7 ++-----
 drivers/gpu/drm/radeon/cik.c                      |  6 +-----
 drivers/gpu/drm/radeon/r100.c                     |  6 +-----
 drivers/gpu/drm/radeon/r600.c                     |  6 +-----
 10 files changed, 15 insertions(+), 68 deletions(-)

-- 
1.9.1

[PATCH v2 0/5] drm: clean up several wrapper functions

[Masahiro Yamada]

Changes in v2:
  - Split per-driver
  - Remove i915_driver_open()
  - Fix dce_virtual_hw_init() as well

Masahiro Yamada (5):
  drm/amdgpu: squash lines for simple wrapper functions
  drm/radeon: squash lines for simple wrapper functions
  drm/bridge: squash lines for simple wrapper functions
  drm/qxl: squash lines for simple wrapper functions
  drm/i915: use i915_gem_open() directly instead of i915_driver_open()

 drivers/gpu/drm/amd/amdgpu/dce_virtual.c          |  6 +-----
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c            |  6 +-----
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c            |  6 +-----
 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
 drivers/gpu/drm/i915/i915_drv.c                   | 13 +------------
 drivers/gpu/drm/qxl/qxl_draw.c                    |  7 ++-----
 drivers/gpu/drm/qxl/qxl_release.c                 |  7 ++-----
 drivers/gpu/drm/radeon/cik.c                      |  6 +-----
 drivers/gpu/drm/radeon/r100.c                     |  6 +-----
 drivers/gpu/drm/radeon/r600.c                     |  6 +-----
 10 files changed, 15 insertions(+), 68 deletions(-)

-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2 1/5] drm/amdgpu: squash lines for simple wrapper functions

[Masahiro Yamada]

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 +-----
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c   | 6 +-----
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c   | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 00663a7..619b604 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -466,11 +466,7 @@ static int dce_virtual_suspend(void *handle)
 
 static int dce_virtual_resume(void *handle)
 {
-	int ret;
-
-	ret = dce_virtual_hw_init(handle);
-
-	return ret;
+	return dce_virtual_hw_init(handle);
 }
 
 static bool dce_virtual_is_idle(void *handle)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 2b10e88..3d01291 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -190,12 +190,8 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
  */
 static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
 {
-	u32 rptr;
-
 	/* XXX check if swapping is necessary on BE */
-	rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
-
-	return rptr;
+	return ring->adev->wb.wb[ring->rptr_offs] >> 2;
 }
 
 /**
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index bee4978..ddb8081 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -335,12 +335,8 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
  */
 static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
 {
-	u32 rptr;
-
 	/* XXX check if swapping is necessary on BE */
-	rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
-
-	return rptr;
+	return ring->adev->wb.wb[ring->rptr_offs] >> 2;
 }
 
 /**
-- 
1.9.1

Re: [PATCH v2 1/5] drm/amdgpu: squash lines for simple wrapper functions

[Sean Paul]

On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>


Applied to drm-misc

Sean

> ---
>
>  drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 6 +-----
>  drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c   | 6 +-----
>  drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c   | 6 +-----
>  3 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 00663a7..619b604 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -466,11 +466,7 @@ static int dce_virtual_suspend(void *handle)
>
>  static int dce_virtual_resume(void *handle)
>  {
> -       int ret;
> -
> -       ret = dce_virtual_hw_init(handle);
> -
> -       return ret;
> +       return dce_virtual_hw_init(handle);
>  }
>
>  static bool dce_virtual_is_idle(void *handle)
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index 2b10e88..3d01291 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -190,12 +190,8 @@ static int sdma_v2_4_init_microcode(struct amdgpu_device *adev)
>   */
>  static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
>  {
> -       u32 rptr;
> -
>         /* XXX check if swapping is necessary on BE */
> -       rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> -       return rptr;
> +       return ring->adev->wb.wb[ring->rptr_offs] >> 2;
>  }
>
>  /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index bee4978..ddb8081 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -335,12 +335,8 @@ static int sdma_v3_0_init_microcode(struct amdgpu_device *adev)
>   */
>  static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
>  {
> -       u32 rptr;
> -
>         /* XXX check if swapping is necessary on BE */
> -       rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> -       return rptr;
> +       return ring->adev->wb.wb[ring->rptr_offs] >> 2;
>  }
>
>  /**
> --
> 1.9.1
>

[PATCH v2 2/5] drm/radeon: squash lines for simple wrapper functions

[Masahiro Yamada]

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/gpu/drm/radeon/cik.c  | 6 +-----
 drivers/gpu/drm/radeon/r100.c | 6 +-----
 drivers/gpu/drm/radeon/r600.c | 6 +-----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index b1784a1..f6ff41a 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4193,11 +4193,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
 u32 cik_gfx_get_wptr(struct radeon_device *rdev,
 		     struct radeon_ring *ring)
 {
-	u32 wptr;
-
-	wptr = RREG32(CP_RB0_WPTR);
-
-	return wptr;
+	return RREG32(CP_RB0_WPTR);
 }
 
 void cik_gfx_set_wptr(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f25994b..f5e84f4 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
 u32 r100_gfx_get_wptr(struct radeon_device *rdev,
 		      struct radeon_ring *ring)
 {
-	u32 wptr;
-
-	wptr = RREG32(RADEON_CP_RB_WPTR);
-
-	return wptr;
+	return RREG32(RADEON_CP_RB_WPTR);
 }
 
 void r100_gfx_set_wptr(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 6406536..a951881 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
 u32 r600_gfx_get_wptr(struct radeon_device *rdev,
 		      struct radeon_ring *ring)
 {
-	u32 wptr;
-
-	wptr = RREG32(R600_CP_RB_WPTR);
-
-	return wptr;
+	return RREG32(R600_CP_RB_WPTR);
 }
 
 void r600_gfx_set_wptr(struct radeon_device *rdev,
-- 
1.9.1

Re: [PATCH v2 2/5] drm/radeon: squash lines for simple wrapper functions

[Sean Paul]

On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Applied to drm-misc

Sean

> ---
>
>  drivers/gpu/drm/radeon/cik.c  | 6 +-----
>  drivers/gpu/drm/radeon/r100.c | 6 +-----
>  drivers/gpu/drm/radeon/r600.c | 6 +-----
>  3 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index b1784a1..f6ff41a 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -4193,11 +4193,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
>  u32 cik_gfx_get_wptr(struct radeon_device *rdev,
>                      struct radeon_ring *ring)
>  {
> -       u32 wptr;
> -
> -       wptr = RREG32(CP_RB0_WPTR);
> -
> -       return wptr;
> +       return RREG32(CP_RB0_WPTR);
>  }
>
>  void cik_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index f25994b..f5e84f4 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
>  u32 r100_gfx_get_wptr(struct radeon_device *rdev,
>                       struct radeon_ring *ring)
>  {
> -       u32 wptr;
> -
> -       wptr = RREG32(RADEON_CP_RB_WPTR);
> -
> -       return wptr;
> +       return RREG32(RADEON_CP_RB_WPTR);
>  }
>
>  void r100_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 6406536..a951881 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
>  u32 r600_gfx_get_wptr(struct radeon_device *rdev,
>                       struct radeon_ring *ring)
>  {
> -       u32 wptr;
> -
> -       wptr = RREG32(R600_CP_RB_WPTR);
> -
> -       return wptr;
> +       return RREG32(R600_CP_RB_WPTR);
>  }
>
>  void r600_gfx_set_wptr(struct radeon_device *rdev,
> --
> 1.9.1
>

[PATCH v2 3/5] drm/bridge: squash lines for simple wrapper functions

[Masahiro Yamada]

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index 52c1b6b..fae0293 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
 
 u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
 {
-	u32 reg;
-
-	reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
-	return reg;
+	return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
 }
 
 u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
 {
-	u32 reg;
-
-	reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
-	return reg;
+	return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
 }
 
 u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
 {
-	u32 reg;
-
-	reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
-	return reg;
+	return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
 }
 
 u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
 {
-	u32 reg;
-
-	reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
-	return reg;
+	return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
 }
 
 void analogix_dp_reset_macro(struct analogix_dp_device *dp)
-- 
1.9.1

Re: [PATCH v2 3/5] drm/bridge: squash lines for simple wrapper functions

[Sean Paul]

On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Sean Paul <seanpaul@chromium.org>

> ---
>
>  drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
>  1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 52c1b6b..fae0293 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
>
>  u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
>  }
>
>  u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
>  }
>
>  u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
>  }
>
>  u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
>  }
>
>  void analogix_dp_reset_macro(struct analogix_dp_device *dp)
> --
> 1.9.1
>

Re: [PATCH v2 3/5] drm/bridge: squash lines for simple wrapper functions

[Sean Paul]

On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Sean Paul <seanpaul@chromium.org>

> ---
>
>  drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
>  1 file changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 52c1b6b..fae0293 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
>
>  u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
>  }
>
>  u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
>  }
>
>  u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
>  }
>
>  u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
>  {
> -       u32 reg;
> -
> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> -       return reg;
> +       return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
>  }
>
>  void analogix_dp_reset_macro(struct analogix_dp_device *dp)
> --
> 1.9.1
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 3/5] drm/bridge: squash lines for simple wrapper functions

[Sean Paul]

On Thu, Sep 15, 2016 at 9:51 AM, Sean Paul <seanpaul@chromium.org> wrote:
> On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> Remove unneeded variables and assignments.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>

Decided to apply patches 1-4 to drm-misc

Thanks,

Sean

>> ---
>>
>>  drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
>>  1 file changed, 4 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> index 52c1b6b..fae0293 100644
>> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
>>
>>  u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
>>  }
>>
>>  u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
>>  }
>>
>>  u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
>>  }
>>
>>  u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
>>  }
>>
>>  void analogix_dp_reset_macro(struct analogix_dp_device *dp)
>> --
>> 1.9.1
>>

Re: [PATCH v2 3/5] drm/bridge: squash lines for simple wrapper functions

[Sean Paul]

On Thu, Sep 15, 2016 at 9:51 AM, Sean Paul <seanpaul@chromium.org> wrote:
> On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> Remove unneeded variables and assignments.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>

Decided to apply patches 1-4 to drm-misc

Thanks,

Sean

>> ---
>>
>>  drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
>>  1 file changed, 4 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> index 52c1b6b..fae0293 100644
>> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
>> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
>>
>>  u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
>>  }
>>
>>  u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
>>  }
>>
>>  u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
>>  }
>>
>>  u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
>>  {
>> -       u32 reg;
>> -
>> -       reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
>> -       return reg;
>> +       return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
>>  }
>>
>>  void analogix_dp_reset_macro(struct analogix_dp_device *dp)
>> --
>> 1.9.1
>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 3/5] drm/bridge: squash lines for simple wrapper functions

[Masahiro Yamada]

Hi Sean,

2016-09-15 23:46 GMT+09:00 Sean Paul <seanpaul@chromium.org>:
> On Thu, Sep 15, 2016 at 9:51 AM, Sean Paul <seanpaul@chromium.org> wrote:
>> On Wed, Sep 14, 2016 at 10:39 AM, Masahiro Yamada
>> <yamada.masahiro@socionext.com> wrote:
>>> Remove unneeded variables and assignments.
>>>
>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>
>> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>>
>
> Decided to apply patches 1-4 to drm-misc
>
> Thanks,
>
> Sean


Thanks.

I've just updated [5/5 drm/i915]
and posted v3.




-- 
Best Regards
Masahiro Yamada

[PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions

[Masahiro Yamada]

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/gpu/drm/qxl/qxl_draw.c    | 7 ++-----
 drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
index ffe8853..9b728ed 100644
--- a/drivers/gpu/drm/qxl/qxl_draw.c
+++ b/drivers/gpu/drm/qxl/qxl_draw.c
@@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
 static int
 alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
 {
-	int ret;
-	ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
-					 QXL_RELEASE_DRAWABLE, release,
-					 NULL);
-	return ret;
+	return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
+					  QXL_RELEASE_DRAWABLE, release, NULL);
 }
 
 static void
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index f599cd0..cd83f05 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -203,12 +203,9 @@ static long qxl_fence_wait(struct fence *fence, bool intr, signed long timeout)
 static int qxl_release_bo_alloc(struct qxl_device *qdev,
 				struct qxl_bo **bo)
 {
-	int ret;
 	/* pin releases bo's they are too messy to evict */
-	ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
-			    QXL_GEM_DOMAIN_VRAM, NULL,
-			    bo);
-	return ret;
+	return qxl_bo_create(qdev, PAGE_SIZE, false, true,
+			     QXL_GEM_DOMAIN_VRAM, NULL, bo);
 }
 
 int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
-- 
1.9.1

Re: [PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions

[Gustavo Padovan]

Hi Masahiro,

2016-09-14 Masahiro Yamada <yamada.masahiro@socionext.com>:

> Remove unneeded variables and assignments.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
>  drivers/gpu/drm/qxl/qxl_draw.c    | 7 ++-----
>  drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
>  2 files changed, 4 insertions(+), 10 deletions(-)

Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Gustavo

Re: [PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions

[Gustavo Padovan]

2016-09-14 Masahiro Yamada <yamada.masahiro@socionext.com>:

> Remove unneeded variables and assignments.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
>  drivers/gpu/drm/qxl/qxl_draw.c    | 7 ++-----
>  drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
>  2 files changed, 4 insertions(+), 10 deletions(-)

For patches 1 to 4:

Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Gustavo

Re: [PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions

[Gustavo Padovan]

2016-09-14 Masahiro Yamada <yamada.masahiro@socionext.com>:

> Remove unneeded variables and assignments.
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
> 
>  drivers/gpu/drm/qxl/qxl_draw.c    | 7 ++-----
>  drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
>  2 files changed, 4 insertions(+), 10 deletions(-)

For patches 1 to 4:

Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Gustavo
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions

[Sean Paul]

On Thu, Sep 15, 2016 at 9:47 AM, Gustavo Padovan <gustavo@padovan.org> wrote:
> 2016-09-14 Masahiro Yamada <yamada.masahiro@socionext.com>:
>
>> Remove unneeded variables and assignments.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>>  drivers/gpu/drm/qxl/qxl_draw.c    | 7 ++-----
>>  drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
>>  2 files changed, 4 insertions(+), 10 deletions(-)
>
> For patches 1 to 4:
>
> Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>



Applied to drm-misc

Sean

>
> Gustavo
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 4/5] drm/qxl: squash lines for simple wrapper functions

[Sean Paul]

On Thu, Sep 15, 2016 at 9:47 AM, Gustavo Padovan <gustavo@padovan.org> wrote:
> 2016-09-14 Masahiro Yamada <yamada.masahiro@socionext.com>:
>
>> Remove unneeded variables and assignments.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>>  drivers/gpu/drm/qxl/qxl_draw.c    | 7 ++-----
>>  drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
>>  2 files changed, 4 insertions(+), 10 deletions(-)
>
> For patches 1 to 4:
>
> Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>



Applied to drm-misc

Sean

>
> Gustavo
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open()

[Masahiro Yamada]

i915_driver_open() is equivalent to i915_gem_open().  Replace the
i915_driver_open with the direct use of i915_gem_open().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/gpu/drm/i915/i915_drv.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7f4e8ad..d3a33c4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev)
 	i915_driver_cleanup_early(dev_priv);
 }
 
-static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
-{
-	int ret;
-
-	ret = i915_gem_open(dev, file);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
 /**
  * i915_driver_lastclose - clean up after all DRM clients have exited
  * @dev: DRM device
@@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev)
 	.driver_features =
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |
 	    DRIVER_RENDER | DRIVER_MODESET,
-	.open = i915_driver_open,
+	.open = i915_gem_open,
 	.lastclose = i915_driver_lastclose,
 	.preclose = i915_driver_preclose,
 	.postclose = i915_driver_postclose,
-- 
1.9.1

[PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open()

[Masahiro Yamada]

i915_driver_open() is equivalent to i915_gem_open().  Replace the
i915_driver_open with the direct use of i915_gem_open().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/gpu/drm/i915/i915_drv.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7f4e8ad..d3a33c4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev)
 	i915_driver_cleanup_early(dev_priv);
 }
 
-static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
-{
-	int ret;
-
-	ret = i915_gem_open(dev, file);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
 /**
  * i915_driver_lastclose - clean up after all DRM clients have exited
  * @dev: DRM device
@@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev)
 	.driver_features =
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |
 	    DRIVER_RENDER | DRIVER_MODESET,
-	.open = i915_driver_open,
+	.open = i915_gem_open,
 	.lastclose = i915_driver_lastclose,
 	.preclose = i915_driver_preclose,
 	.postclose = i915_driver_postclose,
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open()

[Jani Nikula]

On Wed, 14 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> i915_driver_open() is equivalent to i915_gem_open().  Replace the
> i915_driver_open with the direct use of i915_gem_open().

Sorry I know I asked for this, but there was opposition to doing
this. Please just do the return i915_gem_open(dev, file) version like
you had originally.

Thanks,
Jani.


>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  drivers/gpu/drm/i915/i915_drv.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 7f4e8ad..d3a33c4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev)
>  	i915_driver_cleanup_early(dev_priv);
>  }
>  
> -static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> -{
> -	int ret;
> -
> -	ret = i915_gem_open(dev, file);
> -	if (ret)
> -		return ret;
> -
> -	return 0;
> -}
> -
>  /**
>   * i915_driver_lastclose - clean up after all DRM clients have exited
>   * @dev: DRM device
> @@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev)
>  	.driver_features =
>  	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |
>  	    DRIVER_RENDER | DRIVER_MODESET,
> -	.open = i915_driver_open,
> +	.open = i915_gem_open,
>  	.lastclose = i915_driver_lastclose,
>  	.preclose = i915_driver_preclose,
>  	.postclose = i915_driver_postclose,

-- 
Jani Nikula, Intel Open Source Technology Center

Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open()

[Jani Nikula]

On Wed, 14 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> i915_driver_open() is equivalent to i915_gem_open().  Replace the
> i915_driver_open with the direct use of i915_gem_open().

Sorry I know I asked for this, but there was opposition to doing
this. Please just do the return i915_gem_open(dev, file) version like
you had originally.

Thanks,
Jani.


>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  drivers/gpu/drm/i915/i915_drv.c | 13 +------------
>  1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 7f4e8ad..d3a33c4 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev)
>  	i915_driver_cleanup_early(dev_priv);
>  }
>  
> -static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> -{
> -	int ret;
> -
> -	ret = i915_gem_open(dev, file);
> -	if (ret)
> -		return ret;
> -
> -	return 0;
> -}
> -
>  /**
>   * i915_driver_lastclose - clean up after all DRM clients have exited
>   * @dev: DRM device
> @@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev)
>  	.driver_features =
>  	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |
>  	    DRIVER_RENDER | DRIVER_MODESET,
> -	.open = i915_driver_open,
> +	.open = i915_gem_open,
>  	.lastclose = i915_driver_lastclose,
>  	.preclose = i915_driver_preclose,
>  	.postclose = i915_driver_postclose,

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open()

[Masahiro Yamada]

2016-09-15 18:46 GMT+09:00 Jani Nikula <jani.nikula@linux.intel.com>:
> On Wed, 14 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
>> i915_driver_open() is equivalent to i915_gem_open().  Replace the
>> i915_driver_open with the direct use of i915_gem_open().
>
> Sorry I know I asked for this, but there was opposition to doing
> this. Please just do the return i915_gem_open(dev, file) version like
> you had originally.

Sure.

(I was also wondering if it is the right thing to do.)

I will send v3.





-- 
Best Regards
Masahiro Yamada