Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5353 → Rev 5354

/drivers/video/drm/radeon/Makefile.lto
36,6 → 36,7
HFILES:= $(DRV_INCLUDES)/linux/types.h \
$(DRV_INCLUDES)/linux/list.h \
$(DRV_INCLUDES)/linux/pci.h \
$(DRV_INCLUDES)/drm/drm.h \
$(DRV_INCLUDES)/drm/drmP.h \
$(DRV_INCLUDES)/drm/drm_edid.h \
$(DRV_INCLUDES)/drm/drm_crtc.h \
59,7 → 60,6
$(DRM_TOPDIR)/drm_crtc_helper.c \
$(DRM_TOPDIR)/drm_dp_helper.c \
$(DRM_TOPDIR)/drm_drv.c \
$(DRM_TOPDIR)/drm_atomic.c \
$(DRM_TOPDIR)/drm_edid.c \
$(DRM_TOPDIR)/drm_fb_helper.c \
$(DRM_TOPDIR)/drm_gem.c \
129,7 → 129,6
radeon_ring.c \
radeon_sa.c \
radeon_semaphore.c \
radeon_sync.c \
radeon_test.c \
radeon_ttm.c \
radeon_ucode.c \
146,6 → 145,7
rv740_dpm.c \
r520.c \
r600.c \
r600_audio.c \
r600_blit_shaders.c \
r600_cs.c \
r600_dma.c \
/drivers/video/drm/radeon/main.c
134,7 → 134,7
if( GetService("DISPLAY") != 0 )
return 0;
 
printf("Radeon v3.19-rc1 cmdline %s\n", cmdline);
printf("Radeon v3.19-rc2 cmdline %s\n", cmdline);
 
if( cmdline && *cmdline )
parse_cmdline(cmdline, &usermode, log, &radeon_modeset);
/drivers/video/drm/radeon/rdisplay.c
4,7 → 4,7
#include "radeon.h"
#include "radeon_object.h"
#include "bitmap.h"
#include "display.h"
#include <display.h>
 
#include "r100d.h"
 
32,20 → 32,20
rdev = (struct radeon_device *)os_display->ddev->dev_private;
 
r = radeon_bo_create(rdev, CURSOR_WIDTH*CURSOR_HEIGHT*4,
4096, false, RADEON_GEM_DOMAIN_VRAM, 0, NULL, NULL, &cursor->robj);
4096, false, RADEON_GEM_DOMAIN_VRAM, 0, NULL, NULL, (struct radeon_bo**)&cursor->cobj);
 
if (unlikely(r != 0))
return r;
 
r = radeon_bo_reserve(cursor->robj, false);
r = radeon_bo_reserve(cursor->cobj, false);
if (unlikely(r != 0))
return r;
 
r = radeon_bo_pin(cursor->robj, RADEON_GEM_DOMAIN_VRAM, NULL);
r = radeon_bo_pin(cursor->cobj, RADEON_GEM_DOMAIN_VRAM, NULL);
if (unlikely(r != 0))
return r;
 
r = radeon_bo_kmap(cursor->robj, (void**)&bits);
r = radeon_bo_kmap(cursor->cobj, (void**)&bits);
if (r) {
DRM_ERROR("radeon: failed to map cursor (%d).\n", r);
return r;
63,7 → 63,7
for(i = 0; i < CURSOR_WIDTH*(CURSOR_HEIGHT-32); i++)
*bits++ = 0;
 
radeon_bo_kunmap(cursor->robj);
radeon_bo_kunmap(cursor->cobj);
 
// cursor->header.destroy = destroy_cursor;
 
73,7 → 73,7
void __attribute__((regparm(1))) destroy_cursor(cursor_t *cursor)
{
list_del(&cursor->list);
radeon_bo_unpin(cursor->robj);
radeon_bo_unpin(cursor->cobj);
KernelFree(cursor->data);
__DestroyObject(cursor);
};
110,7 → 110,7
old = os_display->cursor;
 
os_display->cursor = cursor;
gpu_addr = radeon_bo_gpu_offset(cursor->robj);
gpu_addr = radeon_bo_gpu_offset(cursor->cobj);
 
if (ASIC_IS_DCE4(rdev))
{
207,7 → 207,7
WREG32(RADEON_CUR_HORZ_VERT_POSN,
(RADEON_CUR_LOCK | (x << 16) | y));
 
gpu_addr = radeon_bo_gpu_offset(cursor->robj);
gpu_addr = radeon_bo_gpu_offset(cursor->cobj);
 
/* offset is from DISP(2)_BASE_ADDRESS */
WREG32(RADEON_CUR_OFFSET,
/drivers/video/drm/radeon/rdisplay_kms.c
6,7 → 6,7
#include "drm_fb_helper.h"
#include "hmm.h"
#include "bitmap.h"
#include "display.h"
#include <display.h>
 
extern struct drm_framebuffer *main_fb;
extern struct drm_gem_object *main_fb_obj;
94,7 → 94,7
old = os_display->cursor;
 
os_display->cursor = cursor;
gpu_addr = radeon_bo_gpu_offset(cursor->robj);
gpu_addr = radeon_bo_gpu_offset(cursor->cobj);
 
if (ASIC_IS_DCE4(rdev)) {
WREG32(EVERGREEN_CUR_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset,
169,7 → 169,7
WREG32(RADEON_CUR_HORZ_VERT_POSN,
(RADEON_CUR_LOCK | (x << 16) | y));
 
gpu_addr = radeon_bo_gpu_offset(cursor->robj);
gpu_addr = radeon_bo_gpu_offset(cursor->cobj);
 
/* offset is from DISP(2)_BASE_ADDRESS */
WREG32(RADEON_CUR_OFFSET,