diff mbox series

[2/5] drm/dsc: Fix bogus cpu_to_be16() usage

Message ID 20190710125143.9965-2-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [1/5] drm/fb-helper: Include prototype for drm_fb_helper_modinit() | expand

Commit Message

Ville Syrjälä July 10, 2019, 12:51 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

__be16 = cpu_to_be16(__be16) is nonsense. Do it right.

../drivers/gpu/drm/drm_dsc.c:218:53: warning: incorrect type in assignment (different base types)
../drivers/gpu/drm/drm_dsc.c:218:53:    expected restricted __be16
../drivers/gpu/drm/drm_dsc.c:218:53:    got int
../drivers/gpu/drm/drm_dsc.c:225:25: warning: cast from restricted __be16
../drivers/gpu/drm/drm_dsc.c:225:25: warning: incorrect type in argument 1 (different base types)
../drivers/gpu/drm/drm_dsc.c:225:25:    expected unsigned short [usertype] val
../drivers/gpu/drm/drm_dsc.c:225:25:    got restricted __be16
../drivers/gpu/drm/drm_dsc.c:225:25: warning: cast from restricted __be16
../drivers/gpu/drm/drm_dsc.c:225:25: warning: cast from restricted __be16

Cc: Manasi Navare <manasi.d.navare@intel.com>
Cc: David Francis <David.Francis@amd.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_dsc.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Comments

Sean Paul July 11, 2019, 3:36 p.m. UTC | #1 
On Wed, Jul 10, 2019 at 03:51:40PM +0300, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> __be16 = cpu_to_be16(__be16) is nonsense. Do it right.
> 
> ../drivers/gpu/drm/drm_dsc.c:218:53: warning: incorrect type in assignment (different base types)
> ../drivers/gpu/drm/drm_dsc.c:218:53:    expected restricted __be16
> ../drivers/gpu/drm/drm_dsc.c:218:53:    got int
> ../drivers/gpu/drm/drm_dsc.c:225:25: warning: cast from restricted __be16
> ../drivers/gpu/drm/drm_dsc.c:225:25: warning: incorrect type in argument 1 (different base types)
> ../drivers/gpu/drm/drm_dsc.c:225:25:    expected unsigned short [usertype] val
> ../drivers/gpu/drm/drm_dsc.c:225:25:    got restricted __be16
> ../drivers/gpu/drm/drm_dsc.c:225:25: warning: cast from restricted __be16
> ../drivers/gpu/drm/drm_dsc.c:225:25: warning: cast from restricted __be16
> 
> Cc: Manasi Navare <manasi.d.navare@intel.com>
> Cc: David Francis <David.Francis@amd.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Reviewed-by: Sean Paul <sean@poorly.run>

> ---
>  drivers/gpu/drm/drm_dsc.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c
> index 77f4e5ae4197..f2fc47f123d2 100644
> --- a/drivers/gpu/drm/drm_dsc.c
> +++ b/drivers/gpu/drm/drm_dsc.c
> @@ -216,13 +216,11 @@ void drm_dsc_pps_payload_pack(struct drm_dsc_picture_parameter_set *pps_payload,
>  	 */
>  	for (i = 0; i < DSC_NUM_BUF_RANGES; i++) {
>  		pps_payload->rc_range_parameters[i] =
> -			((dsc_cfg->rc_range_params[i].range_min_qp <<
> -			  DSC_PPS_RC_RANGE_MINQP_SHIFT) |
> -			 (dsc_cfg->rc_range_params[i].range_max_qp <<
> -			  DSC_PPS_RC_RANGE_MAXQP_SHIFT) |
> -			 (dsc_cfg->rc_range_params[i].range_bpg_offset));
> -		pps_payload->rc_range_parameters[i] =
> -			cpu_to_be16(pps_payload->rc_range_parameters[i]);
> +			cpu_to_be16((dsc_cfg->rc_range_params[i].range_min_qp <<
> +				     DSC_PPS_RC_RANGE_MINQP_SHIFT) |
> +				    (dsc_cfg->rc_range_params[i].range_max_qp <<
> +				     DSC_PPS_RC_RANGE_MAXQP_SHIFT) |
> +				    (dsc_cfg->rc_range_params[i].range_bpg_offset));
>  	}
>  
>  	/* PPS 88 */
> -- 
> 2.21.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_dsc.c b/drivers/gpu/drm/drm_dsc.c
index 77f4e5ae4197..f2fc47f123d2 100644
--- a/drivers/gpu/drm/drm_dsc.c
+++ b/drivers/gpu/drm/drm_dsc.c
@@ -216,13 +216,11 @@  void drm_dsc_pps_payload_pack(struct drm_dsc_picture_parameter_set *pps_payload,
 	 */
 	for (i = 0; i < DSC_NUM_BUF_RANGES; i++) {
 		pps_payload->rc_range_parameters[i] =
-			((dsc_cfg->rc_range_params[i].range_min_qp <<
-			  DSC_PPS_RC_RANGE_MINQP_SHIFT) |
-			 (dsc_cfg->rc_range_params[i].range_max_qp <<
-			  DSC_PPS_RC_RANGE_MAXQP_SHIFT) |
-			 (dsc_cfg->rc_range_params[i].range_bpg_offset));
-		pps_payload->rc_range_parameters[i] =
-			cpu_to_be16(pps_payload->rc_range_parameters[i]);
+			cpu_to_be16((dsc_cfg->rc_range_params[i].range_min_qp <<
+				     DSC_PPS_RC_RANGE_MINQP_SHIFT) |
+				    (dsc_cfg->rc_range_params[i].range_max_qp <<
+				     DSC_PPS_RC_RANGE_MAXQP_SHIFT) |
+				    (dsc_cfg->rc_range_params[i].range_bpg_offset));
 	}
 
 	/* PPS 88 */