I believe CS6 with its current bugs will run on a MPB with that display just have a magnifying glass handy so you can read CS6 GUI text.  I think all that Adobe need to do is have an option available for high PPI resolution displays where GUI areas are allocated with higher pixel count so the areas will be larger on screen so the can house fonts that are made with more pixels so they will be bigger on screen and readable. As pixel density increases pixel size decreases so things displayed are smaller and sharper.  The iPone 336PPI resolution is higher then most human eyes can resolve down to.  You will not be able to read a small font designed to be readable on a 96PPI display on a 336ppi for it its physical size on the 336ppi will be 1/3 the size its on the 96ppi display for it to be the same size you will need some like 9 time as many 336ppi remember size has both width and height. if you double the resolution you need 4 time the number of pixels  so I think 5 time should be in the ballpark going from 96ppi to 220ppi 2.3 times the resolution..

Noel I have not used a mac in years and when I did Apple's OS was really bad. They have switched to a Unix base since then and that saved their butts.   I beleive application like Photoshop design their GUI areas to be some pixel size.  They get the size of the screen and allocate areas for various functions like menu and option bars.  If a application is well written it may aslo retreive what  pixel size desktop font a user is running with and allocate menu bars and option bars so that size font will fit and also use the same font the user is using on the desktop.  Programmers often take shortcuts and use old default that are no longer valid.  How old is Photoshop, how well do you feel its programmed each release seems to have more new bugs IMO and the porogram is 20 some years OLD.... SE in the past 36 years has your programming skill been getting better. How may of the programs you wrote 20 years ago are still running or can run still..... would they be readable on a 220ppi display.... I would bet some changes may be needed a few bug free mods.....

Clinton, we saw other magical processes demonstated at Adobe Max last year, but they didn't make it to the CS6 release.  There appears to be no doubt that Adobe are working on the issue, and I'd hate to think we had to wait two years for it. As to whether it will be a free update, how can we possibly know.  I wonder if even the Adobe employees who post here have that information, because AFAIK, none of them work in Adobe's marketing department.