On Tue, Jul 21, 2020 at 2:07 PM Bhawanpreet Lakha <Bhawanpreet.Lakha@xxxxxxx> wrote: > > [Why] > Currently navy_flounder is using sienna_cichlid_dmcub.bin. > > [How] > Create a seperate define so navy_flounder will use its own firmware. > > Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@xxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 95185cc58fcb..268eb7ddf364 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -97,6 +97,8 @@ MODULE_FIRMWARE(FIRMWARE_RENOIR_DMUB); > #if defined(CONFIG_DRM_AMD_DC_DCN3_0) > #define FIRMWARE_SIENNA_CICHLID_DMUB "amdgpu/sienna_cichlid_dmcub.bin" > MODULE_FIRMWARE(FIRMWARE_SIENNA_CICHLID_DMUB); > +#define FIRMWARE_NAVY_FLOUNDER_DMUB "amdgpu/navy_flounder_dmcub.bin" > +MODULE_FIRMWARE(FIRMWARE_NAVY_FLOUNDER_DMUB); > #endif > > #define FIRMWARE_RAVEN_DMCU "amdgpu/raven_dmcu.bin" > @@ -1185,10 +1187,13 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) > break; > #if defined(CONFIG_DRM_AMD_DC_DCN3_0) > case CHIP_SIENNA_CICHLID: > - case CHIP_NAVY_FLOUNDER: > dmub_asic = DMUB_ASIC_DCN30; > fw_name_dmub = FIRMWARE_SIENNA_CICHLID_DMUB; > break; > + case CHIP_NAVY_FLOUNDER: > + dmub_asic = DMUB_ASIC_DCN30; > + fw_name_dmub = FIRMWARE_NAVY_FLOUNDER_DMUB; > + break; > #endif > > default: > -- > 2.17.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
