Unverified Commit a7bbe086 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7123 [sync] PR-7080: drm: nv04: Fix out of bounds access 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7080 
 
PR sync from: Zhang Changzhong <zhangchangzhong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/B2J2WBHK4UXDXBX3ANYBCYFJ2MMSDGHB/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9L5JU 
 
Link:https://gitee.com/openeuler/kernel/pulls/7123

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f82f90ea ab468bb7

drivers/gpu/drm/nouveau/nouveau_bios.c

+7 −6
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include "nouveau_drv.h"

#include "nouveau_bios.h"

#include "nouveau_reg.h"

#include "dispnv04/hw.h"

#include "nouveau_encoder.h"
@@ -1672,7 +1673,7 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf) 
	 */

	if (nv_match_device(dev, 0x0201, 0x1462, 0x8851)) {

		if (*conn == 0xf2005014 && *conf == 0xffffffff) {

			fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 1, 1, 1);

			fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 1, 1, DCB_OUTPUT_B);

			return false;

		}

	}
@@ -1758,26 +1759,26 @@ fabricate_dcb_encoder_table(struct drm_device *dev, struct nvbios *bios) 
#ifdef __powerpc__

	/* Apple iMac G4 NV17 */

	if (of_machine_is_compatible("PowerMac4,5")) {

		fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 0, all_heads, 1);

		fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG, 1, all_heads, 2);

		fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS, 0, all_heads, DCB_OUTPUT_B);

		fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG, 1, all_heads, DCB_OUTPUT_C);

		return;

	}

#endif



	/* Make up some sane defaults */

	fabricate_dcb_output(dcb, DCB_OUTPUT_ANALOG,

			     bios->legacy.i2c_indices.crt, 1, 1);

			     bios->legacy.i2c_indices.crt, 1, DCB_OUTPUT_B);



	if (nv04_tv_identify(dev, bios->legacy.i2c_indices.tv) >= 0)

		fabricate_dcb_output(dcb, DCB_OUTPUT_TV,

				     bios->legacy.i2c_indices.tv,

				     all_heads, 0);

				     all_heads, DCB_OUTPUT_A);



	else if (bios->tmds.output0_script_ptr ||

		 bios->tmds.output1_script_ptr)

		fabricate_dcb_output(dcb, DCB_OUTPUT_TMDS,

				     bios->legacy.i2c_indices.panel,

				     all_heads, 1);

				     all_heads, DCB_OUTPUT_B);

}



static int