Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d904ef9b authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/kms: add support to atom parser for FB read/write 



FB read/write really doesn't need to access the actual VRAM, we
can just use a scratch area. This is required for using atom displayport
calls later.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f8467618

drivers/gpu/drm/radeon/atom.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -263,10 +263,10 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr, 
	case ATOM_ARG_FB:

	case ATOM_ARG_FB:

		idx = U8(*ptr);

		idx = U8(*ptr);

		(*ptr)++;

		(*ptr)++;

		val = gctx->scratch[((gctx->fb_base + idx) / 4)];

		if (print)

		if (print)

			DEBUG("FB[0x%02X]", idx);

			DEBUG("FB[0x%02X]", idx);

		printk(KERN_INFO "FB access is not implemented.\n");

		break;

		return 0;

	case ATOM_ARG_IMM:

	case ATOM_ARG_IMM:

		switch (align) {

		switch (align) {

		case ATOM_SRC_DWORD:

		case ATOM_SRC_DWORD:
@@ -488,9 +488,9 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr, 
	case ATOM_ARG_FB:

	case ATOM_ARG_FB:

		idx = U8(*ptr);

		idx = U8(*ptr);

		(*ptr)++;

		(*ptr)++;

		gctx->scratch[((gctx->fb_base + idx) / 4)] = val;

		DEBUG("FB[0x%02X]", idx);

		DEBUG("FB[0x%02X]", idx);

		printk(KERN_INFO "FB access is not implemented.\n");

		break;

		return;

	case ATOM_ARG_PLL:

	case ATOM_ARG_PLL:

		idx = U8(*ptr);

		idx = U8(*ptr);

		(*ptr)++;

		(*ptr)++;

drivers/gpu/drm/radeon/atom.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,7 @@ struct atom_context { 
	uint8_t shift;

	uint8_t shift;

	int cs_equal, cs_above;

	int cs_equal, cs_above;

	int io_mode;

	int io_mode;

	uint32_t *scratch;

};

};





extern int atom_debug;

extern int atom_debug;
@@ -142,6 +143,7 @@ int atom_asic_init(struct atom_context *); 
void atom_destroy(struct atom_context *);

void atom_destroy(struct atom_context *);

void atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size, uint8_t *frev, uint8_t *crev, uint16_t *data_start);

void atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size, uint8_t *frev, uint8_t *crev, uint16_t *data_start);

void atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t *frev, uint8_t *crev);

void atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t *frev, uint8_t *crev);

int atom_allocate_fb_scratch(struct atom_context *ctx);

#include "atom-types.h"

#include "atom-types.h"

#include "atombios.h"

#include "atombios.h"

#include "ObjectID.h"

#include "ObjectID.h"

drivers/gpu/drm/radeon/radeon_device.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -481,11 +481,13 @@ int radeon_atombios_init(struct radeon_device *rdev) 




	rdev->mode_info.atom_context = atom_parse(atom_card_info, rdev->bios);

	rdev->mode_info.atom_context = atom_parse(atom_card_info, rdev->bios);

	radeon_atom_initialize_bios_scratch_regs(rdev->ddev);

	radeon_atom_initialize_bios_scratch_regs(rdev->ddev);

	atom_allocate_fb_scratch(rdev->mode_info.atom_context);

	return 0;

	return 0;

}

}





void radeon_atombios_fini(struct radeon_device *rdev)

void radeon_atombios_fini(struct radeon_device *rdev)

{

{

	kfree(rdev->mode_info.atom_context->scratch);

	kfree(rdev->mode_info.atom_context);

	kfree(rdev->mode_info.atom_context);

	kfree(rdev->mode_info.atom_card_info);

	kfree(rdev->mode_info.atom_card_info);

}

}