|
[AMD Official Use Only - AMD Internal Distribution Only]
Series is:
Reviewed-by: Sonny Jiang <sonjiang@xxxxxxx>
From: Alex Deucher <alexdeucher@xxxxxxxxx>
Sent: Thursday, June 20, 2024 8:48 AM To: Feng, Kenneth <Kenneth.Feng@xxxxxxx> Cc: amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Jiang, Sonny <Sonny.Jiang@xxxxxxx> Subject: Re: [PATCH 2/2] Revert "drm/amd/amdgpu: add module parameter for jpeg" On Wed, Jun 19, 2024 at 9:32 PM Kenneth Feng <kenneth.feng@xxxxxxx> wrote:
> > This reverts commit 63400bcf5cb23b6a9b674eb3f2d733d826860065. > Revert this due to a final solution in amdgu vcn: > commit eef47ed5f703377781ce89eae4b9140325049873 > Author: Sonny Jiang <sonjiang@xxxxxxx> > Date: Tue Jun 18 11:11:11 2024 -0400 > > drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback > > Doorbell needs to be configured after power up during each playback > > Signed-off-by: Kenneth Feng <kenneth.feng@xxxxxxx> Series is: Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- > drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 -- > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ---- > 3 files changed, 8 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 6129f9f7a577..137a88b8de45 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -224,7 +224,6 @@ extern int amdgpu_mes; > extern int amdgpu_mes_log_enable; > extern int amdgpu_mes_kiq; > extern int amdgpu_uni_mes; > -extern int amdgpu_jpeg_test; > extern int amdgpu_noretry; > extern int amdgpu_force_asic_type; > extern int amdgpu_smartshift_bias; > @@ -1022,7 +1021,6 @@ struct amdgpu_device { > > /* jpeg */ > struct amdgpu_jpeg jpeg; > - bool enable_jpeg_test; > > /* vpe */ > struct amdgpu_vpe vpe; > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > index 4edcbd272fa4..df753ebfd109 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c > @@ -2302,8 +2302,6 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) > case IP_VERSION(5, 0, 0): > amdgpu_device_ip_block_add(adev, &vcn_v5_0_0_ip_block); > amdgpu_device_ip_block_add(adev, &jpeg_v5_0_0_ip_block); > - if (amdgpu_jpeg_test) > - adev->enable_jpeg_test = true; > break; > default: > dev_err(adev->dev, > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index 60d5758939ae..802debd8d9f0 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -205,7 +205,6 @@ int amdgpu_force_asic_type = -1; > int amdgpu_tmz = -1; /* auto */ > uint amdgpu_freesync_vid_mode; > int amdgpu_reset_method = -1; /* auto */ > -int amdgpu_jpeg_test; > int amdgpu_num_kcq = -1; > int amdgpu_smartshift_bias; > int amdgpu_use_xgmi_p2p = 1; > @@ -941,9 +940,6 @@ module_param_named(freesync_video, amdgpu_freesync_vid_mode, uint, 0444); > MODULE_PARM_DESC(reset_method, "GPU reset method (-1 = auto (default), 0 = legacy, 1 = mode0, 2 = mode1, 3 = mode2, 4 = baco/bamaco)"); > module_param_named(reset_method, amdgpu_reset_method, int, 0644); > > -MODULE_PARM_DESC(jpeg_test, "jpeg test(0 = disable (default), 1 = enable)"); > -module_param_named(jpeg_test, amdgpu_jpeg_test, int, 0444); > - > /** > * DOC: bad_page_threshold (int) Bad page threshold is specifies the > * threshold value of faulty pages detected by RAS ECC, which may > -- > 2.34.1 > |
