Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel_extreme: set B_SCROLL, share current mode. Cloning and BWindowScreen now work OK.

Browse Source
This commit is contained in:
Rudolf Cornelissen 2021-09-27 10:19:43 +00:00
parent 1e0fdd6d98
commit fe8f9e2326
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
headers/private/graphics/intel_extreme/intel_extreme.h
View File

@ -248,6 +248,7 @@ struct intel_shared_info {
area_id mode_list_area; // area containing display mode list
uint32 mode_count;
display_mode current_mode; // pretty much a hack until per-display modes
display_mode panel_mode; // VBIOS VBT panel mode
uint32 bytes_per_row;
uint32 bits_per_pixel;

2
src/add-ons/accelerants/intel_extreme/accelerant.h
View File

@ -40,8 +40,6 @@ struct accelerant_info {
intel_shared_info* shared_info;
area_id shared_info_area;
display_mode current_mode; // pretty much a hack until per-display modes
display_mode* mode_list; // cloned list of standard display modes
area_id mode_list_area;

24
src/add-ons/accelerants/intel_extreme/mode.cpp
View File

@ -114,7 +114,7 @@ static void
set_frame_buffer_registers(uint32 offset)
{
intel_shared_info &sharedInfo = *gInfo->shared_info;
display_mode &mode = gInfo->current_mode;
display_mode &mode = sharedInfo.current_mode;
if (sharedInfo.device_type.InGroup(INTEL_GROUP_96x)
|| sharedInfo.device_type.InGroup(INTEL_GROUP_G4x)
@ -294,10 +294,16 @@ intel_propose_display_mode(display_mode* target, const display_mode* low,
// retain requested virtual size
target->virtual_width = VirtualWidth;
target->virtual_height = VirtualHeight;
// (most) modeflags are outputs from us (the driver). So we should
// set them depending on the mode and the current hardware config
target->flags |= B_SCROLL;
return B_OK;
}
sanitize_display_mode(*target);
// (most) modeflags are outputs from us (the driver). So we should
// set them depending on the mode and the current hardware config
target->flags |= B_SCROLL;
return is_display_mode_within_bounds(*target, *low, *high)
? B_OK : B_BAD_VALUE;
@ -310,12 +316,12 @@ intel_set_display_mode(display_mode* mode)
if (mode == NULL)
return B_BAD_VALUE;
TRACE("%s(%" B_PRIu16 "x%" B_PRIu16 ")\n", __func__,
mode->timing.h_display, mode->timing.v_display);
TRACE("%s(%" B_PRIu16 "x%" B_PRIu16 ", virtual: %" B_PRIu16 "x%" B_PRIu16 ")\n", __func__,
mode->timing.h_display, mode->timing.v_display, mode->virtual_width, mode->virtual_height);
display_mode target = *mode;
if (sanitize_display_mode(target)) {
if (sanitize_display_mode(target)) { //should be in proposemode..
TRACE("Video mode was adjusted by sanitize_display_mode\n");
TRACE("Initial mode: Hd %d Hs %d He %d Ht %d Vd %d Vs %d Ve %d Vt %d\n",
mode->timing.h_display, mode->timing.h_sync_start,
@ -328,6 +334,8 @@ intel_set_display_mode(display_mode* mode)
target.timing.v_display, target.timing.v_sync_start,
target.timing.v_sync_end, target.timing.v_total);
}
if (intel_propose_display_mode(&target, &target, &target) != B_OK)
return B_BAD_VALUE;
uint32 colorMode, bytesPerRow, bitsPerPixel;
get_color_space_format(target, colorMode, bytesPerRow, bitsPerPixel);
@ -354,7 +362,7 @@ intel_set_display_mode(display_mode* mode)
base) < B_OK) {
// oh, how did that happen? Unfortunately, there is no really good way
// back. Try to restore a framebuffer for the previous mode, at least.
if (intel_allocate_memory(gInfo->current_mode.virtual_height
if (intel_allocate_memory(sharedInfo.current_mode.virtual_height
* sharedInfo.bytes_per_row, 0, base) == B_OK) {
sharedInfo.frame_buffer = base;
sharedInfo.frame_buffer_offset = base
@ -485,7 +493,7 @@ intel_set_display_mode(display_mode* mode)
write32(INTEL_DISPLAY_B_BYTES_PER_ROW, bytesPerRow);
// update shared info
gInfo->current_mode = target;
sharedInfo.current_mode = target;
// TODO: move to gInfo
sharedInfo.bytes_per_row = bytesPerRow;
@ -507,7 +515,7 @@ intel_get_display_mode(display_mode* _currentMode)
{
CALLED();
*_currentMode = gInfo->current_mode;
*_currentMode = gInfo->shared_info->current_mode;
// This seems unreliable. We should always know the current_mode
//retrieve_current_mode(*_currentMode, INTEL_DISPLAY_A_PLL);
@ -635,7 +643,7 @@ intel_move_display(uint16 horizontalStart, uint16 verticalStart)
intel_shared_info &sharedInfo = *gInfo->shared_info;
Autolock locker(sharedInfo.accelerant_lock);
display_mode &mode = gInfo->current_mode;
display_mode &mode = sharedInfo.current_mode;
if (horizontalStart + mode.timing.h_display > mode.virtual_width
|| verticalStart + mode.timing.v_display > mode.virtual_height)

11
src/add-ons/accelerants/intel_extreme/overlay.cpp
View File

@ -207,7 +207,7 @@ set_color_key(uint8 red, uint8 green, uint8 blue, uint8 redMask,
static void
set_color_key(const overlay_window* window)
{
switch (gInfo->current_mode.space) {
switch (gInfo->shared_info->current_mode.space) {
case B_CMAP8:
set_color_key(0, 0, window->blue.value, 0x0, 0x0, 0xff);
break;
@ -553,6 +553,7 @@ intel_configure_overlay(overlay_token overlayToken,
struct overlay* overlay = (struct overlay*)buffer;
overlay_registers* registers = gInfo->overlay_registers;
intel_shared_info &sharedInfo = *gInfo->shared_info;
bool updateCoefficients = false;
uint32 bytesPerPixel = 2;
@ -589,10 +590,10 @@ intel_configure_overlay(overlay_token overlayToken,
left = 0;
if (top < 0)
top = 0;
if (right > gInfo->current_mode.timing.h_display)
right = gInfo->current_mode.timing.h_display;
if (bottom > gInfo->current_mode.timing.v_display)
bottom = gInfo->current_mode.timing.v_display;
if (right > sharedInfo.current_mode.timing.h_display)
right = sharedInfo.current_mode.timing.h_display;
if (bottom > sharedInfo.current_mode.timing.v_display)
bottom = sharedInfo.current_mode.timing.v_display;
if (left >= right || top >= bottom) {
// overlay is not within visible bounds
hide_overlay();